From b0c7cb4d1b6fae66a1d7880025f1173e60ee61c6 Mon Sep 17 00:00:00 2001
From: osodebailar <a.eggen@gmail.com>
Date: Tue, 29 Mar 2022 17:39:20 +0200
Subject: [PATCH 01/13] Theme switcher preparation: gac for fill, insulin,
 tempbasal and wizard dialog

---
 .../info/nightscout/androidaps/dialogs/FillDialog.kt   |  8 ++++----
 .../nightscout/androidaps/dialogs/InsulinDialog.kt     |  9 +++++----
 .../nightscout/androidaps/dialogs/TempBasalDialog.kt   |  2 +-
 .../nightscout/androidaps/dialogs/TreatmentDialog.kt   | 10 +++++-----
 .../info/nightscout/androidaps/dialogs/WizardDialog.kt |  6 +++---
 core/src/main/res/values-night/styles.xml              |  2 ++
 core/src/main/res/values/attrs.xml                     |  2 ++
 core/src/main/res/values/styles.xml                    |  2 ++
 8 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
index cb26aa1a5a..3d6e2850fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
@@ -116,16 +116,16 @@ class FillDialog : DialogFragmentWithDate() {
         if (insulinAfterConstraints > 0) {
             actions.add(rh.gs(R.string.fillwarning))
             actions.add("")
-            actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(rh, R.color.colorInsulinButton))
+            actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(context, rh, R.attr.insulinButtonColor))
             if (abs(insulinAfterConstraints - insulin) > 0.01)
-                actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(rh, R.color.warning))
+                actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(context, rh, R.attr.warningColor))
         }
         val siteChange = binding.fillCatheterChange.isChecked
         if (siteChange)
-            actions.add(rh.gs(R.string.record_pump_site_change).formatColor(rh, R.color.actionsConfirm))
+            actions.add(rh.gs(R.string.record_pump_site_change).formatColor(context, rh, R.attr.actionsConfirmColor))
         val insulinChange = binding.fillCartridgeChange.isChecked
         if (insulinChange)
-            actions.add(rh.gs(R.string.record_insulin_cartridge_change).formatColor(rh, R.color.actionsConfirm))
+            actions.add(rh.gs(R.string.record_insulin_cartridge_change).formatColor(context, rh, R.attr.actionsConfirmColor))
         val notes: String = binding.notesLayout.notes.text.toString()
         if (notes.isNotEmpty())
             actions.add(rh.gs(R.string.notes_label) + ": " + notes)
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
index a4172a8727..53e5474dd1 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
@@ -172,16 +172,17 @@ class InsulinDialog : DialogFragmentWithDate() {
         val eatingSoonChecked = binding.startEatingSoonTt.isChecked
 
         if (insulinAfterConstraints > 0) {
-            actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(rh, R.color.bolus))
+            actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(context, rh, R.attr.bolusColor))
             if (recordOnlyChecked)
-                actions.add(rh.gs(R.string.bolusrecordedonly).formatColor(rh, R.color.warning))
+                actions.add(rh.gs(R.string.bolusrecordedonly).formatColor(context, rh, R.attr.warningColor))
             if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
-                actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(rh, R.color.warning))
+                actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(context, rh, R.attr.warningColor))
         }
         val eatingSoonTTDuration = defaultValueHelper.determineEatingSoonTTDuration()
         val eatingSoonTT = defaultValueHelper.determineEatingSoonTT()
         if (eatingSoonChecked)
-            actions.add(rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + rh.gs(R.string.format_mins, eatingSoonTTDuration) + ")").formatColor(rh, R.color.tempTargetConfirmation))
+            actions.add(rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + rh.gs(R.string.format_mins, eatingSoonTTDuration) + ")")
+                .formatColor(context, rh, R.attr.tempTargetConfirmation))
 
         val timeOffset = binding.time.value.toInt()
         val time = dateUtil.now() + T.mins(timeOffset.toLong()).msecs()
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
index aba8fb579f..438ed77193 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
@@ -118,7 +118,7 @@ class TempBasalDialog : DialogFragmentWithDate() {
             actions.add(rh.gs(R.string.tempbasal_label) + ": " + rh.gs(R.string.pump_basebasalrate, absolute))
             actions.add(rh.gs(R.string.duration) + ": " + rh.gs(R.string.format_mins, durationInMinutes))
             if (abs(absolute - basalAbsoluteInput) > 0.01)
-                actions.add(rh.gs(R.string.constraintapllied).formatColor(rh, R.color.warning))
+                actions.add(rh.gs(R.string.constraintapllied).formatColor(context, rh, R.attr.warningColor))
         }
         activity?.let { activity ->
             OKDialog.showConfirmation(activity, rh.gs(R.string.tempbasal_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
index 55fd9a773b..5ca98c146b 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
@@ -128,16 +128,16 @@ class TreatmentDialog : DialogFragmentWithDate() {
         val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
 
         if (insulinAfterConstraints > 0) {
-            actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(rh, R.color.bolus))
+            actions.add(rh.gs(R.string.bolus) + ": " + DecimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump, rh).formatColor(context, rh, R.attr.bolusColor))
             if (recordOnlyChecked)
-                actions.add(rh.gs(R.string.bolusrecordedonly).formatColor(rh, R.color.warning))
+                actions.add(rh.gs(R.string.bolusrecordedonly).formatColor(context, rh, R.attr.warningColor))
             if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
-                actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(rh, R.color.warning))
+                actions.add(rh.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(context, rh, R.attr.warningColor))
         }
         if (carbsAfterConstraints > 0) {
-            actions.add(rh.gs(R.string.carbs) + ": " + rh.gs(R.string.format_carbs, carbsAfterConstraints).formatColor(rh, R.color.carbs))
+            actions.add(rh.gs(R.string.carbs) + ": " + rh.gs(R.string.format_carbs, carbsAfterConstraints).formatColor(context, rh, R.attr.carbsColor))
             if (carbsAfterConstraints != carbs)
-                actions.add(rh.gs(R.string.carbsconstraintapplied).formatColor(rh, R.color.warning))
+                actions.add(rh.gs(R.string.carbsconstraintapplied).formatColor(context, rh, R.attr.warningColor))
         }
         if (insulinAfterConstraints > 0 || carbsAfterConstraints > 0) {
             activity?.let { activity ->
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
index 86e139c647..e5ff65ffda 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
@@ -468,12 +468,12 @@ class WizardDialog : DaggerDialogFragment() {
             }
 
             if (wizard.calculatedTotalInsulin > 0.0 || carbsAfterConstraint > 0.0) {
-                val insulinText = if (wizard.calculatedTotalInsulin > 0.0) rh.gs(R.string.formatinsulinunits, wizard.calculatedTotalInsulin).formatColor(rh, R.color.bolus) else ""
-                val carbsText = if (carbsAfterConstraint > 0.0) rh.gs(R.string.format_carbs, carbsAfterConstraint).formatColor(rh, R.color.carbs) else ""
+                val insulinText = if (wizard.calculatedTotalInsulin > 0.0) rh.gs(R.string.formatinsulinunits, wizard.calculatedTotalInsulin).formatColor(context, rh, R.attr.bolusColor) else ""
+                val carbsText = if (carbsAfterConstraint > 0.0) rh.gs(R.string.format_carbs, carbsAfterConstraint).formatColor(context, rh, R.attr.carbsColor) else ""
                 binding.total.text = HtmlHelper.fromHtml(rh.gs(R.string.result_insulin_carbs, insulinText, carbsText))
                 binding.okcancel.ok.visibility = View.VISIBLE
             } else {
-                binding.total.text = HtmlHelper.fromHtml(rh.gs(R.string.missing_carbs, wizard.carbsEquivalent.toInt()).formatColor(rh, R.color.carbs))
+                binding.total.text = HtmlHelper.fromHtml(rh.gs(R.string.missing_carbs, wizard.carbsEquivalent.toInt()).formatColor(context, rh, R.attr.carbsColor))
                 binding.okcancel.ok.visibility = View.INVISIBLE
             }
             binding.percentUsed.text = rh.gs(R.string.format_percent, wizard.percentageCorrection)
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index 65d6daa4fc..ba2653f42b 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -142,6 +142,8 @@
         <item name="infoColor">@color/info</item>
         <!---Bolus wizard -->
         <item name="cobAlertColor">@color/cobAlert</item>
+        <!---Fill dialog -->
+        <item name="actionsConfirmColor">@color/actionsConfirm</item>
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index f222082e76..6b4ef23995 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -116,4 +116,6 @@
     <attr name="infoColor" format="reference|color" />
     <!---Bolus wizard -->
     <attr name="cobAlertColor" format="reference|color" />
+    <!---Fill dialog -->
+    <attr name="actionsConfirmColor" format="reference|color" />
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 92ac2d0bd0..41a7ed5dbc 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -141,6 +141,8 @@
         <item name="infoColor">@color/info</item>
         <!---Bolus wizard -->
         <item name="cobAlertColor">@color/cobAlert</item>
+        <!---Fill dialog -->
+        <item name="actionsConfirmColor">@color/actionsConfirm</item>
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>

From c383f471a707c3f0de1a2f7d784de785d795c358 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 30 Mar 2022 10:01:28 +0200
Subject: [PATCH 02/13] DanaR: Fix NPE

---
 .../AbstractDanaRExecutionService.java        | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
index 03db77233f..f0a45f95f6 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
@@ -191,22 +191,23 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
 
     protected void getBTSocketForSelectedPump() {
         mDevName = sp.getString(R.string.key_danar_bt_name, "");
-        BluetoothAdapter bluetoothAdapter = ((BluetoothManager)context.getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
+        BluetoothAdapter bluetoothAdapter = ((BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
 
         if (bluetoothAdapter != null) {
             Set<BluetoothDevice> bondedDevices = bluetoothAdapter.getBondedDevices();
 
-            for (BluetoothDevice device : bondedDevices) {
-                if (mDevName.equals(device.getName())) {
-                    mBTDevice = device;
-                    try {
-                        mRfcommSocket = mBTDevice.createRfcommSocketToServiceRecord(SPP_UUID);
-                    } catch (IOException e) {
-                        aapsLogger.error("Error creating socket: ", e);
+            if (bondedDevices != null)
+                for (BluetoothDevice device : bondedDevices) {
+                    if (mDevName.equals(device.getName())) {
+                        mBTDevice = device;
+                        try {
+                            mRfcommSocket = mBTDevice.createRfcommSocketToServiceRecord(SPP_UUID);
+                        } catch (IOException e) {
+                            aapsLogger.error("Error creating socket: ", e);
+                        }
+                        break;
                     }
-                    break;
                 }
-            }
         } else {
             ToastUtils.INSTANCE.showToastInUiThread(context.getApplicationContext(),
                     rh.gs(R.string.nobtadapter));

From aa301ed4595b84d3d01d649d441ba86b924089f4 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 30 Mar 2022 12:22:54 +0200
Subject: [PATCH 03/13] New Crowdin updates (#1496)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* Update source file strings.xml

* Update source file strings.xml

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)
---
 app/src/main/res/values-cs-rCZ/strings.xml  | 4 ++++
 app/src/main/res/values-es-rES/strings.xml  | 6 +++++-
 app/src/main/res/values-no-rNO/strings.xml  | 4 ++++
 app/src/main/res/values-ru-rRU/strings.xml  | 5 +++++
 app/src/main/res/values-tr-rTR/strings.xml  | 5 +++++
 app/src/main/res/values-zh-rCN/strings.xml  | 1 +
 core/src/main/res/values-cs-rCZ/strings.xml | 5 +++++
 core/src/main/res/values-es-rES/strings.xml | 5 +++++
 core/src/main/res/values-no-rNO/strings.xml | 5 +++++
 core/src/main/res/values-tr-rTR/strings.xml | 5 +++++
 10 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 191ee91193..170b013f80 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -985,6 +985,8 @@
     <string name="wear_unknown_action_string">Neznámý příkaz k akci:</string>
     <string name="overview_editquickwizard_percentage">Procentní podíl</string>
     <string name="app_default">Výchozí nastavení aplikace</string>
+    <string name="show_invalidated_records">Zobrazit zneplatněné / odstraněné záznamy</string>
+    <string name="hide_invalidated_records">Skrýt zneplatněné / odstraněné záznamy</string>
     <string name="select_profile">Vyberte profil pro úpravu</string>
     <string name="refresh_from_nightscout">Obnovit z Nightscoutu</string>
     <string name="remove_selected_items">Odstranit zvolené položky</string>
@@ -1001,4 +1003,6 @@
     <string name="below" comment="below &quot;in range&quot;">Pod</string>
     <string name="in_range">V rozsahu</string>
     <string name="above" comment="above &quot;in range&quot;">Nad</string>
+    <string name="show_loop_records">Zobrazit záznamy smyčky</string>
+    <string name="show_hide_records">Skrýt záznamy smyčky</string>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index b39d75b6fb..bd6ac852d9 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -435,7 +435,7 @@
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="openaps_smb_dynamic_isf">ISF Dinámico</string>
     <string name="DynISFAdjust_title">Factor de ajuste de ISF Dinámico %</string>
-    <string name="DynISFAdjust_summary">Porcentaje del factor de ajuste para ISF Dinámico. Establece valores por encima del 100%, para correcciones más agresivas y por debajo para correcciones menos agresivas</string>
+    <string name="DynISFAdjust_summary">Porcentaje del factor de ajuste de ISF Dinámico\n Valor predeterminado: 100\nEstablecer valores por encima del 100% para que el algoritmo aplique correcciones más agresivas y valores por debajo del 100% para correcciones menos agresivas.</string>
     <string name="enableuam">Activar UAM</string>
     <string name="enablesmb">Activar SMB</string>
     <string name="enablesmb_summary">Usar microbolos en lugar de basales temporales, para corregir más rápidamente</string>
@@ -985,6 +985,8 @@
     <string name="wear_unknown_action_string">Comando de acción desconocido:</string>
     <string name="overview_editquickwizard_percentage">Porcentaje</string>
     <string name="app_default">Aplicación por defecto</string>
+    <string name="show_invalidated_records">Mostrar registros eliminados o invalidados</string>
+    <string name="hide_invalidated_records">Ocultar registros eliminados o invalidados</string>
     <string name="select_profile">Seleccione el perfil a editar</string>
     <string name="refresh_from_nightscout">Actualizar de Nightscout</string>
     <string name="remove_selected_items">Eliminar los elementos seleccionados</string>
@@ -1001,4 +1003,6 @@
     <string name="below" comment="below &quot;in range&quot;">Bajo</string>
     <string name="in_range">En rango</string>
     <string name="above" comment="above &quot;in range&quot;">Alto</string>
+    <string name="show_loop_records">Mostrar registros del lazo</string>
+    <string name="show_hide_records">Ocultar registros del lazo</string>
 </resources>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index f2d63fcc6c..ad83fa9cbd 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -985,6 +985,8 @@
     <string name="wear_unknown_action_string">Ukjent kommando:</string>
     <string name="overview_editquickwizard_percentage">Prosent</string>
     <string name="app_default">Standardverdi</string>
+    <string name="show_invalidated_records">Vis ugyldige / slettede registreringer</string>
+    <string name="hide_invalidated_records">Skjul ugyldige / slettede registreringer</string>
     <string name="select_profile">Velg profil du vil redigere</string>
     <string name="refresh_from_nightscout">Oppdater fra Nightscout</string>
     <string name="remove_selected_items">Fjern valgte elementer</string>
@@ -1001,4 +1003,6 @@
     <string name="below" comment="below &quot;in range&quot;">Under</string>
     <string name="in_range">I målområdet</string>
     <string name="above" comment="above &quot;in range&quot;">Over</string>
+    <string name="show_loop_records">Vis loop registreringer</string>
+    <string name="show_hide_records">Skjul loop registreringer</string>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 4e1d0bbecd..3d1f1a1f6c 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -161,6 +161,7 @@
     <string name="end_user_license_agreement">лицензионное соглашение с пользователем</string>
     <string name="end_user_license_agreement_text">НЕ ДОЛЖНО ИСПОЛЬЗОВАТЬСЯ ДЛЯ ПРИНЯТИЯ МЕДИЦИНСКИХ РЕШЕНИЙ. ПРОГРАММА НЕ ДАЕТ ГАРАНТИЙ В РАМКАХ СУЩЕСТВУЮЩЕГО ЗАКОНОДАТЕЛЬСТВА. ПРЕДОСТАВЛЯЕТСЯ \"КАК ЕСТЬ\" БЕЗ ЯВНЫХ ИЛИ СКРЫТЫХ ГАРАНТИЙ ВКЛЮЧАЯ НО НЕ ОГРАНИЧИВАЯСЬ ВОЗМОЖНОСТЬЮ КОММЕРЧЕСКОГО ИСПОЛЬЗОВАНИ ИЛИ СООТВЕТСТВИЯ КАКИМ-ЛИБО ЦЕЛЯМ. ВСЕ РИСКИ ЛОЖАТСЯ НА ВАС. В СЛУЧАЕ НЕРАБОТОСПОСОБНОСТИ ПРОГРАММЫ ВЫ НЕСЕТЕ ВСЕ РАСХОДЫ СВЯЗАННЫЕ С ОБСЛУЖИВАНИЕМ РЕМОНТОМ ИЛИ КОРРЕКТИРОВКОЙ.  </string>
     <string name="end_user_license_agreement_i_understand">я понимаю и принимаю</string>
+    <string name="save">Сохранить</string>
     <string name="reloadprofile">обновить профиль</string>
     <string name="smscommunicator">SMS коммуникатор</string>
     <string name="smscommunicator_allowednumbers">разрешенные телефонные номера</string>
@@ -432,6 +433,8 @@
     <string name="ns_localbroadcasts_title">Активировать локальную передачу</string>
     <string name="openapssmb">Супер микро болюс OpenAPS</string>
     <string name="openaps_smb_dynamic_isf">Динамический ISF</string>
+    <string name="DynISFAdjust_title">Коэффициент регулировки динамического диапазона чувствительности ISF %</string>
+    <string name="DynISFAdjust_summary">Коэффициент корректировки динамического диапазона чувствительности ISF. Установите более 100% для более агрессивных доз коррекции и менее 100% для менее агрессивной коррекции.</string>
     <string name="enableuam">Включить непредвиденный прием пищи UAM</string>
     <string name="enablesmb">Включить супер микро болюс SMB</string>
     <string name="enablesmb_summary">Для ускорения действия используйте супер микро болюсы SMB вместо временного базала</string>
@@ -664,6 +667,7 @@
     <string name="show_invalidated">Показать недействительные</string>
     <string name="hide_invalidated">Скрыть недействительные</string>
     <string name="remove_items">Удалить элементы</string>
+    <string name="sort_items">Сортировать элементы</string>
     <string name="storedsettingsfound">Найдены сохраненные параметры</string>
     <string name="allow_hardware_pump_text">Внимание: Если вы активируете подключение к невиртуальной помпе, AndroidAPS скопирует настройки базала в профиль помпы, перезаписывая существующие настройки, хранящиеся в ней. Убедитесь, что настройки базала в AndroidAPS корректны. Если вы не уверены или не хотите перезаписать настройки базала на помпу, нажмите отменить и повторите подключение в другое время.</string>
     <string name="error_adding_treatment_title">Данные терапии неполные</string>
@@ -878,6 +882,7 @@
     <string name="ns_receive_profile_switch_summary">Принимать переключения профиля, введенные через NS или NSClient</string>
     <string name="ns_receive_offline_event">Принимать события APS автономно</string>
     <string name="ns_receive_offline_event_summary">Принимать события APS введенные через NS или клиент NS автономно</string>
+    <string name="ns_receive_tbr_eb">Получать временную базальную скорость TBR и пролонгированный болюс EB</string>
     <string name="ns_receive_insulin">Принимать инсулин</string>
     <string name="ns_receive_insulin_summary">Принимать инсулин, введенный через NS или NSClient (не подается, только рассчитывается как активный IOB)</string>
     <string name="ns_receive_carbs">Принимать углеводы</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index e0fe1138c7..15d6716138 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -986,6 +986,8 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="wear_unknown_action_string">Bilinmeyen eylem komutu:</string>
     <string name="overview_editquickwizard_percentage">Yüzde</string>
     <string name="app_default">Uygulama varsayılanı</string>
+    <string name="show_invalidated_records">Geçersiz kılınan / kaldırılan kayıtları göster</string>
+    <string name="hide_invalidated_records">Geçersiz kılınan / kaldırılan kayıtları gizle</string>
     <string name="select_profile">Düzenlenecek profili seç</string>
     <string name="refresh_from_nightscout">Nightscout\'tan Yenile</string>
     <string name="remove_selected_items">Seçili nesneleri kaldır</string>
@@ -998,7 +1000,10 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="show_loop">Döngüyü göster</string>
     <string name="count_selected">%1$d seçildi</string>
     <string name="sort_label">Sırala</string>
+    <string name="dialog_canceled">İletişim kutusu iptal edildi</string>
     <string name="below" comment="below &quot;in range&quot;">Altında</string>
     <string name="in_range">Aralık içinde</string>
     <string name="above" comment="above &quot;in range&quot;">Üstünde</string>
+    <string name="show_loop_records">Döngü kayıtlarını göster</string>
+    <string name="show_hide_records">Döngü kayıtlarını gizle</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4ec05a9e7a..df0ace5e89 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -997,6 +997,7 @@
     <string name="show_loop">显示闭环</string>
     <string name="count_selected">已选中 %1$d</string>
     <string name="sort_label">排序</string>
+    <string name="dialog_canceled">对话框已取消</string>
     <string name="below" comment="below &quot;in range&quot;">底部</string>
     <string name="in_range">在范围内</string>
     <string name="above" comment="above &quot;in range&quot;">上方</string>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index 674546fe78..2c7041a249 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -460,6 +460,11 @@
     <string name="formatPercent">%1$.0f%%</string>
     <string name="basal">Bazál</string>
     <string name="basalpct">Bazál %</string>
+    <string name="count_selected">Vybráno: %1$d</string>
+    <string name="sort_label">Seřadit</string>
+    <string name="remove_items">Odebrat položky</string>
+    <string name="sort_items">Seřadit položky</string>
+    <string name="remove_selected_items">Odebrat vybrané položky</string>
     <plurals name="days">
         <item quantity="one">%1$d den</item>
         <item quantity="few">%1$d dnů</item>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
index 484f00440b..bee8dee661 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -460,6 +460,11 @@
     <string name="formatPercent">%1$.0f%%</string>
     <string name="basal">Basal</string>
     <string name="basalpct">Basal %</string>
+    <string name="count_selected">%1$d seleccionados</string>
+    <string name="sort_label">Ordenar</string>
+    <string name="remove_items">Eliminar elementos</string>
+    <string name="sort_items">Ordenar elementos</string>
+    <string name="remove_selected_items">Eliminar los elementos seleccionados</string>
     <plurals name="days">
         <item quantity="one">%1$d día</item>
         <item quantity="other">%1$d días</item>
diff --git a/core/src/main/res/values-no-rNO/strings.xml b/core/src/main/res/values-no-rNO/strings.xml
index 94b2b01837..37828eed67 100644
--- a/core/src/main/res/values-no-rNO/strings.xml
+++ b/core/src/main/res/values-no-rNO/strings.xml
@@ -460,6 +460,11 @@
     <string name="formatPercent">%1$.0f%%</string>
     <string name="basal">Basal</string>
     <string name="basalpct">Basal %</string>
+    <string name="count_selected">%1$d valgt</string>
+    <string name="sort_label">Sorter</string>
+    <string name="remove_items">Slett elementer</string>
+    <string name="sort_items">Sorter elementer</string>
+    <string name="remove_selected_items">Slett valgte elementer</string>
     <plurals name="days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dager</item>
diff --git a/core/src/main/res/values-tr-rTR/strings.xml b/core/src/main/res/values-tr-rTR/strings.xml
index e722f9e70b..1f2d882edc 100644
--- a/core/src/main/res/values-tr-rTR/strings.xml
+++ b/core/src/main/res/values-tr-rTR/strings.xml
@@ -460,6 +460,11 @@
     <string name="formatPercent">%1$.0f%%</string>
     <string name="basal">Bazal</string>
     <string name="basalpct">Bazal %</string>
+    <string name="count_selected">%1$d seçildi</string>
+    <string name="sort_label">Sırala</string>
+    <string name="remove_items">Öğeleri kaldır</string>
+    <string name="sort_items">Öğeleri Sırala</string>
+    <string name="remove_selected_items">Seçilen öğeleri kaldır</string>
     <plurals name="days">
         <item quantity="one">%1$d gün</item>
         <item quantity="other">%1$d gün</item>

From 675cc160c46fcbd93d9e773f48f5b360179a4d2b Mon Sep 17 00:00:00 2001
From: osodebailar <a.eggen@gmail.com>
Date: Wed, 30 Mar 2022 12:46:28 +0200
Subject: [PATCH 04/13] Theme switcher preparation: gac for pumps and status
 color

---
 .../plugins/general/overview/OverviewData.kt  |  2 +-
 .../general/overview/StatusLightHandler.kt    |  2 +-
 .../main/res/drawable/ic_cp_age_battery.xml   |  4 +-
 .../main/res/drawable/ic_cp_age_cannula.xml   |  2 +-
 .../main/res/drawable/ic_cp_age_insulin.xml   |  2 +-
 .../main/res/drawable/ic_cp_age_sensor.xml    |  6 +-
 .../res/drawable/ic_patch_pump_outline.xml    |  2 +-
 .../plugins/pump/combo/ComboFragment.java     | 32 ++++----
 .../nightscout/androidaps/utils/WarnColors.kt | 34 ++++----
 core/src/main/res/values-night/colors.xml     | 57 +++++++++++++-
 core/src/main/res/values-night/styles.xml     | 13 +++-
 core/src/main/res/values/attrs.xml            | 13 +++-
 core/src/main/res/values/colors.xml           | 59 +++++++++++++-
 core/src/main/res/values/styles.xml           | 12 ++-
 .../pump/medtronic/MedtronicFragment.kt       | 10 +--
 .../common/fragment/WizardFragmentBase.kt     |  5 +-
 omnipod-common/src/main/res/values/colors.xml | 39 ----------
 .../omnipod/dash/ui/DashPodHistoryActivity.kt | 14 ++--
 .../dash/ui/OmnipodDashOverviewFragment.kt    | 78 ++++++++++---------
 .../eros/ui/OmnipodErosOverviewFragment.kt    | 68 ++++++++--------
 omnipod-eros/src/main/res/values/colors.xml   | 15 ----
 21 files changed, 282 insertions(+), 187 deletions(-)
 delete mode 100644 omnipod-common/src/main/res/values/colors.xml
 delete mode 100644 omnipod-eros/src/main/res/values/colors.xml

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt
index b64d30970b..325971f84a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt
@@ -142,7 +142,7 @@ class OverviewData @Inject constructor(
     fun lastBgColor(context: Context?): Int {
         return when {
             isLow  -> rh.gac(context, R.attr.bgLow)
-            isHigh -> rh.gac(context, R.attr.bgHigh)
+            isHigh -> rh.gac(context, R.attr.highColor)
             else   -> rh.gac(context, R.attr.bgInRange)
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
index 254901adc5..f3455580ee 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
@@ -66,7 +66,7 @@ class StatusLightHandler @Inject constructor(
                 handleLevel(careportal_battery_level, R.string.key_statuslights_bat_critical, 26.0, R.string.key_statuslights_bat_warning, 51.0, pump.batteryLevel.toDouble(), "%")
             } else {
                 careportal_battery_level?.text = rh.gs(R.string.notavailable)
-                careportal_battery_level?.setTextColor(Color.WHITE)
+                careportal_battery_level?.setTextColor(rh.gac(careportal_battery_level.context, R.attr.defaultTextColor))
             }
         }
     }
diff --git a/app/src/main/res/drawable/ic_cp_age_battery.xml b/app/src/main/res/drawable/ic_cp_age_battery.xml
index cc36e585a0..2316d660aa 100644
--- a/app/src/main/res/drawable/ic_cp_age_battery.xml
+++ b/app/src/main/res/drawable/ic_cp_age_battery.xml
@@ -6,11 +6,11 @@
   <path
       android:pathData="M20.234,10.422c-0.362,0 -0.656,0.294 -0.656,0.656v0.297h-0.469V9.031c0,-0.87 -0.708,-1.578 -1.578,-1.578H4.188c-0.87,0 -1.578,0.708 -1.578,1.578v5.938c0,0.87 0.708,1.578 1.578,1.578h13.344c0.72,0 1.323,-0.488 1.511,-1.149c0.01,0.001 0.018,0.006 0.028,0.006c0.332,0 0.602,-0.297 0.602,-0.664c0,-0.351 -0.25,-0.632 -0.563,-0.655v-1.46h0.469v0.297c0,0.362 0.294,0.656 0.656,0.656s0.656,-0.294 0.656,-0.656v-1.844C20.891,10.716 20.597,10.422 20.234,10.422zM18.109,14.969c0,0.318 -0.26,0.578 -0.578,0.578H4.188c-0.319,0 -0.578,-0.26 -0.578,-0.578V9.031c0,-0.319 0.259,-0.578 0.578,-0.578h13.344c0.318,0 0.578,0.259 0.578,0.578V14.969z"
       android:strokeAlpha="0.5"
-      android:fillColor="#FFFFFF"
+      android:fillColor="?attr/colorControlNormal"
       android:fillAlpha="0.5"/>
   <path
       android:pathData="M9.703,10.273l-3.937,2.922l3.453,-1.218l1.781,1.765l4.438,-3.484l-4.297,1.687z"
       android:strokeAlpha="0.5"
-      android:fillColor="#FFFFFF"
+      android:fillColor="?attr/colorControlNormal"
       android:fillAlpha="0.5"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cp_age_cannula.xml b/app/src/main/res/drawable/ic_cp_age_cannula.xml
index f2578fa72b..58b450d81f 100644
--- a/app/src/main/res/drawable/ic_cp_age_cannula.xml
+++ b/app/src/main/res/drawable/ic_cp_age_cannula.xml
@@ -6,6 +6,6 @@
   <path
       android:pathData="M20.951,10.458h-1.99c-0.054,-0.733 -0.659,-1.313 -1.406,-1.313h-2.354c-0.747,0 -1.352,0.58 -1.406,1.313h-1.99c-0.388,0 -0.696,0.27 -0.771,0.622c-1.32,-0.021 -2.226,-0.555 -2.936,-0.999c-0.7,-0.437 -1.304,-0.814 -2.005,-0.434c-1.202,0.654 -0.843,2.024 -0.554,3.126c0.192,0.731 0.39,1.489 0.098,1.836c-0.603,0.718 -2.212,0.276 -2.781,0.045c-0.143,-0.057 -0.31,0.011 -0.369,0.156c-0.059,0.146 0.011,0.311 0.156,0.369c0.061,0.024 0.971,0.388 1.893,0.388c0.574,0 1.153,-0.142 1.534,-0.593c0.482,-0.571 0.256,-1.433 0.017,-2.345c-0.323,-1.234 -0.479,-2.074 0.276,-2.485c0.392,-0.213 0.762,-0.003 1.434,0.417c0.755,0.471 1.766,1.123 3.359,1.096C11.301,11.859 11.531,12 11.806,12h4.406v5.771l0.333,-0.854V12h4.406c0.443,0 0.802,-0.345 0.802,-0.771S21.394,10.458 20.951,10.458z"
       android:strokeAlpha="0.5"
-      android:fillColor="#FFFFFF"
+      android:fillColor="?attr/colorControlNormal"
       android:fillAlpha="0.5"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cp_age_insulin.xml b/app/src/main/res/drawable/ic_cp_age_insulin.xml
index 701e31cee3..7e96c91e7a 100644
--- a/app/src/main/res/drawable/ic_cp_age_insulin.xml
+++ b/app/src/main/res/drawable/ic_cp_age_insulin.xml
@@ -6,6 +6,6 @@
   <path
       android:pathData="M19.455,9.988l-0.947,-1.652c-0.144,-0.252 -0.482,-0.329 -0.753,-0.174c-0.171,0.098 -0.266,0.267 -0.283,0.44l-1.149,-0.585c-0.093,-0.042 -0.202,-0.037 -0.292,0.015l-9.796,5.614l-0.156,-0.271c-0.187,-0.326 -0.61,-0.434 -0.945,-0.242c-0.336,0.192 -0.456,0.612 -0.269,0.938l2.747,4.79c0.187,0.326 0.61,0.434 0.945,0.242c0.336,-0.192 0.456,-0.612 0.269,-0.938L8.67,17.896l9.796,-5.614c0.09,-0.052 0.15,-0.143 0.16,-0.244l0.076,-1.289c0.158,0.072 0.351,0.076 0.522,-0.022C19.496,10.57 19.599,10.239 19.455,9.988zM17.407,12.176l-1.127,-1.769c-0.055,-0.086 -0.172,-0.11 -0.261,-0.054c-0.086,0.055 -0.115,0.165 -0.066,0.251c0.001,0.002 0.003,0.005 0.004,0.007l1.118,1.755l-0.752,0.431l-1.127,-1.769c-0.055,-0.086 -0.172,-0.111 -0.261,-0.054c-0.086,0.054 -0.115,0.165 -0.066,0.251c0.001,0.002 0.003,0.005 0.004,0.007l1.118,1.755l-0.752,0.431l-1.127,-1.769c-0.055,-0.086 -0.172,-0.111 -0.261,-0.054c-0.087,0.055 -0.115,0.165 -0.066,0.251c0.001,0.002 0.003,0.005 0.004,0.007l1.118,1.755l-0.655,0.375l-1.552,-2.482c-0.053,-0.084 -0.165,-0.111 -0.254,-0.06L6.82,14.666l-0.277,-0.483l9.652,-5.532l1.685,0.87l0.236,0.412l-0.101,1.894L17.407,12.176z"
       android:strokeAlpha="0.5"
-      android:fillColor="#FFFFFF"
+      android:fillColor="?attr/colorControlNormal"
       android:fillAlpha="0.5"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cp_age_sensor.xml b/app/src/main/res/drawable/ic_cp_age_sensor.xml
index 08134cc20b..64c684320c 100644
--- a/app/src/main/res/drawable/ic_cp_age_sensor.xml
+++ b/app/src/main/res/drawable/ic_cp_age_sensor.xml
@@ -6,16 +6,16 @@
   <path
       android:pathData="M13.568,13.328c0.673,0 1.219,-0.546 1.219,-1.219s-0.546,-1.219 -1.219,-1.219c-0.493,0 -0.913,0.296 -1.105,0.718h-1.603L9.464,8.126c-0.078,-0.195 -0.246,-0.309 -0.48,-0.314c-0.21,0.006 -0.394,0.144 -0.459,0.343l-2.16,6.53l-1.131,-2.751c-0.077,-0.188 -0.26,-0.31 -0.463,-0.31h-2c-0.276,0 -0.5,0.224 -0.5,0.5s0.224,0.5 0.5,0.5h1.665l1.518,3.69c0.078,0.188 0.261,0.31 0.463,0.31c0.006,0 0.012,0 0.018,0c0.209,-0.008 0.392,-0.145 0.458,-0.343L9.045,9.77l1.012,2.525c0.076,0.19 0.26,0.314 0.464,0.314h1.941C12.654,13.031 13.074,13.328 13.568,13.328z"
       android:strokeAlpha="0.5"
-      android:fillColor="#FFFFFF"
+      android:fillColor="?attr/colorControlNormal"
       android:fillAlpha="0.5"/>
   <path
       android:pathData="M13.567,15.055c-0.276,0 -0.5,0.224 -0.5,0.5s0.224,0.5 0.5,0.5c2.176,0 3.945,-1.77 3.945,-3.945s-1.77,-3.946 -3.945,-3.946c-0.276,0 -0.5,0.224 -0.5,0.5s0.224,0.5 0.5,0.5c1.624,0 2.945,1.321 2.945,2.945S15.191,15.055 13.567,15.055z"
       android:strokeAlpha="0.5"
-      android:fillColor="#FFFFFF"
+      android:fillColor="?attr/colorControlNormal"
       android:fillAlpha="0.5"/>
   <path
       android:pathData="M13.567,5.14c-0.276,0 -0.5,0.224 -0.5,0.5s0.224,0.5 0.5,0.5c3.291,0 5.969,2.677 5.969,5.968s-2.678,5.969 -5.969,5.969c-0.276,0 -0.5,0.224 -0.5,0.5s0.224,0.5 0.5,0.5c3.843,0 6.969,-3.126 6.969,-6.969S17.41,5.14 13.567,5.14z"
       android:strokeAlpha="0.5"
-      android:fillColor="#FFFFFF"
+      android:fillColor="?attr/colorControlNormal"
       android:fillAlpha="0.5"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_patch_pump_outline.xml b/app/src/main/res/drawable/ic_patch_pump_outline.xml
index 6e95a27545..6a86ec1503 100644
--- a/app/src/main/res/drawable/ic_patch_pump_outline.xml
+++ b/app/src/main/res/drawable/ic_patch_pump_outline.xml
@@ -6,7 +6,7 @@
 
     <path
         android:fillAlpha="0.5"
-        android:fillColor="#FFFFFF"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M 18 54 a 3 3 0 0 0 3 3 L 45 57 A 19 19 0 0 0 62 40 A 19 19 0 0 0 45 24 L 21 24 a 3 3 0 0 0 -3 3 Z M 67 40 A 22 22 0 0 1 45 62 L 19 62 a 6 6 0 0 1 -6 -6 L 13 25 a 6 6 0 0 1 6 -6 L 45 19 A 22 22 0 0 1 67 40"
         android:strokeAlpha="0.5" />
 
diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
index abc3f676f5..b0fc0d809c 100644
--- a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
+++ b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
@@ -134,33 +134,33 @@ public class ComboFragment extends DaggerFragment {
         PumpState ps = comboPlugin.getPump().state;
         if (ps.insulinState == PumpState.EMPTY || ps.batteryState == PumpState.EMPTY
                 || ps.activeAlert != null && ps.activeAlert.errorCode != null) {
-            stateView.setTextColor(Color.RED);
+            stateView.setTextColor(rh.gac(getContext(), R.attr.warningColor));
             stateView.setTypeface(null, Typeface.BOLD);
         } else if (comboPlugin.getPump().state.suspended
                 || ps.activeAlert != null && ps.activeAlert.warningCode != null) {
-            stateView.setTextColor(Color.YELLOW);
+            stateView.setTextColor(rh.gac(getContext(), R.attr.omniYellowColor));
             stateView.setTypeface(null, Typeface.BOLD);
         } else {
-            stateView.setTextColor(Color.WHITE);
+            stateView.setTextColor(rh.gac(getContext(), R.attr.defaultTextColor));
             stateView.setTypeface(null, Typeface.NORMAL);
         }
 
         // activity
         String activity = comboPlugin.getPump().activity;
         if (activity != null) {
-            activityView.setTextColor(Color.WHITE);
+            activityView.setTextColor(rh.gac(getContext(), R.attr.defaultTextColor));
             activityView.setTextSize(14);
             activityView.setText(activity);
         } else if (commandQueue.size() > 0) {
-            activityView.setTextColor(Color.WHITE);
+            activityView.setTextColor(rh.gac(getContext(), R.attr.defaultTextColor));
             activityView.setTextSize(14);
             activityView.setText("");
         } else if (comboPlugin.isInitialized()) {
-            activityView.setTextColor(Color.WHITE);
+            activityView.setTextColor(rh.gac(getContext(), R.attr.defaultTextColor));
             activityView.setTextSize(20);
             activityView.setText("{fa-bed}");
         } else {
-            activityView.setTextColor(Color.RED);
+            activityView.setTextColor(rh.gac(getContext(), R.attr.warningColor));
             activityView.setTextSize(14);
             activityView.setText(rh.gs(R.string.pump_unreachable));
         }
@@ -170,10 +170,10 @@ public class ComboFragment extends DaggerFragment {
             batteryView.setTextSize(20);
             if (ps.batteryState == PumpState.EMPTY) {
                 batteryView.setText("{fa-battery-empty}");
-                batteryView.setTextColor(Color.RED);
+                batteryView.setTextColor(rh.gac(getContext(), R.attr.warningColor));
             } else if (ps.batteryState == PumpState.LOW) {
                 batteryView.setText("{fa-battery-quarter}");
-                batteryView.setTextColor(Color.YELLOW);
+                batteryView.setTextColor(rh.gac(getContext(), R.attr.omniYellowColor));
             } else {
                 batteryView.setText("{fa-battery-full}");
                 batteryView.setTextColor(Color.WHITE);
@@ -192,16 +192,16 @@ public class ComboFragment extends DaggerFragment {
             }
 
             if (ps.insulinState == PumpState.UNKNOWN) {
-                reservoirView.setTextColor(Color.WHITE);
+                reservoirView.setTextColor(rh.gac(getContext(), R.attr.defaultTextColor));
                 reservoirView.setTypeface(null, Typeface.NORMAL);
             } else if (ps.insulinState == PumpState.LOW) {
-                reservoirView.setTextColor(Color.YELLOW);
+                reservoirView.setTextColor(rh.gac(getContext(), R.attr.omniYellowColor));
                 reservoirView.setTypeface(null, Typeface.BOLD);
             } else if (ps.insulinState == PumpState.EMPTY) {
-                reservoirView.setTextColor(Color.RED);
+                reservoirView.setTextColor(rh.gac(getContext(), R.attr.warningColor));
                 reservoirView.setTypeface(null, Typeface.BOLD);
             } else {
-                reservoirView.setTextColor(Color.WHITE);
+                reservoirView.setTextColor(rh.gac(getContext(), R.attr.defaultTextColor));
                 reservoirView.setTypeface(null, Typeface.NORMAL);
             }
 
@@ -210,13 +210,13 @@ public class ComboFragment extends DaggerFragment {
             long min = (System.currentTimeMillis() - comboPlugin.getPump().lastSuccessfulCmdTime) / 1000 / 60;
             if (comboPlugin.getPump().lastSuccessfulCmdTime + 60 * 1000 > System.currentTimeMillis()) {
                 lastConnectionView.setText(R.string.combo_pump_connected_now);
-                lastConnectionView.setTextColor(Color.WHITE);
+                lastConnectionView.setTextColor(rh.gac(getContext(), R.attr.defaultTextColor));
             } else if (comboPlugin.getPump().lastSuccessfulCmdTime + 30 * 60 * 1000 < System.currentTimeMillis()) {
                 lastConnectionView.setText(rh.gs(R.string.combo_no_pump_connection, min));
-                lastConnectionView.setTextColor(Color.RED);
+                lastConnectionView.setTextColor(rh.gac(getContext(), R.attr.warningColor));
             } else {
                 lastConnectionView.setText(minAgo);
-                lastConnectionView.setTextColor(Color.WHITE);
+                lastConnectionView.setTextColor(rh.gac(getContext(), R.attr.defaultTextColor));
             }
 
             // last bolus
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt b/core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt
index 0114d51601..477b092343 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.utils
 
-import android.graphics.Color
 import android.widget.TextView
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.database.entities.TherapyEvent
@@ -12,28 +11,25 @@ import javax.inject.Singleton
 @Singleton
 class WarnColors @Inject constructor(val rh: ResourceHelper) {
 
-    private val normalColor = Color.WHITE
-    private val warnColor = Color.YELLOW
-    private val urgentColor = Color.RED
 
     fun setColor(view: TextView?, value: Double, warnLevel: Double, urgentLevel: Double) =
-        view?.setTextColor(when {
-            value >= urgentLevel -> urgentColor
-            value >= warnLevel   -> warnColor
-            else                 -> normalColor
-        })
+        view?.setTextColor( rh.gac( view.context ,when {
+            value >= urgentLevel -> R.attr.urgentColor
+            value >= warnLevel   -> R.attr.warnColor
+            else                 -> R.attr.defaultTextColor
+        }))
 
     fun setColorInverse(view: TextView?, value: Double, warnLevel: Double, urgentLevel: Double) =
-        view?.setTextColor(when {
-            value <= urgentLevel -> urgentColor
-            value <= warnLevel   -> warnColor
-            else                 -> normalColor
-        })
+        view?.setTextColor( rh.gac( view.context , when {
+            value <= urgentLevel -> R.attr.urgentColor
+            value <= warnLevel   -> R.attr.warnColor
+            else                 -> R.attr.defaultTextColor
+        }))
 
     fun setColorByAge(view: TextView?, therapyEvent: TherapyEvent, warnThreshold: Double, urgentThreshold: Double) =
-        view?.setTextColor(when {
-            therapyEvent.isOlderThan(urgentThreshold) -> rh.gc(R.color.low)
-            therapyEvent.isOlderThan(warnThreshold)   -> rh.gc(R.color.high)
-            else                                      -> Color.WHITE
-        })
+        view?.setTextColor( rh.gac( view.context , when {
+            therapyEvent.isOlderThan(urgentThreshold) -> R.attr.lowColor
+            therapyEvent.isOlderThan(warnThreshold)   -> R.attr.highColor
+            else                                      -> R.attr.defaultTextColor
+        }))
 }
\ No newline at end of file
diff --git a/core/src/main/res/values-night/colors.xml b/core/src/main/res/values-night/colors.xml
index f667f08368..535d3b8ea5 100644
--- a/core/src/main/res/values-night/colors.xml
+++ b/core/src/main/res/values-night/colors.xml
@@ -212,9 +212,64 @@
     <color name="sphere_plastic_grey">#8c8c8c</color>
     <color name="lightSandGray">#72000000</color>
     <color name="sandGray">#c8666666</color>
-    <color name="treatment">#B2B2B2</color>
+    <color name="midgray">#B2B2B2</color>
     <color name="lightgray">#4dB1B1B1</color>
     <color name="mdtp_button_selected">#33969696</color>
     <color name="plastic">#EBEBEA</color>
 
+    <!-- dash and eros colors -->
+    <color name="omni_yellow">#FFFF00</color>
+    <color name="omni_cyan">#00FFFF</color>
+    <color name="omni_green">#00FF00</color>
+
+    <!-- Button icons - general -->
+    <color name="pod_icon_outline">#9E9E9E</color>
+
+    <!-- Omnipod Wizard -->
+    <color name="omnipod_wizard_progress_bar">#0099CC</color>
+    <color name="omnipod_wizard_finish_button">#ff669900</color>
+    <color name="icon_omnipod_wizard_success">#77DD77</color>
+
+    <!-- Omnipod tab - Button icons -->
+    <color name="ic_omnipod_overview_acknowledge_alerts">#FF4444</color>
+    <color name="ic_omnipod_overview_acknowledge_alerts_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_pod_management">#4CAF50</color>
+    <color name="ic_omnipod_overview_pod_management_graph">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_pod_management_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_refresh_pod_status">#42A5F5</color>
+    <color name="ic_omnipod_overview_refresh_pod_status_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_resume_delivery">#67E86A</color>
+    <color name="ic_omnipod_overview_resume_delivery_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_set_time">#B39DDB</color>
+    <color name="ic_omnipod_overview_set_time_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_suspend_delivery">#ffbf00</color>
+    <color name="ic_omnipod_overview_suspend_delivery_outline">@color/pod_icon_outline</color>
+
+    <!-- Pod Management - Button icons -->
+    <color name="ic_pod_management_activate_pod">#67E86A</color>
+    <color name="ic_pod_management_activate_pod_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_deactivate_pod">#FF4444</color>
+    <color name="ic_pod_management_deactivate_pod_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_discard_pod">#85F803</color>
+    <color name="ic_pod_management_discard_pod_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_play_test_beep">#ffbf00</color>
+    <color name="ic_pod_management_play_test_beep_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_pulse_log">#4DD0E1</color>
+    <color name="ic_pod_management_pulse_log_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_pod_history">#FB8C00</color>
+    <color name="ic_pod_management_pod_history_outline">@color/pod_icon_outline</color>
+
+    <!-- Button icons - general -->
+    <color name="rl_icon_outline">#b9d2d2</color>
+    <color name="rl_board_shape">#66BB6A</color>
+    <color name="rl_antenna_shape">#FF7043</color>
+
+    <!-- Actions tab - Button icons -->
+    <color name="ic_pod_activity_reset_rileylink_config">@color/rl_board_shape</color>
+    <color name="ic_pod_activity_reset_rileylink_config_outline">@color/rl_icon_outline</color>
+
+    <!-- Pod Management - Button icons -->
+    <color name="ic_pod_management_rl_stats">@color/rl_board_shape</color>
+    <color name="ic_pod_management_rl_stats_outline">@color/rl_icon_outline</color>
+
 </resources>
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index ba2653f42b..eeade48d19 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -125,7 +125,7 @@
         <item name="cgmxdripColor">@color/colorCalibrationButton</item>
         <!---BG color-->
         <item name="bgLow">@color/low</item>
-        <item name="bgHigh">@color/high</item>
+        <item name="highColor">@color/high</item>
         <item name="bgInRange">@color/inrange</item>
         <!---Profile Helper -->
         <item name="helperProfileColor">@color/helperProfile</item>
@@ -144,6 +144,17 @@
         <item name="cobAlertColor">@color/cobAlert</item>
         <!---Fill dialog -->
         <item name="actionsConfirmColor">@color/actionsConfirm</item>
+        <!-- dash and eros colors -->
+        <item name="omniMagentaColor">@color/prediction</item>
+        <item name="omniYellowColor">@color/omni_yellow</item>
+        <item name="omniCyanColor">@color/omni_cyan</item>
+        <item name="omniGreenColor">@color/omni_green</item>
+        <item name="omniGrayColor">@color/midgray</item>
+        <item name="omniWizardFinishButtonColor">@color/omnipod_wizard_finish_button</item>
+        <!---Warning Colors : WarnColors.kt-->
+        <item name="warnColor">@color/omni_yellow</item>
+        <item name="urgentColor">@color/alarm</item>
+
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 6b4ef23995..d7a497fcad 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -99,7 +99,7 @@
     <attr name="cgmxdripColor" format="reference|color" />
     <!---BG color-->
     <attr name="bgLow" format="reference|color" />
-    <attr name="bgHigh" format="reference|color" />
+    <attr name="highColor" format="reference|color" />
     <attr name="bgInRange" format="reference|color" />
     <!---Profile Helper -->
     <attr name="helperProfileColor" format="reference|color" />
@@ -109,6 +109,10 @@
     <attr name="errorBackgroundColor" format="reference|color" />
     <!---Warning  -->
     <attr name="warningColor" format="reference|color" />
+    <!---Warning Colors : WarnColors.kt-->
+    <attr name="normalColor" format="reference|color" />
+    <attr name="warnColor" format="reference|color" />
+    <attr name="urgentColor" format="reference|color" />
     <!---TextColor -->
     <attr name="defaultTextColor" format="reference|color" />
     <!---Profile viewer TempBasal -->
@@ -118,4 +122,11 @@
     <attr name="cobAlertColor" format="reference|color" />
     <!---Fill dialog -->
     <attr name="actionsConfirmColor" format="reference|color" />
+    <!-- dash and eros colors -->
+    <attr name="omniMagentaColor" format="reference|color" />
+    <attr name="omniYellowColor" format="reference|color" />
+    <attr name="omniCyanColor" format="reference|color" />
+    <attr name="omniGreenColor" format="reference|color" />
+    <attr name="omniGrayColor" format="reference|color" />
+    <attr name="omniWizardFinishButtonColor" format="reference|color" />
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 99fd9e47a4..fda28d7937 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -81,7 +81,7 @@
     <!--    BgReading-->
     <color name="inrange">#00FF00</color>
     <color name="low">#FF0000</color>
-    <color name="high">#FFFF00</color>
+    <color name="high">#FFFB8C00</color>
     <color name="iob">#1e88e5</color>
     <color name="extendedBolus">#67DFE8</color>
     <color name="iobPredAS">#1ea3e5</color>
@@ -213,9 +213,64 @@
     <color name="sphere_plastic_grey">#8c8c8c</color>
     <color name="lightSandGray">#72000000</color>
     <color name="sandGray">#c8666666</color>
-    <color name="treatment">#B2B2B2</color>
+    <color name="midgray">#B2B2B2</color>
     <color name="lightgray">#4dB1B1B1</color>
     <color name="mdtp_button_selected">#33969696</color>
     <color name="plastic">#EBEBEA</color>
 
+    <!-- dash and eros colors -->
+    <color name="omni_yellow">#FFFF00</color>
+    <color name="omni_cyan">#00FFFF</color>
+    <color name="omni_green">#00FF00</color>
+
+    <!-- Button icons - general -->
+    <color name="pod_icon_outline">#9E9E9E</color>
+
+    <!-- Omnipod Wizard -->
+    <color name="omnipod_wizard_progress_bar">#0099CC</color>
+    <color name="omnipod_wizard_finish_button">#ff669900</color>
+    <color name="icon_omnipod_wizard_success">#77DD77</color>
+
+    <!-- Omnipod tab - Button icons -->
+    <color name="ic_omnipod_overview_acknowledge_alerts">#FF4444</color>
+    <color name="ic_omnipod_overview_acknowledge_alerts_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_pod_management">#4CAF50</color>
+    <color name="ic_omnipod_overview_pod_management_graph">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_pod_management_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_refresh_pod_status">#42A5F5</color>
+    <color name="ic_omnipod_overview_refresh_pod_status_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_resume_delivery">#67E86A</color>
+    <color name="ic_omnipod_overview_resume_delivery_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_set_time">#B39DDB</color>
+    <color name="ic_omnipod_overview_set_time_outline">@color/pod_icon_outline</color>
+    <color name="ic_omnipod_overview_suspend_delivery">#ffbf00</color>
+    <color name="ic_omnipod_overview_suspend_delivery_outline">@color/pod_icon_outline</color>
+
+    <!-- Pod Management - Button icons -->
+    <color name="ic_pod_management_activate_pod">#67E86A</color>
+    <color name="ic_pod_management_activate_pod_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_deactivate_pod">#FF4444</color>
+    <color name="ic_pod_management_deactivate_pod_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_discard_pod">#85F803</color>
+    <color name="ic_pod_management_discard_pod_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_play_test_beep">#ffbf00</color>
+    <color name="ic_pod_management_play_test_beep_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_pulse_log">#4DD0E1</color>
+    <color name="ic_pod_management_pulse_log_outline">@color/pod_icon_outline</color>
+    <color name="ic_pod_management_pod_history">#FB8C00</color>
+    <color name="ic_pod_management_pod_history_outline">@color/pod_icon_outline</color>
+
+    <!-- Button icons - general -->
+    <color name="rl_icon_outline">#b9d2d2</color>
+    <color name="rl_board_shape">#66BB6A</color>
+    <color name="rl_antenna_shape">#FF7043</color>
+
+    <!-- Actions tab - Button icons -->
+    <color name="ic_pod_activity_reset_rileylink_config">@color/rl_board_shape</color>
+    <color name="ic_pod_activity_reset_rileylink_config_outline">@color/rl_icon_outline</color>
+
+    <!-- Pod Management - Button icons -->
+    <color name="ic_pod_management_rl_stats">@color/rl_board_shape</color>
+    <color name="ic_pod_management_rl_stats_outline">@color/rl_icon_outline</color>
+
 </resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 41a7ed5dbc..7f50064f2a 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -124,7 +124,7 @@
         <item name="cgmxdripColor">@color/colorCalibrationButton</item>
         <!---BG color-->
         <item name="bgLow">@color/low</item>
-        <item name="bgHigh">@color/high</item>
+        <item name="highColor">@color/high</item>
         <item name="bgInRange">@color/inrange</item>
         <!---Profile Helper -->
         <item name="helperProfileColor">@color/helperProfile</item>
@@ -143,6 +143,16 @@
         <item name="cobAlertColor">@color/cobAlert</item>
         <!---Fill dialog -->
         <item name="actionsConfirmColor">@color/actionsConfirm</item>
+        <!-- dash and eros colors -->
+        <item name="omniMagentaColor">@color/prediction</item>
+        <item name="omniYellowColor">@color/omni_yellow</item>
+        <item name="omniCyanColor">@color/omni_cyan</item>
+        <item name="omniGreenColor">@color/omni_green</item>
+        <item name="omniGrayColor">@color/midgray</item>
+        <item name="omniWizardFinishButtonColor">@color/omnipod_wizard_finish_button</item>
+        <!---Warning Colors : WarnColors.kt-->
+        <item name="warnColor">@color/high</item>
+        <item name="urgentColor">@color/alarm</item>
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
index 4db2e5fd59..24d6904f2f 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
@@ -92,7 +92,7 @@ class MedtronicFragment : DaggerFragment() {
 
         binding.rlStatus.text = rh.gs(RileyLinkServiceState.NotStarted.resourceId)
 
-        binding.pumpStatusIcon.setTextColor(Color.WHITE)
+        binding.pumpStatusIcon.setTextColor(rh.gac(context,R.attr.defaultTextColor))
         @SuppressLint("SetTextI18n")
         binding.pumpStatusIcon.text = "{fa-bed}"
 
@@ -200,7 +200,7 @@ class MedtronicFragment : DaggerFragment() {
                 rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError != null   -> "{fa-bluetooth-b}   " + rh.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.MedtronicPump))
                 else                                                                           -> "{fa-bluetooth-b}   " + rh.gs(resourceId)
             }
-        binding.rlStatus.setTextColor(if (rileyLinkError != null) Color.RED else Color.WHITE)
+        binding.rlStatus.setTextColor(rh.gac( context, if (rileyLinkError != null) R.attr.warningColor else R.attr.defaultTextColor))
 
         binding.errors.text =
             rileyLinkServiceData.rileyLinkError?.let {
@@ -272,7 +272,7 @@ class MedtronicFragment : DaggerFragment() {
             val min = (System.currentTimeMillis() - medtronicPumpStatus.lastConnection) / 1000 / 60
             if (medtronicPumpStatus.lastConnection + 60 * 1000 > System.currentTimeMillis()) {
                 binding.lastConnection.setText(R.string.medtronic_pump_connected_now)
-                binding.lastConnection.setTextColor(Color.WHITE)
+                binding.lastConnection.setTextColor(rh.gac(context,R.attr.defaultTextColor))
             } else if (medtronicPumpStatus.lastConnection + 30 * 60 * 1000 < System.currentTimeMillis()) {
 
                 if (min < 60) {
@@ -288,10 +288,10 @@ class MedtronicFragment : DaggerFragment() {
                     binding.lastConnection.text = (rh.gq(R.plurals.duration_days, d, d) + " "
                         + rh.gs(R.string.ago))
                 }
-                binding.lastConnection.setTextColor(Color.RED)
+                binding.lastConnection.setTextColor(rh.gac(context,R.attr.warningColor))
             } else {
                 binding.lastConnection.text = minAgo
-                binding.lastConnection.setTextColor(Color.WHITE)
+                binding.lastConnection.setTextColor(rh.gac(context,R.attr.defaultTextColor))
             }
         }
 
diff --git a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt
index 4d477881a7..cff60a0a1d 100644
--- a/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt
+++ b/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt
@@ -15,11 +15,14 @@ import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.Omnipo
 import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonWizardProgressIndicationBinding
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.activity.OmnipodWizardActivityBase
 import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.viewmodel.ViewModelBase
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
 import kotlin.math.roundToInt
 
 abstract class WizardFragmentBase : DaggerFragment() {
 
     protected lateinit var viewModel: ViewModelBase
+    @Inject lateinit var rh: ResourceHelper
 
     var _binding: OmnipodCommonWizardBaseFragmentBinding? = null
     var _progressIndicationBinding: OmnipodCommonWizardProgressIndicationBinding? = null
@@ -48,7 +51,7 @@ abstract class WizardFragmentBase : DaggerFragment() {
         if (nextPage == null) {
             binding.navButtonsLayout.buttonNext.text = getString(R.string.omnipod_common_wizard_button_finish)
             binding.navButtonsLayout.buttonNext.backgroundTintList =
-                ColorStateList.valueOf(resources.getColor(R.color.omnipod_wizard_finish_button, context?.theme))
+                ColorStateList.valueOf(rh.gac(context, R.attr.omniWizardFinishButtonColor))
         }
 
         updateProgressIndication()
diff --git a/omnipod-common/src/main/res/values/colors.xml b/omnipod-common/src/main/res/values/colors.xml
deleted file mode 100644
index 906786a2c3..0000000000
--- a/omnipod-common/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Button icons - general -->
-    <color name="pod_icon_outline">#9E9E9E</color>
-
-    <!-- Omnipod Wizard -->
-    <color name="omnipod_wizard_progress_bar">#0099CC</color>
-    <color name="omnipod_wizard_finish_button">#ff669900</color>
-    <color name="icon_omnipod_wizard_success">#77DD77</color>
-
-    <!-- Omnipod tab - Button icons -->
-    <color name="ic_omnipod_overview_acknowledge_alerts">#FF4444</color>
-    <color name="ic_omnipod_overview_acknowledge_alerts_outline">@color/pod_icon_outline</color>
-    <color name="ic_omnipod_overview_pod_management">#4CAF50</color>
-    <color name="ic_omnipod_overview_pod_management_graph">@color/pod_icon_outline</color>
-    <color name="ic_omnipod_overview_pod_management_outline">@color/pod_icon_outline</color>
-    <color name="ic_omnipod_overview_refresh_pod_status">#42A5F5</color>
-    <color name="ic_omnipod_overview_refresh_pod_status_outline">@color/pod_icon_outline</color>
-    <color name="ic_omnipod_overview_resume_delivery">#67E86A</color>
-    <color name="ic_omnipod_overview_resume_delivery_outline">@color/pod_icon_outline</color>
-    <color name="ic_omnipod_overview_set_time">#B39DDB</color>
-    <color name="ic_omnipod_overview_set_time_outline">@color/pod_icon_outline</color>
-    <color name="ic_omnipod_overview_suspend_delivery">#ffbf00</color>
-    <color name="ic_omnipod_overview_suspend_delivery_outline">@color/pod_icon_outline</color>
-
-    <!-- Pod Management - Button icons -->
-    <color name="ic_pod_management_activate_pod">#67E86A</color>
-    <color name="ic_pod_management_activate_pod_outline">@color/pod_icon_outline</color>
-    <color name="ic_pod_management_deactivate_pod">#FF4444</color>
-    <color name="ic_pod_management_deactivate_pod_outline">@color/pod_icon_outline</color>
-    <color name="ic_pod_management_discard_pod">#85F803</color>
-    <color name="ic_pod_management_discard_pod_outline">@color/pod_icon_outline</color>
-    <color name="ic_pod_management_play_test_beep">#ffbf00</color>
-    <color name="ic_pod_management_play_test_beep_outline">@color/pod_icon_outline</color>
-    <color name="ic_pod_management_pulse_log">#4DD0E1</color>
-    <color name="ic_pod_management_pulse_log_outline">@color/pod_icon_outline</color>
-    <color name="ic_pod_management_pod_history">#FB8C00</color>
-    <color name="ic_pod_management_pod_history_outline">@color/pod_icon_outline</color>
-</resources>
\ No newline at end of file
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt
index 29224a3f78..a5e64791f5 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt
@@ -209,11 +209,11 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
         private fun setTextViewColor(check_result: Boolean, textview: TextView, record: HistoryRecord) {
             if (check_result && !record.isSuccess()) {
                 // Record says not success
-                textview.setTextColor(android.graphics.Color.YELLOW)
+                textview.setTextColor(rh.gac( textview.context, R.attr.omniYellowColor))
                 return
             }
             // On success set color
-            val textColor = when (record.commandType) {
+            val textColorAttr = when (record.commandType) {
                 // Operational
                 OmnipodCommandType.INITIALIZE_POD,
                 OmnipodCommandType.CONFIGURE_ALERTS,
@@ -223,25 +223,25 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
                 OmnipodCommandType.SUSPEND_DELIVERY,
                 OmnipodCommandType.RESUME_DELIVERY,
                 OmnipodCommandType.SET_BASAL_PROFILE   -> {
-                    android.graphics.Color.CYAN
+                    R.attr.omniCyanColor
                 }
                 // User action
                 OmnipodCommandType.PLAY_TEST_BEEP,
                 OmnipodCommandType.ACKNOWLEDGE_ALERTS,
                 OmnipodCommandType.CANCEL_BOLUS        -> {
-                    android.graphics.Color.GREEN
+                    R.attr.omniCyanColor
                 }
                 // Insulin treatment
                 OmnipodCommandType.SET_BOLUS,
                 OmnipodCommandType.SET_TEMPORARY_BASAL -> {
-                    android.graphics.Color.WHITE
+                    R.attr.defaultTextColor
                 }
 
                 else                                   ->
                     // Other
-                    android.graphics.Color.LTGRAY
+                   R.attr.omniGrayColor
             }
-            textview.setTextColor(textColor)
+            textview.setTextColor(rh.gac( textview.context, textColorAttr))
         }
 
         private fun setType(record: HistoryRecord, typeView: TextView) {
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index 4cec6298f6..f8d0588455 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -267,14 +267,14 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
         val quality =
             "${podStateManager.successfulConnectionAttemptsAfterRetries}/$connectionAttempts :: $successPercentageString"
         bluetoothStatusBinding.omnipodDashBluetoothConnectionQuality.text = quality
-        val connectionStatsColor = when {
+        val connectionStatsColor =  rh.gac( context, when {
             connectionSuccessPercentage < 70 && podStateManager.successfulConnectionAttemptsAfterRetries > 50 ->
-                Color.RED
+                R.attr.warningColor
             connectionSuccessPercentage < 90 && podStateManager.successfulConnectionAttemptsAfterRetries > 50 ->
-                Color.YELLOW
+                R.attr.omniYellowColor
             else ->
-                Color.WHITE
-        }
+                R.attr.defaultTextColor
+        })
         bluetoothStatusBinding.omnipodDashBluetoothConnectionQuality.setTextColor(connectionStatsColor)
         bluetoothStatusBinding.omnipodDashDeliveryStatus.text = podStateManager.deliveryStatus?.let {
             podStateManager.deliveryStatus.toString()
@@ -296,11 +296,11 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             podInfoBinding.firmwareVersion.text = PLACEHOLDER
             podInfoBinding.timeOnPod.text = PLACEHOLDER
             podInfoBinding.podExpiryDate.text = PLACEHOLDER
-            podInfoBinding.podExpiryDate.setTextColor(Color.WHITE)
+            podInfoBinding.podExpiryDate.setTextColor(rh.gac(context,R.attr.defaultTextColor))
             podInfoBinding.baseBasalRate.text = PLACEHOLDER
             podInfoBinding.totalDelivered.text = PLACEHOLDER
             podInfoBinding.reservoir.text = PLACEHOLDER
-            podInfoBinding.reservoir.setTextColor(Color.WHITE)
+            podInfoBinding.reservoir.setTextColor(rh.gac(context,R.attr.defaultTextColor))
             podInfoBinding.podActiveAlerts.text = PLACEHOLDER
         } else {
             podInfoBinding.uniqueId.text = podStateManager.uniqueId.toString()
@@ -335,14 +335,15 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
                 ).isNegative
             } ?: false
             podInfoBinding.timeOnPod.setTextColor(
+                rh.gac( context,
                 when {
                     !podStateManager.sameTimeZone ->
-                        Color.MAGENTA
+                        R.attr.omniMagentaColor
                     timeDeviationTooBig ->
-                        Color.YELLOW
+                        R.attr.omniYellowColor
                     else ->
-                        Color.WHITE
-                }
+                        R.attr.defaultTextColor
+                })
             )
 
             // Update Pod expiry time
@@ -352,14 +353,15 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             }
                 ?: PLACEHOLDER
             podInfoBinding.podExpiryDate.setTextColor(
-                when {
+                rh.gac( context,
+                        when {
                     expiresAt != null && ZonedDateTime.now().isAfter(expiresAt) ->
-                        Color.RED
+                        R.attr.warningColor
                     expiresAt != null && ZonedDateTime.now().isAfter(expiresAt.minusHours(4)) ->
-                        Color.YELLOW
+                        R.attr.omniYellowColor
                     else ->
-                        Color.WHITE
-                }
+                        R.attr.defaultTextColor
+                })
             )
 
             podStateManager.alarmType?.let {
@@ -399,7 +401,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             if (podStateManager.pulsesRemaining == null) {
                 podInfoBinding.reservoir.text =
                     rh.gs(R.string.omnipod_common_overview_reservoir_value_over50)
-                podInfoBinding.reservoir.setTextColor(Color.WHITE)
+                podInfoBinding.reservoir.setTextColor(rh.gac(context,R.attr.defaultTextColor))
             } else {
                 // TODO
                 // val lowReservoirThreshold = (omnipodAlertUtil.lowReservoirAlertUnits
@@ -411,11 +413,12 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
                     (podStateManager.pulsesRemaining!! * PodConstants.POD_PULSE_BOLUS_UNITS)
                 )
                 podInfoBinding.reservoir.setTextColor(
+                    rh.gac(context,
                     if (podStateManager.pulsesRemaining!! < lowReservoirThreshold) {
-                        Color.RED
+                        R.attr.warningColor
                     } else {
-                        Color.WHITE
-                    }
+                        R.attr.defaultTextColor
+                    })
                 )
             }
 
@@ -426,10 +429,10 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
 
         if (errors.size == 0) {
             podInfoBinding.errors.text = PLACEHOLDER
-            podInfoBinding.errors.setTextColor(Color.WHITE)
+            podInfoBinding.errors.setTextColor(rh.gac(context,R.attr.defaultTextColor))
         } else {
             podInfoBinding.errors.text = StringUtils.join(errors, System.lineSeparator())
-            podInfoBinding.errors.setTextColor(Color.RED)
+            podInfoBinding.errors.setTextColor(rh.gac(context,R.attr.warningColor))
         }
     }
 
@@ -465,14 +468,15 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
                 )
             )
             val lastConnectionColor =
+                rh.gac(context,
                 if (omnipodDashPumpPlugin.isUnreachableAlertTimeoutExceeded(getPumpUnreachableTimeout().toMillis())) {
-                    Color.RED
+                    R.attr.warningColor
                 } else {
-                    Color.WHITE
-                }
+                    R.attr.defaultTextColor
+                })
             podInfoBinding.lastConnection.setTextColor(lastConnectionColor)
         } else {
-            podInfoBinding.lastConnection.setTextColor(Color.WHITE)
+            podInfoBinding.lastConnection.setTextColor(rh.gac(context,R.attr.defaultTextColor ))
             podInfoBinding.lastConnection.text = PLACEHOLDER
         }
     }
@@ -508,20 +512,20 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
             }
         }
 
-        val podStatusColor = when {
+        val podStatusColor = rh.gac( context, when {
             !podStateManager.isActivationCompleted || podStateManager.isPodKaput || podStateManager.isSuspended ->
-                Color.RED
+                R.attr.warningColor
             podStateManager.activeCommand != null ->
-                Color.YELLOW
+                R.attr.omniYellowColor
             else ->
-                Color.WHITE
-        }
+                R.attr.defaultTextColor
+        })
         podInfoBinding.podStatus.setTextColor(podStatusColor)
     }
 
     private fun updateLastBolus() {
 
-        var textColor = Color.WHITE
+        var textColorAttr = R.attr.defaultTextColor
         podStateManager.activeCommand?.let {
             val requestedBolus = it.requestedBolus
             if (requestedBolus != null) {
@@ -532,14 +536,14 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
                     readableDuration(Duration.ofMillis(SystemClock.elapsedRealtime() - it.createdRealtime))
                 )
                 text += " (uncertain) "
-                textColor = Color.RED
+                textColorAttr = R.attr.warningColor
                 podInfoBinding.lastBolus.text = text
-                podInfoBinding.lastBolus.setTextColor(textColor)
+                podInfoBinding.lastBolus.setTextColor(rh.gac(context, textColorAttr))
                 return
             }
         }
 
-        podInfoBinding.lastBolus.setTextColor(textColor)
+        podInfoBinding.lastBolus.setTextColor(rh.gac(context, textColorAttr))
         podStateManager.lastBolus?.let {
             // display requested units if delivery is in progress
             val bolusSize = it.deliveredUnits()
@@ -552,10 +556,10 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
                 readableDuration(Duration.ofMillis(System.currentTimeMillis() - it.startTime))
             )
             if (!it.deliveryComplete) {
-                textColor = Color.YELLOW
+                textColorAttr = R.attr.omniYellowColor
             }
             podInfoBinding.lastBolus.text = text
-            podInfoBinding.lastBolus.setTextColor(textColor)
+            podInfoBinding.lastBolus.setTextColor(rh.gac(context, textColorAttr))
             return
         }
         podInfoBinding.lastBolus.text = PLACEHOLDER
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
index f7ab77aeb2..cccb5a0d33 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
@@ -245,7 +245,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
                 rileyLinkServiceState.isError && rileyLinkError != null   -> "{fa-bluetooth-b}   " + rh.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.Omnipod))
                 else                                                      -> "{fa-bluetooth-b}   " + rh.gs(resourceId)
             }
-        rileyLinkStatusBinding.rileyLinkStatus.setTextColor(if (rileyLinkServiceState.isError || rileyLinkError != null) Color.RED else Color.WHITE)
+        rileyLinkStatusBinding.rileyLinkStatus.setTextColor( rh.gac(context, if (rileyLinkServiceState.isError || rileyLinkError != null) R.attr.warningColor else R.attr.defaultTextColor))
     }
 
     private fun updateOmnipodStatus() {
@@ -273,11 +273,11 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
             podInfoBinding.firmwareVersion.text = PLACEHOLDER
             podInfoBinding.timeOnPod.text = PLACEHOLDER
             podInfoBinding.podExpiryDate.text = PLACEHOLDER
-            podInfoBinding.podExpiryDate.setTextColor(Color.WHITE)
+            podInfoBinding.podExpiryDate.setTextColor(rh.gac(context, R.attr.defaultTextColor))
             podInfoBinding.baseBasalRate.text = PLACEHOLDER
             podInfoBinding.totalDelivered.text = PLACEHOLDER
             podInfoBinding.reservoir.text = PLACEHOLDER
-            podInfoBinding.reservoir.setTextColor(Color.WHITE)
+            podInfoBinding.reservoir.setTextColor(rh.gac(context, R.attr.defaultTextColor))
             podInfoBinding.podActiveAlerts.text = PLACEHOLDER
         } else {
             podInfoBinding.uniqueId.text = podStateManager.address.toString()
@@ -287,25 +287,27 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
 
             podInfoBinding.timeOnPod.text = readableZonedTime(podStateManager.time)
             podInfoBinding.timeOnPod.setTextColor(
+                rh.gac(context,
                 if (podStateManager.timeDeviatesMoreThan(OmnipodConstants.TIME_DEVIATION_THRESHOLD)) {
-                    Color.RED
+                    R.attr.defaultTextColor
                 } else {
-                    Color.WHITE
-                }
+                    R.attr.warningColor
+                })
             )
             val expiresAt = podStateManager.expiresAt
             if (expiresAt == null) {
                 podInfoBinding.podExpiryDate.text = PLACEHOLDER
-                podInfoBinding.podExpiryDate.setTextColor(Color.WHITE)
+                podInfoBinding.podExpiryDate.setTextColor(rh.gac(context, R.attr.defaultTextColor))
             } else {
                 podInfoBinding.podExpiryDate.text = readableZonedTime(expiresAt)
                 podInfoBinding.podExpiryDate.setTextColor(
+                    rh.gac(context,
                     if (DateTime.now().isAfter(expiresAt)) {
-                        Color.RED
+                        R.attr.warningColor
                     } else {
-                        Color.WHITE
+                        R.attr.defaultTextColor
                     }
-                )
+                ))
             }
 
             if (podStateManager.isPodFaulted) {
@@ -331,18 +333,19 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
             // reservoir
             if (podStateManager.reservoirLevel == null) {
                 podInfoBinding.reservoir.text = rh.gs(R.string.omnipod_common_overview_reservoir_value_over50)
-                podInfoBinding.reservoir.setTextColor(Color.WHITE)
+                podInfoBinding.reservoir.setTextColor(rh.gac(context, R.attr.defaultTextColor))
             } else {
                 val lowReservoirThreshold = (omnipodAlertUtil.lowReservoirAlertUnits
                     ?: OmnipodConstants.DEFAULT_MAX_RESERVOIR_ALERT_THRESHOLD).toDouble()
 
                 podInfoBinding.reservoir.text = rh.gs(R.string.omnipod_common_overview_reservoir_value, podStateManager.reservoirLevel)
                 podInfoBinding.reservoir.setTextColor(
+                    rh.gac(context,
                     if (podStateManager.reservoirLevel < lowReservoirThreshold) {
-                        Color.RED
+                        R.attr.warningColor
                     } else {
-                        Color.WHITE
-                    }
+                        R.attr.defaultTextColor
+                    })
                 )
             }
 
@@ -355,10 +358,10 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
 
         if (errors.size == 0) {
             podInfoBinding.errors.text = PLACEHOLDER
-            podInfoBinding.errors.setTextColor(Color.WHITE)
+            podInfoBinding.errors.setTextColor(rh.gac(context, R.attr.defaultTextColor))
         } else {
             podInfoBinding.errors.text = StringUtils.join(errors, System.lineSeparator())
-            podInfoBinding.errors.setTextColor(Color.RED)
+            podInfoBinding.errors.setTextColor(rh.gac(context, R.attr.warningColor))
         }
     }
 
@@ -366,14 +369,15 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
         if (podStateManager.isPodInitialized && podStateManager.lastSuccessfulCommunication != null) {
             podInfoBinding.lastConnection.text = readableDuration(podStateManager.lastSuccessfulCommunication)
             val lastConnectionColor =
+                rh.gac(context,
                 if (omnipodErosPumpPlugin.isUnreachableAlertTimeoutExceeded(getPumpUnreachableTimeout().millis)) {
-                    Color.RED
+                    R.attr.warningColor
                 } else {
-                    Color.WHITE
-                }
+                    R.attr.defaultTextColor
+                })
             podInfoBinding.lastConnection.setTextColor(lastConnectionColor)
         } else {
-            podInfoBinding.lastConnection.setTextColor(Color.WHITE)
+            podInfoBinding.lastConnection.setTextColor(rh.gac(context, R.attr.defaultTextColor))
             podInfoBinding.lastConnection.text = if (podStateManager.hasPodState() && podStateManager.lastSuccessfulCommunication != null) {
                 readableDuration(podStateManager.lastSuccessfulCommunication)
             } else {
@@ -418,11 +422,12 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
         }
 
         val podStatusColor =
+            rh.gac( context,
             if (!podStateManager.isPodActivationCompleted || podStateManager.isPodDead || podStateManager.isSuspended || (podStateManager.isPodRunning && !podStateManager.isBasalCertain)) {
-                Color.RED
+                R.attr.warningColor
             } else {
-                Color.WHITE
-            }
+                R.attr.defaultTextColor
+            })
         podInfoBinding.podStatus.setTextColor(podStatusColor)
     }
 
@@ -436,11 +441,10 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
                     readableDuration(podStateManager.lastBolusStartTime)
                 )
             val textColor: Int
-
             if (podStateManager.isLastBolusCertain) {
-                textColor = Color.WHITE
+                textColor = rh.gac(context, R.attr.defaultTextColor)
             } else {
-                textColor = Color.RED
+                textColor = rh.gac(context, R.attr.warningColor)
                 text += " (" + rh.gs(R.string.omnipod_eros_uncertain) + ")"
             }
 
@@ -449,7 +453,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
 
         } else {
             podInfoBinding.lastBolus.text = PLACEHOLDER
-            podInfoBinding.lastBolus.setTextColor(Color.WHITE)
+            podInfoBinding.lastBolus.setTextColor(rh.gac(context, R.attr.defaultTextColor))
         }
     }
 
@@ -457,7 +461,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
         if (podStateManager.isPodActivationCompleted && podStateManager.isTempBasalRunning) {
             if (!podStateManager.hasTempBasal()) {
                 podInfoBinding.tempBasal.text = "???"
-                podInfoBinding.tempBasal.setTextColor(Color.RED)
+                podInfoBinding.tempBasal.setTextColor(rh.gac(context, R.attr.warningColor))
             } else {
                 val now = DateTime.now()
 
@@ -471,9 +475,9 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
                 val textColor: Int
                 text = rh.gs(R.string.omnipod_common_overview_temp_basal_value, amount, dateUtil.timeString(startTime.millis), minutesRunning, duration.standardMinutes)
                 if (podStateManager.isTempBasalCertain) {
-                    textColor = Color.WHITE
+                    textColor =  rh.gac(context, R.attr.defaultTextColor)
                 } else {
-                    textColor = Color.RED
+                    textColor =  rh.gac(context, R.attr.warningColor)
                     text += " (" + rh.gs(R.string.omnipod_eros_uncertain) + ")"
                 }
 
@@ -485,9 +489,9 @@ class OmnipodErosOverviewFragment : DaggerFragment() {
             val textColor: Int
 
             if (!podStateManager.isPodActivationCompleted || podStateManager.isTempBasalCertain) {
-                textColor = Color.WHITE
+                textColor = rh.gac(context, R.attr.defaultTextColor)
             } else {
-                textColor = Color.RED
+                textColor = rh.gac(context, R.attr.warningColor)
                 text += " (" + rh.gs(R.string.omnipod_eros_uncertain) + ")"
             }
 
diff --git a/omnipod-eros/src/main/res/values/colors.xml b/omnipod-eros/src/main/res/values/colors.xml
deleted file mode 100644
index 62d3e623c9..0000000000
--- a/omnipod-eros/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Button icons - general -->
-    <color name="rl_icon_outline">#b9d2d2</color>
-    <color name="rl_board_shape">#66BB6A</color>
-    <color name="rl_antenna_shape">#FF7043</color>
-
-    <!-- Actions tab - Button icons -->
-    <color name="ic_pod_activity_reset_rileylink_config">@color/rl_board_shape</color>
-    <color name="ic_pod_activity_reset_rileylink_config_outline">@color/rl_icon_outline</color>
-
-    <!-- Pod Management - Button icons -->
-    <color name="ic_pod_management_rl_stats">@color/rl_board_shape</color>
-    <color name="ic_pod_management_rl_stats_outline">@color/rl_icon_outline</color>
-</resources>
\ No newline at end of file

From 5f163ac3a93ac30f9fa20cdf72ef16314f772d5a Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 30 Mar 2022 14:14:39 +0200
Subject: [PATCH 05/13] Dana: MessageBase -> kt

---
 .../danaRKorean/comm/MsgCheckValue_k.kt       |   2 +-
 .../comm/MsgInitConnStatusBasic_k.kt          |   2 +-
 .../comm/MsgInitConnStatusBolus_k.kt          |   2 +-
 .../comm/MsgInitConnStatusTime_k.kt           |   2 +-
 .../comm/MsgSettingBasalProfileAll_k.kt       |   2 +-
 .../danaRKorean/comm/MsgSettingBasal_k.kt     |   2 +-
 .../danaRKorean/comm/MsgStatusBasic_k.kt      |   2 +-
 .../danaRKorean/comm/MsgStatus_k.kt           |   2 +-
 .../services/DanaRKoreanExecutionService.java |   9 +-
 .../danaRv2/comm/MsgCheckValue_v2.kt          |   2 +-
 .../danaRv2/comm/MsgHistoryEventsV2.kt        |  14 +-
 .../comm/MsgSetAPSTempBasalStart_v2.kt        |   8 +-
 .../danaRv2/comm/MsgSetHistoryEntry_v2.kt     |  10 +-
 .../danaRv2/comm/MsgStatusAPS_v2.kt           |   2 +-
 .../services/DanaRv2ExecutionService.java     |  13 +-
 .../androidaps/danar/SerialIOThread.java      |  11 +-
 .../androidaps/danar/comm/MessageBase.java    | 250 ------------------
 .../androidaps/danar/comm/MessageBase.kt      | 220 +++++++++++++++
 .../androidaps/danar/comm/MsgBolusProgress.kt |   2 +-
 .../androidaps/danar/comm/MsgBolusStart.kt    |   4 +-
 .../danar/comm/MsgBolusStartWithSpeed.kt      |   6 +-
 .../androidaps/danar/comm/MsgBolusStop.kt     |   2 +-
 .../androidaps/danar/comm/MsgCheckValue.kt    |   2 +-
 .../androidaps/danar/comm/MsgError.kt         |   2 +-
 .../androidaps/danar/comm/MsgHistoryAlarm.kt  |   2 +-
 .../androidaps/danar/comm/MsgHistoryAll.kt    |   2 +-
 .../danar/comm/MsgHistoryAllDone.kt           |   2 +-
 .../danar/comm/MsgHistoryBasalHour.kt         |   2 +-
 .../androidaps/danar/comm/MsgHistoryBolus.kt  |   2 +-
 .../androidaps/danar/comm/MsgHistoryCarbo.kt  |   2 +-
 .../danar/comm/MsgHistoryDailyInsulin.kt      |   2 +-
 .../androidaps/danar/comm/MsgHistoryDone.kt   |   2 +-
 .../androidaps/danar/comm/MsgHistoryError.kt  |   2 +-
 .../danar/comm/MsgHistoryGlucose.kt           |   2 +-
 .../androidaps/danar/comm/MsgHistoryNew.kt    |   2 +-
 .../danar/comm/MsgHistoryNewDone.kt           |   2 +-
 .../androidaps/danar/comm/MsgHistoryRefill.kt |   2 +-
 .../danar/comm/MsgHistorySuspend.kt           |   2 +-
 .../danar/comm/MsgInitConnStatusBasic.kt      |   2 +-
 .../danar/comm/MsgInitConnStatusBolus.kt      |   2 +-
 .../danar/comm/MsgInitConnStatusOption.kt     |   2 +-
 .../danar/comm/MsgInitConnStatusTime.kt       |   2 +-
 .../androidaps/danar/comm/MsgPCCommStart.kt   |   2 +-
 .../androidaps/danar/comm/MsgPCCommStop.kt    |   2 +-
 .../danar/comm/MsgSetActivateBasalProfile.kt  |   4 +-
 .../danar/comm/MsgSetBasalProfile.kt          |   6 +-
 .../androidaps/danar/comm/MsgSetCarbsEntry.kt |  20 +-
 .../danar/comm/MsgSetExtendedBolusStart.kt    |   6 +-
 .../danar/comm/MsgSetExtendedBolusStop.kt     |   2 +-
 .../danar/comm/MsgSetSingleBasalProfile.kt    |   4 +-
 .../danar/comm/MsgSetTempBasalStart.kt        |   6 +-
 .../danar/comm/MsgSetTempBasalStop.kt         |   2 +-
 .../androidaps/danar/comm/MsgSetTime.kt       |   4 +-
 .../danar/comm/MsgSetUserOptions.kt           |   4 +-
 .../danar/comm/MsgSettingActiveProfile.kt     |   2 +-
 .../androidaps/danar/comm/MsgSettingBasal.kt  |   2 +-
 .../danar/comm/MsgSettingBasalProfileAll.kt   |   2 +-
 .../danar/comm/MsgSettingGlucose.kt           |   2 +-
 .../danar/comm/MsgSettingMaxValues.kt         |   2 +-
 .../androidaps/danar/comm/MsgSettingMeal.kt   |   2 +-
 .../danar/comm/MsgSettingProfileRatios.kt     |   2 +-
 .../danar/comm/MsgSettingProfileRatiosAll.kt  |   2 +-
 .../danar/comm/MsgSettingPumpTime.kt          |   2 +-
 .../danar/comm/MsgSettingShippingInfo.kt      |   2 +-
 .../danar/comm/MsgSettingUserOptions.kt       |   2 +-
 .../androidaps/danar/comm/MsgStatus.kt        |   2 +-
 .../androidaps/danar/comm/MsgStatusBasic.kt   |   2 +-
 .../danar/comm/MsgStatusBolusExtended.kt      |   2 +-
 .../androidaps/danar/comm/MsgStatusProfile.kt |   2 +-
 .../danar/comm/MsgStatusTempBasal.kt          |   2 +-
 .../danar/services/DanaRExecutionService.java |  11 +-
 .../danaRv2/comm/MessageHashTableRv2Test.kt   |   2 +-
 72 files changed, 345 insertions(+), 371 deletions(-)
 delete mode 100644 danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
 create mode 100644 danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt

diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
index 5b4bc6c046..10b44fc242 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
@@ -10,7 +10,7 @@ class MsgCheckValue_k(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0xF0F1)
+        setCommand(0xF0F1)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
index 11e62c7a8a..8097707145 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
@@ -13,7 +13,7 @@ class MsgInitConnStatusBasic_k(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0303)
+        setCommand(0x0303)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
index 4d683a9bc0..015c7fb7f3 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
@@ -13,7 +13,7 @@ class MsgInitConnStatusBolus_k(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0302)
+        setCommand(0x0302)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
index eb512bd866..67b6f7a78d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
@@ -14,7 +14,7 @@ class MsgInitConnStatusTime_k(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0301)
+        setCommand(0x0301)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
index 5ff2f8f56a..40376ff409 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
@@ -18,7 +18,7 @@ class MsgSettingBasalProfileAll_k(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x3206)
+        setCommand(0x3206)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
index 878cf51dc1..d82af226a8 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
@@ -10,7 +10,7 @@ class MsgSettingBasal_k(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x3202)
+        setCommand(0x3202)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
index f8a207d34d..65f29325a5 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
@@ -9,7 +9,7 @@ class MsgStatusBasic_k(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x020A)
+        setCommand(0x020A)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
index 974c4cfccd..5e180cfdcc 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
@@ -9,7 +9,7 @@ class MsgStatus_k(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x020B)
+        setCommand(0x020B)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
index a2b10c1f88..cb5992d77e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.danaRKorean.services;
 
+import android.annotation.SuppressLint;
 import android.os.Binder;
 import android.os.SystemClock;
 
@@ -89,7 +90,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         }
     }
 
-    public void connect() {
+    @SuppressLint("MissingPermission") public void connect() {
         if (mConnectionInProgress)
             return;
 
@@ -135,7 +136,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
             if (danaPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
-                if (!checkValue.received) {
+                if (!checkValue.isReceived()) {
                     return;
                 }
             }
@@ -280,7 +281,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 t.insulin = 0d;
                 return false;
             }
-            while (!danaPump.getBolusStopped() && !start.failed) {
+            while (!danaPump.getBolusStopped() && !start.getFailed()) {
                 SystemClock.sleep(100);
                 if ((System.currentTimeMillis() - danaPump.getBolusProgressLastTimeStamp()) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
                     danaPump.setBolusStopped(true);
@@ -294,7 +295,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
             commandQueue.readStatus(rh.gs(R.string.bolus_ok), null);
         }
 
-        return !start.failed;
+        return !start.getFailed();
     }
 
     public boolean carbsEntry(int amount) {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
index 826726e8e3..2fc6a4dcfc 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
@@ -16,7 +16,7 @@ class MsgCheckValue_v2(
 
 
     init {
-        SetCommand(0xF0F1)
+        setCommand(0xF0F1)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt
index 1812c4ad65..8373698a93 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEventsV2.kt
@@ -21,21 +21,21 @@ class MsgHistoryEventsV2 constructor(
     }
 
     init {
-        SetCommand(0xE003)
+        setCommand(0xE003)
         if (from > dateUtil.now()) {
             aapsLogger.error("Asked to load from the future")
             from = 0
         }
         if (from == 0L) {
-            AddParamByte(0.toByte())
-            AddParamByte(1.toByte())
-            AddParamByte(1.toByte())
-            AddParamByte(0.toByte())
-            AddParamByte(0.toByte())
+            addParamByte(0.toByte())
+            addParamByte(1.toByte())
+            addParamByte(1.toByte())
+            addParamByte(0.toByte())
+            addParamByte(0.toByte())
         } else {
             val gFrom = GregorianCalendar()
             gFrom.timeInMillis = from
-            AddParamDate(gFrom)
+            addParamDate(gFrom)
         }
         aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + dateUtil.dateAndTimeString(from))
         danaPump.historyDoneReceived = false
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
index 4e5ebae459..b89791cc54 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
@@ -16,16 +16,16 @@ class MsgSetAPSTempBasalStart_v2(
     val PARAM15MIN = 150
 
     init {
-        SetCommand(0xE002)
+        setCommand(0xE002)
         //HARDCODED LIMITS
         if (percent < 0) percent = 0
         if (percent > 500) percent = 500
-        AddParamInt(percent)
+        addParamInt(percent)
         if (thirtyMinutes && percent <= 200) { // 30 min is allowed up to 200%
-            AddParamByte(PARAM30MIN.toByte())
+            addParamByte(PARAM30MIN.toByte())
             aapsLogger.debug(LTag.PUMPCOMM, "APS Temp basal start percent: $percent duration 30 min")
         } else {
-            AddParamByte(PARAM15MIN.toByte())
+            addParamByte(PARAM15MIN.toByte())
             aapsLogger.debug(LTag.PUMPCOMM, "APS Temp basal start percent: $percent duration 15 min")
         }
     }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt
index e38b708888..4520925e82 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt
@@ -11,13 +11,13 @@ class MsgSetHistoryEntry_v2(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0xE004)
-        AddParamByte(type.toByte())
+        setCommand(0xE004)
+        addParamByte(type.toByte())
         val gtime = GregorianCalendar()
         gtime.timeInMillis = time
-        AddParamDateTime(gtime)
-        AddParamInt(param1)
-        AddParamInt(param2)
+        addParamDateTime(gtime)
+        addParamInt(param1)
+        addParamInt(param2)
         aapsLogger.debug(LTag.PUMPCOMM, "Set history entry: type: " + type + " date: " + Date(time).toString() + " param1: " + param1 + " param2: " + param2)
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
index 2ca7e9aae7..a8f6d4ce7d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
@@ -9,7 +9,7 @@ class MsgStatusAPS_v2(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0xE001)
+        setCommand(0xE001)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
index dd854d6cb3..8000770e7a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.danaRv2.services;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Binder;
 import android.os.SystemClock;
@@ -106,7 +107,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         mBinder = new LocalBinder();
     }
 
-    public void connect() {
+    @SuppressLint("MissingPermission") public void connect() {
         if (mConnectionInProgress)
             return;
 
@@ -152,7 +153,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
 
             if (danaPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
-                if (!checkValue.received) {
+                if (!checkValue.isReceived()) {
                     return;
                 }
             }
@@ -348,7 +349,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                     DanaPump.HistoryEntry.CARBS.getValue(), carbtime, carbs, 0);
             mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
             danaPump.lastHistoryFetched = Math.min(danaPump.lastHistoryFetched, carbtime - T.Companion.mins(1).msecs());
-            if (!msgSetHistoryEntry_v2.isReceived() || msgSetHistoryEntry_v2.failed)
+            if (!msgSetHistoryEntry_v2.isReceived() || msgSetHistoryEntry_v2.getFailed())
                 ErrorHelperActivity.Companion.runAlarm(context, rh.gs(R.string.carbs_store_error)
                         , rh.gs(R.string.error), R.raw.boluserror);
         }
@@ -364,7 +365,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 t.insulin = 0d;
                 return false;
             }
-            while (!danaPump.getBolusStopped() && !start.failed) {
+            while (!danaPump.getBolusStopped() && !start.getFailed()) {
                 SystemClock.sleep(100);
                 if ((System.currentTimeMillis() - danaPump.getBolusProgressLastTimeStamp()) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
                     danaPump.setBolusStopped(true);
@@ -410,7 +411,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 rxBus.send(new EventPumpStatusChanged(rh.gs(R.string.disconnecting)));
             }
         });
-        return !start.failed;
+        return !start.getFailed();
     }
 
     public boolean carbsEntry(int amount, long time) {
@@ -472,7 +473,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         MsgSetUserOptions msg = new MsgSetUserOptions(injector);
         mSerialIOThread.sendMessage(msg);
         SystemClock.sleep(200);
-        return new PumpEnactResult(injector).success(!msg.failed);
+        return new PumpEnactResult(injector).success(!msg.getFailed());
     }
 
 }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java b/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java
index 7358a51ab8..41da73946c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java
@@ -74,10 +74,11 @@ public class SerialIOThread extends Thread {
                         message = hashTable.findMessage(command);
                     }
 
-                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + message.getMessageName() + " " + MessageBase.toHexString(extractedBuff));
+                    aapsLogger.debug(LTag.PUMPBTCOMM,
+                            "<<<<< " + message.getMessageName() + " " + MessageBase.Companion.toHexString(extractedBuff));
 
                     // process the message content
-                    message.received = true;
+                    message.setReceived(true);
                     message.handleMessage(extractedBuff);
                     synchronized (message) {
                         message.notify();
@@ -108,7 +109,7 @@ public class SerialIOThread extends Thread {
                 return null;
             }
             if (mReadBuff[length - 2] != (byte) 0x2E || mReadBuff[length - 1] != (byte) 0x2E) {
-                aapsLogger.error("wrong packet lenght=" + length + " data " + MessageBase.toHexString(mReadBuff));
+                aapsLogger.error("wrong packet lenght=" + length + " data " + MessageBase.Companion.toHexString(mReadBuff));
                 disconnect("wrong packet");
                 return null;
             }
@@ -134,7 +135,7 @@ public class SerialIOThread extends Thread {
             mReadBuff = unprocessedData;
             return extractedBuff;
         } else {
-            aapsLogger.error("Wrong beginning of packet len=" + mReadBuff.length + "    " + MessageBase.toHexString(mReadBuff));
+            aapsLogger.error("Wrong beginning of packet len=" + mReadBuff.length + "    " + MessageBase.Companion.toHexString(mReadBuff));
             disconnect("Wrong beginning of packet");
             return null;
         }
@@ -148,7 +149,7 @@ public class SerialIOThread extends Thread {
         processedMessage = message;
 
         byte[] messageBytes = message.getRawMessageBytes();
-        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + message.getMessageName() + " " + MessageBase.toHexString(messageBytes));
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + message.getMessageName() + " " + MessageBase.Companion.toHexString(messageBytes));
 
         try {
             mOutputStream.write(messageBytes);
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
deleted file mode 100644
index 54da53475c..0000000000
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package info.nightscout.androidaps.danar.comm;
-
-import android.annotation.TargetApi;
-import android.os.Build;
-
-import org.joda.time.DateTime;
-import org.joda.time.IllegalInstantException;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-import javax.inject.Inject;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.dana.DanaPump;
-import info.nightscout.androidaps.dana.database.DanaHistoryRecordDao;
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.danar.DanaRPlugin;
-import info.nightscout.androidaps.interfaces.ActivePlugin;
-import info.nightscout.androidaps.interfaces.CommandQueue;
-import info.nightscout.androidaps.interfaces.ConfigBuilder;
-import info.nightscout.androidaps.interfaces.PumpSync;
-import info.nightscout.shared.logging.AAPSLogger;
-import info.nightscout.shared.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
-import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage;
-import info.nightscout.androidaps.utils.CRC;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-
-/*
- *  00  01   02  03   04   05  06
- *
- *  7E  7E  len  F1  CMD  SUB data CRC CRC 2E  2E
- */
-
-public class MessageBase {
-    @Inject public AAPSLogger aapsLogger;
-    @Inject public DateUtil dateUtil;
-    @Inject public DanaPump danaPump;
-    @Inject public DanaRPlugin danaRPlugin;
-    @Inject public DanaRKoreanPlugin danaRKoreanPlugin;
-    @Inject public DanaRv2Plugin danaRv2Plugin;
-    @Inject public RxBus rxBus;
-    @Inject public ResourceHelper rh;
-    @Inject public ActivePlugin activePlugin;
-    @Inject public ConfigBuilder configBuilder;
-    @Inject public CommandQueue commandQueue;
-    @Inject public DetailedBolusInfoStorage detailedBolusInfoStorage;
-    @Inject public TemporaryBasalStorage temporaryBasalStorage;
-    @Inject public ConstraintChecker constraintChecker;
-    @Inject public PumpSync pumpSync;
-    @Inject public DanaHistoryRecordDao danaHistoryRecordDao;
-    HasAndroidInjector injector;
-
-    public byte[] buffer = new byte[512];
-    private int position = 6;
-
-    public boolean received = false;
-    public boolean failed = false;
-
-    public MessageBase(HasAndroidInjector injector) {
-        injector.androidInjector().inject(this);
-        this.injector = injector;
-    }
-
-    public void SetCommand(int cmd) {
-        this.buffer[4] = (byte) (cmd >> 8 & 0xFF);
-        this.buffer[5] = (byte) (cmd & 0xFF);
-    }
-
-    public void AddParamByte(byte data) {
-        this.buffer[this.position++] = data;
-    }
-
-    public void AddParamInt(int data) {
-        this.buffer[this.position++] = (byte) (data >> 8 & 0xFF);
-        this.buffer[this.position++] = (byte) (data & 0xFF);
-    }
-
-    public void AddParamDate(GregorianCalendar date) {
-        AddParamByte((byte) (date.get(Calendar.YEAR) - 1900 - 100));
-        AddParamByte((byte) (date.get(Calendar.MONTH) + 1));
-        AddParamByte((byte) (date.get(Calendar.DAY_OF_MONTH)));
-        AddParamByte((byte) (date.get(Calendar.HOUR_OF_DAY)));
-        AddParamByte((byte) (date.get(Calendar.MINUTE)));
-    }
-
-    public void AddParamDateTime(GregorianCalendar date) {
-        AddParamByte((byte) (date.get(Calendar.YEAR) - 1900 - 100));
-        AddParamByte((byte) (date.get(Calendar.MONTH) + 1));
-        AddParamByte((byte) (date.get(Calendar.DAY_OF_MONTH)));
-        AddParamByte((byte) (date.get(Calendar.HOUR_OF_DAY)));
-        AddParamByte((byte) (date.get(Calendar.MINUTE)));
-        AddParamByte((byte) (date.get(Calendar.SECOND)));
-    }
-
-    public void AddParamDateTimeReversed(long timestamp) {
-        GregorianCalendar date = new GregorianCalendar();
-        date.setTimeInMillis(timestamp);
-        AddParamByte((byte) (date.get(Calendar.SECOND)));
-        AddParamByte((byte) (date.get(Calendar.MINUTE)));
-        AddParamByte((byte) (date.get(Calendar.HOUR_OF_DAY)));
-        AddParamByte((byte) (date.get(Calendar.DAY_OF_MONTH)));
-        AddParamByte((byte) (date.get(Calendar.MONTH) + 1));
-        AddParamByte((byte) (date.get(Calendar.YEAR) - 1900 - 100));
-    }
-
-    public byte[] getRawMessageBytes() {
-        this.buffer[0] = (byte) 0x7E;
-        this.buffer[1] = (byte) 0x7E;
-
-        int length = this.position - 3;
-
-        this.buffer[2] = (byte) length;
-        this.buffer[3] = (byte) 0xF1;
-
-        this.AddParamInt(CRC.INSTANCE.getCrc16(this.buffer, 3, length));
-
-        this.buffer[length + 5] = (byte) 0x2E;
-        this.buffer[length + 6] = (byte) 0x2E;
-
-        return Arrays.copyOf(buffer, length + 7);
-    }
-
-    public String getMessageName() {
-        return MessageOriginalNames.INSTANCE.getName(getCommand());
-    }
-
-    public void handleMessage(byte[] bytes) {
-        if (bytes.length > 6) {
-            int command = (bytes[5] & 0xFF) | ((bytes[4] << 8) & 0xFF00);
-            aapsLogger.debug(LTag.PUMPCOMM, "UNPROCESSED MSG: " + getMessageName() + " Command: " + String.format("%04X", command) + " Data: " + toHexString(bytes));
-        } else {
-            aapsLogger.debug(LTag.PUMPCOMM, "MISFORMATTED MSG: " + toHexString(bytes));
-        }
-    }
-
-    public void handleMessageNotReceived() {
-    }
-
-    public int getCommand() {
-        return byteFromRawBuff(buffer, 5) | (byteFromRawBuff(buffer, 4) << 8);
-    }
-
-    public int byteFromRawBuff(byte[] buff, int offset) {
-        return buff[offset] & 0xFF;
-    }
-
-    public int intFromBuff(byte[] buff, int offset, int length) {
-        offset += 6;
-        switch (length) {
-            case 1:
-                return byteFromRawBuff(buff, offset);
-            case 2:
-                return (byteFromRawBuff(buff, offset) << 8) + byteFromRawBuff(buff, offset + 1);
-            case 3:
-                return (byteFromRawBuff(buff, offset + 2) << 16) + (byteFromRawBuff(buff, offset + 1) << 8) + byteFromRawBuff(buff, offset);
-            case 4:
-                return (byteFromRawBuff(buff, offset + 3) << 24) + (byteFromRawBuff(buff, offset + 2) << 16) + (byteFromRawBuff(buff, offset + 1) << 8) + byteFromRawBuff(buff, offset);
-        }
-        return 0;
-    }
-
-    public long dateTimeFromBuff(byte[] buff, int offset) {
-        return
-                new DateTime(
-                        2000 + intFromBuff(buff, offset, 1),
-                        intFromBuff(buff, offset + 1, 1),
-                        intFromBuff(buff, offset + 2, 1),
-                        intFromBuff(buff, offset + 3, 1),
-                        intFromBuff(buff, offset + 4, 1),
-                        0
-                ).getMillis();
-    }
-
-    public synchronized long dateTimeSecFromBuff(byte[] buff, int offset) {
-
-        try {
-            return new DateTime(
-                    2000 + intFromBuff(buff, offset, 1),
-                    intFromBuff(buff, offset + 1, 1),
-                    intFromBuff(buff, offset + 2, 1),
-                    intFromBuff(buff, offset + 3, 1),
-                    intFromBuff(buff, offset + 4, 1),
-                    intFromBuff(buff, offset + 5, 1)
-            ).getMillis();
-        } catch (IllegalInstantException e) {
-            // expect
-            // org.joda.time.IllegalInstantException: Illegal instant due to time zone offset transition (daylight savings time 'gap')
-            // add 1 hour
-            return new DateTime(
-                    2000 + intFromBuff(buff, offset, 1),
-                    intFromBuff(buff, offset + 1, 1),
-                    intFromBuff(buff, offset + 2, 1),
-                    intFromBuff(buff, offset + 3, 1) + 1,
-                    intFromBuff(buff, offset + 4, 1),
-                    intFromBuff(buff, offset + 5, 1)
-            ).getMillis();
-        }
-    }
-
-    public long dateFromBuff(byte[] buff, int offset) {
-        return
-                new DateTime(
-                        2000 + intFromBuff(buff, offset, 1),
-                        intFromBuff(buff, offset + 1, 1),
-                        intFromBuff(buff, offset + 2, 1),
-                        0,
-                        0
-                ).getMillis();
-    }
-
-    @TargetApi(Build.VERSION_CODES.KITKAT)
-    public static String stringFromBuff(byte[] buff, int offset, int length) {
-        byte[] strBuff = new byte[length];
-        System.arraycopy(buff, offset + 6, strBuff, 0, length);
-        return new String(strBuff, StandardCharsets.UTF_8);
-    }
-
-    @TargetApi(Build.VERSION_CODES.KITKAT)
-    public static String asciiStringFromBuff(byte[] buff, int offset, int length) {
-        byte[] strBuff = new byte[length];
-        System.arraycopy(buff, offset + 6, strBuff, 0, length);
-        for (int pos = 0; pos < length; pos++)
-            strBuff[pos] += 65; // "A"
-        return new String(strBuff, StandardCharsets.UTF_8);
-    }
-
-    public static String toHexString(byte[] buff) {
-        StringBuilder sb = new StringBuilder();
-
-        int count = 0;
-        for (byte element : buff) {
-            sb.append(String.format("%02x ", element));
-            if (++count % 4 == 0) sb.append(" ");
-        }
-
-        return sb.toString();
-    }
-
-    public boolean isReceived() {
-        return received;
-    }
-}
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt
new file mode 100644
index 0000000000..33007e943f
--- /dev/null
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt
@@ -0,0 +1,220 @@
+package info.nightscout.androidaps.danar.comm
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.dana.database.DanaHistoryRecordDao
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danar.comm.MessageOriginalNames.getName
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.CommandQueue
+import info.nightscout.androidaps.interfaces.ConfigBuilder
+import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage
+import info.nightscout.androidaps.utils.CRC.getCrc16
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.shared.logging.AAPSLogger
+import info.nightscout.shared.logging.LTag
+import org.joda.time.DateTime
+import org.joda.time.IllegalInstantException
+import java.nio.charset.StandardCharsets
+import java.util.*
+import javax.inject.Inject
+
+/*
+ *  00  01   02  03   04   05  06
+ *
+ *  7E  7E  len  F1  CMD  SUB data CRC CRC 2E  2E
+ */
+open class MessageBase(injector: HasAndroidInjector) {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var danaPump: DanaPump
+    @Inject lateinit var danaRPlugin: DanaRPlugin
+    @Inject lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+    @Inject lateinit var danaRv2Plugin: DanaRv2Plugin
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var rh: ResourceHelper
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var configBuilder: ConfigBuilder
+    @Inject lateinit var commandQueue: CommandQueue
+    @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Inject lateinit var temporaryBasalStorage: TemporaryBasalStorage
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var pumpSync: PumpSync
+    @Inject lateinit var danaHistoryRecordDao: DanaHistoryRecordDao
+
+    var injector: HasAndroidInjector
+    var buffer = ByteArray(512)
+    private var position = 6
+    var isReceived = false
+    var failed = false
+
+    fun setCommand(cmd: Int) {
+        buffer[4] = (cmd shr 8 and 0xFF).toByte()
+        buffer[5] = (cmd and 0xFF).toByte()
+    }
+
+    fun addParamByte(data: Byte) {
+        buffer[position++] = data
+    }
+
+    fun addParamInt(data: Int) {
+        buffer[position++] = (data shr 8 and 0xFF).toByte()
+        buffer[position++] = (data and 0xFF).toByte()
+    }
+
+    fun addParamDate(date: GregorianCalendar) {
+        addParamByte((date[Calendar.YEAR] - 1900 - 100).toByte())
+        addParamByte((date[Calendar.MONTH] + 1).toByte())
+        addParamByte(date[Calendar.DAY_OF_MONTH].toByte())
+        addParamByte(date[Calendar.HOUR_OF_DAY].toByte())
+        addParamByte(date[Calendar.MINUTE].toByte())
+    }
+
+    fun addParamDateTime(date: GregorianCalendar) {
+        addParamByte((date[Calendar.YEAR] - 1900 - 100).toByte())
+        addParamByte((date[Calendar.MONTH] + 1).toByte())
+        addParamByte(date[Calendar.DAY_OF_MONTH].toByte())
+        addParamByte(date[Calendar.HOUR_OF_DAY].toByte())
+        addParamByte(date[Calendar.MINUTE].toByte())
+        addParamByte(date[Calendar.SECOND].toByte())
+    }
+
+    fun addParamDateTimeReversed(timestamp: Long) {
+        val date = GregorianCalendar()
+        date.timeInMillis = timestamp
+        addParamByte(date[Calendar.SECOND].toByte())
+        addParamByte(date[Calendar.MINUTE].toByte())
+        addParamByte(date[Calendar.HOUR_OF_DAY].toByte())
+        addParamByte(date[Calendar.DAY_OF_MONTH].toByte())
+        addParamByte((date[Calendar.MONTH] + 1).toByte())
+        addParamByte((date[Calendar.YEAR] - 1900 - 100).toByte())
+    }
+
+    val rawMessageBytes: ByteArray
+        get() {
+            buffer[0] = 0x7E.toByte()
+            buffer[1] = 0x7E.toByte()
+            val length = position - 3
+            buffer[2] = length.toByte()
+            buffer[3] = 0xF1.toByte()
+            addParamInt(getCrc16(buffer, 3, length).toInt())
+            buffer[length + 5] = 0x2E.toByte()
+            buffer[length + 6] = 0x2E.toByte()
+            return buffer.copyOf(length + 7)
+        }
+    val messageName: String?
+        get() = getName(command)
+
+    open fun handleMessage(bytes: ByteArray) {
+        if (bytes.size > 6) {
+            val command: Int = bytes[5].toInt() and 0xFF or (bytes[4].toInt() shl 8 and 0xFF00)
+            aapsLogger.debug(LTag.PUMPCOMM, "UNPROCESSED MSG: $messageName Command: ${String.format("%04X", command)} Data: ${toHexString(bytes)}")
+        } else {
+            aapsLogger.debug(LTag.PUMPCOMM, "MISFORMATTED MSG: ${toHexString(bytes)}")
+        }
+    }
+
+    open fun handleMessageNotReceived() {}
+    val command: Int
+        get() = byteFromRawBuff(buffer, 5) or (byteFromRawBuff(buffer, 4) shl 8)
+
+    private fun byteFromRawBuff(buff: ByteArray, offset: Int): Int {
+        return buff[offset].toInt() and 0xFF
+    }
+
+    fun intFromBuff(buff: ByteArray, buffOffset: Int, length: Int): Int {
+        val offset = buffOffset + 6
+        when (length) {
+            1 -> return byteFromRawBuff(buff, offset)
+            2 -> return (byteFromRawBuff(buff, offset) shl 8) + byteFromRawBuff(buff, offset + 1)
+            3 -> return (byteFromRawBuff(buff, offset + 2) shl 16) + (byteFromRawBuff(buff, offset + 1) shl 8) + byteFromRawBuff(buff, offset)
+            4 -> return (byteFromRawBuff(buff, offset + 3) shl 24) + (byteFromRawBuff(buff, offset + 2) shl 16) + (byteFromRawBuff(buff, offset + 1) shl 8) + byteFromRawBuff(buff, offset)
+        }
+        return 0
+    }
+
+    fun dateTimeFromBuff(buff: ByteArray, offset: Int): Long {
+        return DateTime(
+            2000 + intFromBuff(buff, offset, 1),
+            intFromBuff(buff, offset + 1, 1),
+            intFromBuff(buff, offset + 2, 1),
+            intFromBuff(buff, offset + 3, 1),
+            intFromBuff(buff, offset + 4, 1),
+            0
+        ).millis
+    }
+
+    @Synchronized fun dateTimeSecFromBuff(buff: ByteArray, offset: Int): Long {
+        return try {
+            DateTime(
+                2000 + intFromBuff(buff, offset, 1),
+                intFromBuff(buff, offset + 1, 1),
+                intFromBuff(buff, offset + 2, 1),
+                intFromBuff(buff, offset + 3, 1),
+                intFromBuff(buff, offset + 4, 1),
+                intFromBuff(buff, offset + 5, 1)
+            ).millis
+        } catch (e: IllegalInstantException) {
+            // expect
+            // org.joda.time.IllegalInstantException: Illegal instant due to time zone offset transition (daylight savings time 'gap')
+            // add 1 hour
+            DateTime(
+                2000 + intFromBuff(buff, offset, 1),
+                intFromBuff(buff, offset + 1, 1),
+                intFromBuff(buff, offset + 2, 1),
+                intFromBuff(buff, offset + 3, 1) + 1,
+                intFromBuff(buff, offset + 4, 1),
+                intFromBuff(buff, offset + 5, 1)
+            ).millis
+        }
+    }
+
+    fun dateFromBuff(buff: ByteArray, offset: Int): Long {
+        return DateTime(
+            2000 + intFromBuff(buff, offset, 1),
+            intFromBuff(buff, offset + 1, 1),
+            intFromBuff(buff, offset + 2, 1),
+            0,
+            0
+        ).millis
+    }
+
+    companion object {
+
+        fun stringFromBuff(buff: ByteArray, offset: Int, length: Int): String {
+            val strBuff = ByteArray(length)
+            System.arraycopy(buff, offset + 6, strBuff, 0, length)
+            return String(strBuff, StandardCharsets.UTF_8)
+        }
+
+        fun asciiStringFromBuff(buff: ByteArray, offset: Int, length: Int): String {
+            val strBuff = ByteArray(length)
+            System.arraycopy(buff, offset + 6, strBuff, 0, length)
+            for (pos in 0 until length) strBuff[pos] = (strBuff[pos] + 65).toByte() // "A"
+            return String(strBuff, StandardCharsets.UTF_8)
+        }
+
+        fun toHexString(buff: ByteArray): String {
+            val sb = StringBuilder()
+            for ((count, element) in buff.withIndex()) {
+                sb.append(String.format("%02x ", element))
+                if ((count + 1) % 4 == 0) sb.append(" ")
+            }
+            return sb.toString()
+        }
+    }
+
+    init {
+        @Suppress("LeakingThis")
+        injector.androidInjector().inject(this)
+        this.injector = injector
+    }
+}
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
index bd3e4d7215..a169b5a0fe 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
@@ -11,7 +11,7 @@ class MsgBolusProgress(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0202)
+        setCommand(0x0202)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
index eb31892303..3be1ee030c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
@@ -10,10 +10,10 @@ class MsgBolusStart(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0102)
+        setCommand(0x0102)
         // HARDCODED LIMIT
         amount = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
-        AddParamInt((amount * 100).toInt())
+        addParamInt((amount * 100).toInt())
         aapsLogger.debug(LTag.PUMPBTCOMM, "Bolus start : $amount")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
index f9dcfc7d55..184ac266ae 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
@@ -11,11 +11,11 @@ class MsgBolusStartWithSpeed(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0104)
+        setCommand(0x0104)
         // HARDCODED LIMIT
         amount = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
-        AddParamInt((amount * 100).toInt())
-        AddParamByte(speed.toByte())
+        addParamInt((amount * 100).toInt())
+        addParamByte(speed.toByte())
         aapsLogger.debug(LTag.PUMPBTCOMM, "Bolus start : $amount speed: $speed")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
index 16e40b180b..1393a6319e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
@@ -10,7 +10,7 @@ class MsgBolusStop(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0101)
+        setCommand(0x0101)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
index 977aabe483..613549ebbf 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
@@ -9,7 +9,7 @@ class MsgCheckValue(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0xF0F1)
+        setCommand(0xF0F1)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
index daa9f34aac..b2c5c0924b 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
@@ -10,7 +10,7 @@ class MsgError(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0601)
+        setCommand(0x0601)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt
index 9209356c84..726a2705f5 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt
@@ -8,7 +8,7 @@ class MsgHistoryAlarm(
 ) : MsgHistoryAll(injector) {
 
     init {
-        SetCommand(0x3105)
+        setCommand(0x3105)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
     // Handle message taken from MsgHistoryAll
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
index f34772b430..8946d93d7d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
@@ -12,7 +12,7 @@ open class MsgHistoryAll(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x41F2)
+        setCommand(0x41F2)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
index 1677e46280..41fc852480 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
@@ -8,7 +8,7 @@ class MsgHistoryAllDone(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x41F1)
+        setCommand(0x41F1)
         danaPump.historyDoneReceived = false
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt
index 75c6ade3da..9167377efb 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt
@@ -8,7 +8,7 @@ class MsgHistoryBasalHour(
 ) : MsgHistoryAll(injector) {
 
     init {
-        SetCommand(0x310A)
+        setCommand(0x310A)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
     // Handle message taken from MsgHistoryAll
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt
index 14274ce2eb..1d67099a84 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt
@@ -8,7 +8,7 @@ class MsgHistoryBolus(
 ) : MsgHistoryAll(injector) {
 
     init {
-        SetCommand(0x3101)
+        setCommand(0x3101)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
     // Handle message taken from MsgHistoryAll
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt
index 1915080ea6..cdaa47e279 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt
@@ -8,7 +8,7 @@ class MsgHistoryCarbo(
 ) : MsgHistoryAll(injector) {
 
     init {
-        SetCommand(0x3107)
+        setCommand(0x3107)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
     // Handle message taken from MsgHistoryAll
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt
index 725b7a999a..9788da4e77 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt
@@ -8,7 +8,7 @@ class MsgHistoryDailyInsulin(
 ) : MsgHistoryAll(injector) {
 
     init {
-        SetCommand(0x3102)
+        setCommand(0x3102)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
     // Handle message taken from MsgHistoryAll
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
index 520590f25e..d9e705650d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
@@ -8,7 +8,7 @@ class MsgHistoryDone(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x31F1)
+        setCommand(0x31F1)
         danaPump.historyDoneReceived = false
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt
index 2d4308bd7b..ba4aba7520 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt
@@ -8,7 +8,7 @@ class MsgHistoryError(
 ) : MsgHistoryAll(injector) {
 
     init {
-        SetCommand(0x3106)
+        setCommand(0x3106)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
     // Handle message taken from MsgHistoryAll
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt
index 75939b8e07..8ae08e757a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt
@@ -8,7 +8,7 @@ class MsgHistoryGlucose(
 ) : MsgHistoryAll(injector) {
 
     init {
-        SetCommand(0x3104)
+        setCommand(0x3104)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
     // Handle message taken from MsgHistoryAll
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt
index 9bf8f4d34a..2bca4a994d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt
@@ -8,7 +8,7 @@ class MsgHistoryNew(
 ) : MsgHistoryAll(injector) {
 
     init {
-        SetCommand(0x42F2)
+        setCommand(0x42F2)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
     // Handle message taken from MsgHistoryAll
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
index 8b44ee4b11..3897cb090d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
@@ -8,7 +8,7 @@ class MsgHistoryNewDone(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x42F1)
+        setCommand(0x42F1)
         danaPump.historyDoneReceived = false
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt
index 8a1bf30aa8..dc87964c01 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt
@@ -8,7 +8,7 @@ class MsgHistoryRefill(
 ) : MsgHistoryAll(injector) {
 
     init {
-        SetCommand(0x3108)
+        setCommand(0x3108)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
     // Handle message taken from MsgHistoryAll
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt
index 68d333baa7..a739778eda 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt
@@ -8,7 +8,7 @@ class MsgHistorySuspend(
 ) : MsgHistoryAll(injector) {
 
     init {
-        SetCommand(0x3109)
+        setCommand(0x3109)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
     // Handle message taken from MsgHistoryAll
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
index 13f24c6b20..53d45b38f1 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
@@ -8,7 +8,7 @@ class MsgInitConnStatusBasic(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0303)
+        setCommand(0x0303)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
index ccaabf7798..ae2e2a0f14 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
@@ -12,7 +12,7 @@ class MsgInitConnStatusBolus(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0302)
+        setCommand(0x0302)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
index d649d15380..40bbdbb4c3 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
@@ -12,7 +12,7 @@ class MsgInitConnStatusOption(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0304)
+        setCommand(0x0304)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
index ac731c8629..4da82df223 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
@@ -13,7 +13,7 @@ class MsgInitConnStatusTime(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0301)
+        setCommand(0x0301)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt
index 2544397b9e..4e5c7881f0 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt
@@ -8,7 +8,7 @@ class MsgPCCommStart constructor(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x3001)
+        setCommand(0x3001)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt
index c80b4a9faf..35eca2ee56 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt
@@ -8,7 +8,7 @@ class MsgPCCommStop(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x3002)
+        setCommand(0x3002)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt
index 0de762ded1..d86d212f7d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt
@@ -10,8 +10,8 @@ class MsgSetActivateBasalProfile(
 
     // index 0-3
     init {
-        SetCommand(0x330C)
-        AddParamByte(index)
+        setCommand(0x330C)
+        addParamByte(index)
         aapsLogger.debug(LTag.PUMPCOMM, "Activate basal profile: $index")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
index 3b574cdafd..40bf1582b2 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
@@ -14,10 +14,10 @@ class MsgSetBasalProfile(
 
     // index 0-3
     init {
-        SetCommand(0x3306)
-        AddParamByte(index)
+        setCommand(0x3306)
+        addParamByte(index)
         for (i in 0..23) {
-            AddParamInt((values[i] * 100).toInt())
+            addParamInt((values[i] * 100).toInt())
         }
         aapsLogger.debug(LTag.PUMPCOMM, "Set basal profile: $index")
     }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt
index c294b54fc7..1c94f1fd03 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt
@@ -11,19 +11,19 @@ class MsgSetCarbsEntry(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0402)
+        setCommand(0x0402)
         aapsLogger.debug(LTag.PUMPBTCOMM, "New message")
         val calendar = Calendar.getInstance()
         calendar.timeInMillis = time
-        AddParamByte(info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_CARBO)
-        AddParamByte((calendar[Calendar.YEAR] % 100).toByte())
-        AddParamByte((calendar[Calendar.MONTH] + 1).toByte())
-        AddParamByte(calendar[Calendar.DAY_OF_MONTH].toByte())
-        AddParamByte(calendar[Calendar.HOUR_OF_DAY].toByte())
-        AddParamByte(calendar[Calendar.MINUTE].toByte())
-        AddParamByte(calendar[Calendar.SECOND].toByte())
-        AddParamByte(0x43.toByte()) //??
-        AddParamInt(amount)
+        addParamByte(info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_CARBO)
+        addParamByte((calendar[Calendar.YEAR] % 100).toByte())
+        addParamByte((calendar[Calendar.MONTH] + 1).toByte())
+        addParamByte(calendar[Calendar.DAY_OF_MONTH].toByte())
+        addParamByte(calendar[Calendar.HOUR_OF_DAY].toByte())
+        addParamByte(calendar[Calendar.MINUTE].toByte())
+        addParamByte(calendar[Calendar.SECOND].toByte())
+        addParamByte(0x43.toByte()) //??
+        addParamInt(amount)
         aapsLogger.debug(LTag.PUMPBTCOMM, "Set carb entry: " + amount + " date " + calendar.time.toString())
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
index bd45b14c5c..16faf09825 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
@@ -12,14 +12,14 @@ class MsgSetExtendedBolusStart(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0407)
+        setCommand(0x0407)
         aapsLogger.debug(LTag.PUMPBTCOMM, "New message")
         // HARDCODED LIMITS
         if (halfhours < 1) halfhours = 1
         if (halfhours > 16) halfhours = 16
         amount = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
-        AddParamInt((amount * 100).toInt())
-        AddParamByte(halfhours)
+        addParamInt((amount * 100).toInt())
+        addParamByte(halfhours)
         aapsLogger.debug(LTag.PUMPBTCOMM, "Set extended bolus start: " + (amount * 100).toInt() / 100.0 + "U halfhours: " + halfhours.toInt())
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt
index 1816d46464..1cdf88cc59 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt
@@ -8,7 +8,7 @@ class MsgSetExtendedBolusStop(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0406)
+        setCommand(0x0406)
         aapsLogger.debug(LTag.PUMPBTCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
index c38d6d454d..d0c4a2477e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
@@ -13,9 +13,9 @@ class MsgSetSingleBasalProfile(
 
     // index 0-3
     init {
-        SetCommand(0x3302)
+        setCommand(0x3302)
         for (i in 0..23) {
-            AddParamInt((values[i] * 100).toInt())
+            addParamInt((values[i] * 100).toInt())
         }
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt
index 5d06c3ec81..e7c4324a47 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt
@@ -10,15 +10,15 @@ class MsgSetTempBasalStart(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0401)
+        setCommand(0x0401)
 
         //HARDCODED LIMITS
         if (percent < 0) percent = 0
         if (percent > 200) percent = 200
         if (durationInHours < 1) durationInHours = 1
         if (durationInHours > 24) durationInHours = 24
-        AddParamByte((percent and 255).toByte())
-        AddParamByte((durationInHours and 255).toByte())
+        addParamByte((percent and 255).toByte())
+        addParamByte((durationInHours and 255).toByte())
         aapsLogger.debug(LTag.PUMPCOMM, "Temp basal start percent: $percent duration hours: $durationInHours")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt
index 19b1d53c78..42d40cbc82 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt
@@ -8,7 +8,7 @@ class MsgSetTempBasalStop(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0403)
+        setCommand(0x0403)
         aapsLogger.debug(LTag.PUMPBTCOMM, "Temp basal stop")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt
index eeb137b1f0..aa938a46f5 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt
@@ -9,8 +9,8 @@ class MsgSetTime(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x330a)
-        AddParamDateTimeReversed(time)
+        setCommand(0x330a)
+        addParamDateTimeReversed(time)
         aapsLogger.debug(LTag.PUMPCOMM, "New message: time:" + dateUtil.dateAndTimeString(time))
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
index f4a7820cc7..dad025aac3 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
@@ -8,7 +8,7 @@ class MsgSetUserOptions(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x330B)
+        setCommand(0x330B)
         if (danaPump.userOptionsFromPump == null) {
             // No options set -> Exiting
             aapsLogger.debug(LTag.PUMPCOMM, "NO USER OPTIONS LOADED EXITING!")
@@ -23,7 +23,7 @@ class MsgSetUserOptions(
             danaPump.userOptionsFromPump!![9] = danaPump.shutdownHour.toByte()
             danaPump.userOptionsFromPump!![27] = danaPump.lowReservoirRate.toByte()
             for (element in danaPump.userOptionsFromPump!!) {
-                AddParamByte(element)
+                addParamByte(element)
             }
             aapsLogger.debug(LTag.PUMPCOMM, "New message")
         }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
index 44429c0432..e0a8847906 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
@@ -8,7 +8,7 @@ class MsgSettingActiveProfile(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x320C)
+        setCommand(0x320C)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
index e8bf65dc5c..ce9ceb7c0f 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
@@ -9,7 +9,7 @@ class MsgSettingBasal(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x3202)
+        setCommand(0x3202)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
index 6a0a43e64b..68fc2d854a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
@@ -57,7 +57,7 @@ class MsgSettingBasalProfileAll(
     }
 
     init {
-        SetCommand(0x3206)
+        setCommand(0x3206)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
index 9ea3fbf189..48d81317c7 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
@@ -12,7 +12,7 @@ class MsgSettingGlucose(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x3209)
+        setCommand(0x3209)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
index 67fac7ee59..09bf49c133 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
@@ -8,7 +8,7 @@ class MsgSettingMaxValues(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x3205)
+        setCommand(0x3205)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
index 7e3875595b..a4961ca12d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
@@ -12,7 +12,7 @@ class MsgSettingMeal(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x3203)
+        setCommand(0x3203)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
index 38c3754106..2448b3fdd3 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
@@ -9,7 +9,7 @@ class MsgSettingProfileRatios(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x3204)
+        setCommand(0x3204)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
index daedb412b3..2b921da8ae 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
@@ -9,7 +9,7 @@ class MsgSettingProfileRatiosAll(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x320D)
+        setCommand(0x320D)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
index 7ec8351ed6..31c3b121fa 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
@@ -10,7 +10,7 @@ class MsgSettingPumpTime(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x320A)
+        setCommand(0x320A)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
index dfcb396bfb..38ff9b2fe4 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
@@ -8,7 +8,7 @@ class MsgSettingShippingInfo(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x3207)
+        setCommand(0x3207)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
index 85e25faade..35ae795431 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
@@ -9,7 +9,7 @@ class MsgSettingUserOptions(
 
 
     init {
-        SetCommand(0x320B)
+        setCommand(0x320B)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
index 06636a9676..dc96ebda6c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
@@ -8,7 +8,7 @@ class MsgStatus(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x020B)
+        setCommand(0x020B)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
index b63f834d4b..ccc3f2f0c9 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
@@ -8,7 +8,7 @@ class MsgStatusBasic(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x020A)
+        setCommand(0x020A)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
index 77dfb989bc..e086368a0f 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
@@ -11,7 +11,7 @@ class MsgStatusBolusExtended(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0207)
+        setCommand(0x0207)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
index 4a0160ecf8..b6344791bf 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
@@ -9,7 +9,7 @@ class MsgStatusProfile(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0204)
+        setCommand(0x0204)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
index 42c5ef31da..5314201e81 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
@@ -11,7 +11,7 @@ class MsgStatusTempBasal(
 ) : MessageBase(injector) {
 
     init {
-        SetCommand(0x0205)
+        setCommand(0x0205)
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
index dd26fb017e..76682b9690 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.danar.services;
 
+import android.annotation.SuppressLint;
 import android.os.Binder;
 import android.os.SystemClock;
 
@@ -93,7 +94,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         }
     }
 
-    public void connect() {
+    @SuppressLint("MissingPermission") public void connect() {
         if (mConnectionInProgress)
             return;
 
@@ -139,7 +140,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
 
             if (danaPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
-                if (!checkValue.received) {
+                if (!checkValue.isReceived()) {
                     return;
                 }
             }
@@ -292,7 +293,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 t.insulin = 0d;
                 return false;
             }
-            while (!danaPump.getBolusStopped() && !start.failed) {
+            while (!danaPump.getBolusStopped() && !start.getFailed()) {
                 SystemClock.sleep(100);
                 if ((System.currentTimeMillis() - danaPump.getBolusProgressLastTimeStamp()) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
                     danaPump.setBolusStopped(true);
@@ -359,7 +360,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 commandQueue.readStatus(rh.gs(R.string.bolus_ok), null);
             }
         }
-        return !start.failed;
+        return !start.getFailed();
     }
 
     public boolean carbsEntry(int amount) {
@@ -400,6 +401,6 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         MsgSetUserOptions msg = new MsgSetUserOptions(injector);
         mSerialIOThread.sendMessage(msg);
         SystemClock.sleep(200);
-        return new PumpEnactResult(injector).success(!msg.failed);
+        return new PumpEnactResult(injector).success(!msg.getFailed());
     }
 }
diff --git a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2Test.kt b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2Test.kt
index 8fc5853a0c..2b5fa5d957 100644
--- a/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2Test.kt
+++ b/danar/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2Test.kt
@@ -20,7 +20,7 @@ class MessageHashTableRv2Test : DanaRTestBase() {
         Assert.assertEquals(0xE001, testPacket.command.toLong())
         // try putting another command
         val testMessage = MessageBase(injector)
-        testMessage.SetCommand(0xE005)
+        testMessage.setCommand(0xE005)
         messageHashTableRv2.put(testMessage)
         Assert.assertEquals(0xE005, messageHashTableRv2.findMessage(0xE005).command.toLong())
     }

From 4151836a9a05682317aac097f9f265827744f9fa Mon Sep 17 00:00:00 2001
From: osodebailar <a.eggen@gmail.com>
Date: Wed, 30 Mar 2022 17:43:00 +0200
Subject: [PATCH 06/13] Theme switcher preparation: gac for TDD , automation
 and misc. preparation

---
 .../plugins/source/BGSourceFragment.kt        |  2 +-
 app/src/main/res/drawable/ic_byoda.xml        |  2 +-
 .../main/res/layout/activity_setupwizard.xml  |  2 +-
 .../general/automation/AutomationFragment.kt  |  8 +--
 .../automation/elements/StaticLabel.kt        |  3 +-
 .../automation/triggers/TriggerConnector.kt   |  2 +-
 .../androidaps/activities/TDDStatsActivity.kt | 60 +++++++++----------
 .../activities/PrefImportListActivity.kt      |  8 +--
 core/src/main/res/drawable/ic_fortyfiveup.xml |  2 +-
 .../main/res/layout/activity_tdd_stats.xml    |  2 +-
 core/src/main/res/values-night/colors.xml     |  2 +-
 core/src/main/res/values-night/styles.xml     | 14 +++++
 core/src/main/res/values/attrs.xml            | 14 +++++
 core/src/main/res/values/colors.xml           | 15 ++++-
 core/src/main/res/values/styles.xml           | 39 ++++++++----
 15 files changed, 118 insertions(+), 57 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
index c4249955ed..264a999eb8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
@@ -143,7 +143,7 @@ class BGSourceFragment : DaggerFragment() {
                 val previous = glucoseValues[position - 1]
                 val diff = previous.timestamp - glucoseValue.timestamp
                 if (diff < T.secs(20).msecs())
-                    holder.binding.root.setBackgroundColor(rh.gc(R.color.errorAlertBackground))
+                    holder.binding.root.setBackgroundColor(rh.gac(context, R.attr.bgsourceError))
             }
 
             holder.binding.root.setOnLongClickListener {
diff --git a/app/src/main/res/drawable/ic_byoda.xml b/app/src/main/res/drawable/ic_byoda.xml
index 1bf06ca7d8..97edb8f9d5 100644
--- a/app/src/main/res/drawable/ic_byoda.xml
+++ b/app/src/main/res/drawable/ic_byoda.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M12.107,3.666c-4.603,0 -8.335,3.732 -8.335,8.335s3.732,8.335 8.335,8.335s8.335,-3.731 8.335,-8.335V3.666H12.107zM12.107,18.335c-3.498,0 -6.334,-2.836 -6.334,-6.334c0,-3.498 2.836,-6.334 6.334,-6.334c3.498,0 6.334,2.836 6.334,6.334C18.442,15.499 15.606,18.335 12.107,18.335z"
-      android:fillColor="@color/colorLightGray"/>
+      android:fillColor="?attr/cgmdexColor"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_setupwizard.xml b/app/src/main/res/layout/activity_setupwizard.xml
index d70bd1063c..c84e5f652d 100644
--- a/app/src/main/res/layout/activity_setupwizard.xml
+++ b/app/src/main/res/layout/activity_setupwizard.xml
@@ -62,7 +62,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center_horizontal"
-        android:background="@color/black_overlay"
+        android:background="@color/black_alpha_40"
         android:orientation="horizontal"
         android:paddingLeft="16dp"
         android:paddingRight="16dp">
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
index 15d72f6682..c27f843e97 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
@@ -173,10 +173,10 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
         override fun onBindViewHolder(holder: ViewHolder, position: Int) {
             val automation = automationPlugin.at(position)
             holder.binding.rootLayout.setBackgroundColor(
-                rh.gc(
-                    if (automation.userAction) R.color.mdtp_line_dark
-                    else if (automation.areActionsValid()) R.color.ribbonDefault
-                    else R.color.errorAlertBackground
+                rh.gac( context,
+                    if (automation.userAction) R.attr.userAction
+                    else if (automation.areActionsValid()) R.attr.validActions
+                    else R.attr.actionsError
                 )
             )
             holder.binding.eventTitle.text = automation.title
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.kt
index 57ef1c09c7..2e31509ff8 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/StaticLabel.kt
@@ -4,6 +4,7 @@ import android.graphics.Typeface
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
+import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
@@ -28,7 +29,7 @@ class StaticLabel(private val rh: ResourceHelper) : Element() {
             LinearLayout(root.context).apply {
                 orientation = LinearLayout.HORIZONTAL
                 layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-                setBackgroundColor(rh.gc(android.R.color.black))
+                setBackgroundColor(rh.gac(context, R.attr.automationBackgroundColor))
                 addView(
                     TextView(root.context).apply {
                         text = label
diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
index 31de36e247..65f910a658 100644
--- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
+++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
@@ -165,7 +165,7 @@ class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) {
             text = rh.gs(connectorType.stringRes)
             gravity = gravity or Gravity.CENTER_VERTICAL
             setTypeface(typeface, Typeface.BOLD)
-            setBackgroundColor(rh.gc(R.color.black_overlay))
+            setBackgroundColor(rh.gac(context, R.attr.automationOverlayColor))
             layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT).also { ll ->
                 ll.setMargins(rh.dpToPx(3), rh.dpToPx(3), rh.dpToPx(3), rh.dpToPx(3))
             }
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
index c5bfd4a69b..11c1954b55 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
@@ -89,27 +89,27 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
         // add stats headers to tables
         binding.mainTable.addView(
             TableRow(this).also { trHead ->
-                trHead.setBackgroundColor(Color.DKGRAY)
+                trHead.setBackgroundColor(rh.gac(this, R.attr.tddHeaderBackground))
                 trHead.layoutParams = TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
                 trHead.addView(TextView(this).also { labelDate ->
                     labelDate.text = rh.gs(R.string.date)
-                    labelDate.setTextColor(Color.WHITE)
+                    labelDate.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                 })
                 trHead.addView(TextView(this).also { labelBasalRate ->
                     labelBasalRate.text = rh.gs(R.string.basalrate)
-                    labelBasalRate.setTextColor(Color.WHITE)
+                    labelBasalRate.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                 })
                 trHead.addView(TextView(this).also { labelBolus ->
                     labelBolus.text = rh.gs(R.string.bolus)
-                    labelBolus.setTextColor(Color.WHITE)
+                    labelBolus.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                 })
                 trHead.addView(TextView(this).also { labelTdd ->
                     labelTdd.text = rh.gs(R.string.tdd)
-                    labelTdd.setTextColor(Color.WHITE)
+                    labelTdd.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                 })
                 trHead.addView(TextView(this).also { labelRatio ->
                     labelRatio.text = rh.gs(R.string.ratio)
-                    labelRatio.setTextColor(Color.WHITE)
+                    labelRatio.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                 })
             }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
         )
@@ -117,19 +117,19 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
         // cumulative table
         binding.cumulativeTable.addView(
             TableRow(this).also { ctrHead ->
-                ctrHead.setBackgroundColor(Color.DKGRAY)
+                ctrHead.setBackgroundColor(rh.gac(this, R.attr.tddHeaderBackground))
                 ctrHead.layoutParams = TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
                 ctrHead.addView(TextView(this).also { labelCumAmountDays ->
                     labelCumAmountDays.text = rh.gs(R.string.amount_days)
-                    labelCumAmountDays.setTextColor(Color.WHITE)
+                    labelCumAmountDays.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                 })
                 ctrHead.addView(TextView(this).also { labelCumTdd ->
                     labelCumTdd.text = rh.gs(R.string.tdd)
-                    labelCumTdd.setTextColor(Color.WHITE)
+                    labelCumTdd.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                 })
                 ctrHead.addView(TextView(this).also { labelCumRatio ->
                     labelCumRatio.text = rh.gs(R.string.ratio)
-                    labelCumRatio.setTextColor(Color.WHITE)
+                    labelCumRatio.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                 })
             }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
         )
@@ -137,19 +137,19 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
         // exponential table
         binding.expweightTable.addView(
             TableRow(this).also { etrHead ->
-                etrHead.setBackgroundColor(Color.DKGRAY)
+                etrHead.setBackgroundColor(rh.gac(this, R.attr.tddHeaderBackground))
                 etrHead.layoutParams = TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
                 etrHead.addView(TextView(this).also { labelExpWeight ->
                     labelExpWeight.text = rh.gs(R.string.weight)
-                    labelExpWeight.setTextColor(Color.WHITE)
+                    labelExpWeight.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                 })
                 etrHead.addView(TextView(this).also { labelExpTdd ->
                     labelExpTdd.text = rh.gs(R.string.tdd)
-                    labelExpTdd.setTextColor(Color.WHITE)
+                    labelExpTdd.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                 })
                 etrHead.addView(TextView(this).also { labelExpRatio ->
                     labelExpRatio.text = rh.gs(R.string.ratio)
-                    labelExpRatio.setTextColor(Color.WHITE)
+                    labelExpRatio.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                 })
             }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
         )
@@ -285,9 +285,9 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                 // Create the table row
                 binding.mainTable.addView(
                     TableRow(this@TDDStatsActivity).also { tr ->
-                        if (i % 2 != 0) tr.setBackgroundColor(Color.DKGRAY)
+                        if (i % 2 != 0) tr.setBackgroundColor(rh.gac(this, R.attr.tddHeaderBackground))
                         if (dummies.contains(record))
-                            tr.setBackgroundColor(Color.argb(125, 255, 0, 0))
+                            tr.setBackgroundColor(rh.gac(this, R.attr.dummyBackground))
 
                         tr.id = 100 + i
                         tr.layoutParams = TableLayout.LayoutParams(
@@ -299,27 +299,27 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                         tr.addView(TextView(this@TDDStatsActivity).also { labelDATE ->
                             labelDATE.id = 200 + i
                             labelDATE.text = df1.format(Date(record.timestamp))
-                            labelDATE.setTextColor(Color.WHITE)
+                            labelDATE.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                         })
                         tr.addView(TextView(this@TDDStatsActivity).also { labelBASAL ->
                             labelBASAL.id = 300 + i
                             labelBASAL.text = rh.gs(R.string.formatinsulinunits, record.basalAmount)
-                            labelBASAL.setTextColor(Color.WHITE)
+                            labelBASAL.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                         })
                         tr.addView(TextView(this@TDDStatsActivity).also { labelBOLUS ->
                             labelBOLUS.id = 400 + i
                             labelBOLUS.text = rh.gs(R.string.formatinsulinunits, record.bolusAmount)
-                            labelBOLUS.setTextColor(Color.WHITE)
+                            labelBOLUS.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                         })
                         tr.addView(TextView(this@TDDStatsActivity).also { labelTDD ->
                             labelTDD.id = 500 + i
                             labelTDD.text = rh.gs(R.string.formatinsulinunits, tdd)
-                            labelTDD.setTextColor(Color.WHITE)
+                            labelTDD.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                         })
                         tr.addView(TextView(this@TDDStatsActivity).also { labelRATIO ->
                             labelRATIO.id = 600 + i
                             labelRATIO.text = (100 * tdd / magicNumber).roundToInt().toString() + "%"
-                            labelRATIO.setTextColor(Color.WHITE)
+                            labelRATIO.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                         })
                     }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
                 )
@@ -338,7 +338,7 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                 // Create the cumulative table row
                 binding.cumulativeTable.addView(
                     TableRow(this@TDDStatsActivity).also { ctr ->
-                        if (i % 2 == 0) ctr.setBackgroundColor(Color.DKGRAY)
+                        if (i % 2 == 0) ctr.setBackgroundColor(rh.gac(this, R.attr.tddHeaderBackground))
                         ctr.id = 700 + i
                         ctr.layoutParams = TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
 
@@ -346,19 +346,19 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                         ctr.addView(TextView(this@TDDStatsActivity).also { labelDAYS ->
                             labelDAYS.id = 800 + i
                             labelDAYS.text = i.toString()
-                            labelDAYS.setTextColor(Color.WHITE)
+                            labelDAYS.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                         })
 
                         ctr.addView(TextView(this@TDDStatsActivity).also { labelCUMTDD ->
                             labelCUMTDD.id = 900 + i
                             labelCUMTDD.text = rh.gs(R.string.formatinsulinunits, sum / i)
-                            labelCUMTDD.setTextColor(Color.WHITE)
+                            labelCUMTDD.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                         })
 
                         ctr.addView(TextView(this@TDDStatsActivity).also { labelCUMRATIO ->
                             labelCUMRATIO.id = 1000 + i
                             labelCUMRATIO.text = (100 * sum / i / magicNumber).roundToInt().toString() + "%"
-                            labelCUMRATIO.setTextColor(Color.WHITE)
+                            labelCUMRATIO.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                         })
                     }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
                 )
@@ -366,7 +366,7 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
             if (isOldData(historyList) && activePlugin.activePump.pumpDescription.needsManualTDDLoad) {
                 binding.message.visibility = View.VISIBLE
                 binding.message.text = rh.gs(R.string.olddata_Message)
-            } else binding.mainTable.setBackgroundColor(Color.TRANSPARENT)
+            } else binding.mainTable.setBackgroundColor(rh.gac(this, R.attr.mainTableBackground))
             if (historyList.isNotEmpty() && df1.format(Date(historyList[0].timestamp)) == df1.format(Date())) {
                 //Today should not be included
                 historyList.removeAt(0)
@@ -390,7 +390,7 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
             // Create the exponential table row
             binding.expweightTable.addView(
                 TableRow(this@TDDStatsActivity).also { etr ->
-                    if (i % 2 != 0) etr.setBackgroundColor(Color.DKGRAY)
+                    if (i % 2 != 0) etr.setBackgroundColor(rh.gac(this, R.attr.tddHeaderBackground))
                     etr.id = 1100 + i
                     etr.layoutParams = TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
 
@@ -398,7 +398,7 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                     etr.addView(TextView(this@TDDStatsActivity).also { labelWEIGHT ->
                         labelWEIGHT.id = 1200 + i
                         labelWEIGHT.text = "0.3\n0.5\n0.7"
-                        labelWEIGHT.setTextColor(Color.WHITE)
+                        labelWEIGHT.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                     })
                     etr.addView(TextView(this@TDDStatsActivity).also { labelEXPTDD ->
                         labelEXPTDD.id = 1300 + i
@@ -407,7 +407,7 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                 ${rh.gs(R.string.formatinsulinunits, weighted05)}
                 ${rh.gs(R.string.formatinsulinunits, weighted07)}
                 """.trimIndent()
-                        labelEXPTDD.setTextColor(Color.WHITE)
+                        labelEXPTDD.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                     })
                     etr.addView(TextView(this@TDDStatsActivity).also { labelEXPRATIO ->
                         labelEXPRATIO.id = 1400 + i
@@ -416,7 +416,7 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
                 ${(100 * weighted05 / magicNumber).roundToInt()}%
                 ${(100 * weighted07 / magicNumber).roundToInt()}%
                 """.trimIndent()
-                        labelEXPRATIO.setTextColor(Color.WHITE)
+                        labelEXPRATIO.setTextColor(rh.gac(this, R.attr.defaultTextColor))
                     })
                 }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT)
             )
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
index 74be8377e4..040a3d65cd 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
@@ -87,8 +87,8 @@ class PrefImportListActivity : DaggerAppCompatActivity() {
 
                 prefFile.metadata[PrefsMetadataKey.AAPS_FLAVOUR]?.let {
                     metaVariantFormat.text = it.value
-                    val color = if (it.status == PrefsStatus.OK) R.color.metadataOk else R.color.metadataTextWarning
-                    metaVariantFormat.setTextColor(rh.gc(color))
+                    val colorattr = if (it.status == PrefsStatus.OK) R.attr.metadataTextOkColor else R.attr.metadataTextWarningColor
+                    metaVariantFormat.setTextColor(rh.gac( metaVariantFormat.context, colorattr))
                 }
 
                 prefFile.metadata[PrefsMetadataKey.CREATED_AT]?.let {
@@ -97,8 +97,8 @@ class PrefImportListActivity : DaggerAppCompatActivity() {
 
                 prefFile.metadata[PrefsMetadataKey.AAPS_VERSION]?.let {
                     metaAppVersion.text = it.value
-                    val color = if (it.status == PrefsStatus.OK) R.color.metadataOk else R.color.metadataTextWarning
-                    metaAppVersion.setTextColor(rh.gc(color))
+                    val colorattr = if (it.status == PrefsStatus.OK) R.attr.metadataTextOkColor else R.attr.metadataTextWarningColor
+                    metaAppVersion.setTextColor(rh.gac( metaVariantFormat.context, colorattr))
                 }
 
                 prefFile.metadata[PrefsMetadataKey.DEVICE_NAME]?.let {
diff --git a/core/src/main/res/drawable/ic_fortyfiveup.xml b/core/src/main/res/drawable/ic_fortyfiveup.xml
index 930857ec66..cb3fa33a08 100644
--- a/core/src/main/res/drawable/ic_fortyfiveup.xml
+++ b/core/src/main/res/drawable/ic_fortyfiveup.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M18.783,12.728c-0.1,-2.66 -0.143,-5.908 0.243,-7.753l0.001,-0.001c0,0 -0.001,0 -0.001,0c0,0 0,-0.001 0,-0.001l-0.001,0.001c-1.845,0.386 -5.093,0.343 -7.753,0.243l-0.351,2.225c0,0 2.111,0.12 4.003,0.146L4.229,18.283l1.488,1.488L16.412,9.076c0.026,1.892 0.146,4.003 0.146,4.003L18.783,12.728z"
-      android:fillColor="@color/white"/>
+      android:fillColor="?attr/icCheckboxTrendColor"/>
 </vector>
diff --git a/core/src/main/res/layout/activity_tdd_stats.xml b/core/src/main/res/layout/activity_tdd_stats.xml
index 5f1d7dad33..850d7e0e3a 100644
--- a/core/src/main/res/layout/activity_tdd_stats.xml
+++ b/core/src/main/res/layout/activity_tdd_stats.xml
@@ -179,7 +179,7 @@
 
         <info.nightscout.androidaps.utils.ui.SingleClickButton
             android:id="@+id/reload"
-            style="@style/ButtonSmallFontStyle"
+            style="?android:attr/buttonStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
diff --git a/core/src/main/res/values-night/colors.xml b/core/src/main/res/values-night/colors.xml
index 535d3b8ea5..f0cd81a3ae 100644
--- a/core/src/main/res/values-night/colors.xml
+++ b/core/src/main/res/values-night/colors.xml
@@ -9,7 +9,6 @@
     <color name="mdtp_line_dark">#808080</color>
     <color name="colorLightGray">#d8d8d8</color>
     <color name="cardColorBackground">#212121</color>
-    <color name="black_overlay">#66000000</color>
     <color name="gray">#BBBBBB</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
@@ -172,6 +171,7 @@
     <color name="info">#77dd77</color>
     <color name="error_background">#66FC0000</color>
     <color name="ok_background">@color/colorPrimaryDark</color>
+    <color name="dummy_background">#7DFF0000</color>
 
     <color name="tempTargetBackground">#77dd77</color>
     <color name="exercise">#67DFE8</color>
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index eeade48d19..9adb3ad930 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -155,6 +155,20 @@
         <item name="warnColor">@color/omni_yellow</item>
         <item name="urgentColor">@color/alarm</item>
 
+        <!---Automation -->
+        <item name="userAction">@color/mdtp_line_dark</item>
+        <item name="validActions">@color/ribbonDefault</item>
+        <item name="actionsError">@color/errorAlertBackground</item>
+        <item name="automationBackgroundColor">@color/black</item>
+        <item name="automationOverlayColor">@color/black_alpha_40</item>
+        <!---BG source -->
+        <item name="bgsourceError">@color/errorAlertBackground</item>
+        <!---TDD-statistics -->
+        <item name="tddHeaderBackground">@android:color/darker_gray</item>
+        <item name="mainTableBackground">@android:color/transparent</item>
+        <item name="dummyBackground">@color/dummy_background</item>
+        <!-- Icon Colors -->
+        <item name="icCheckboxTrendColor">@color/white</item>
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index d7a497fcad..853fbb245c 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -129,4 +129,18 @@
     <attr name="omniGreenColor" format="reference|color" />
     <attr name="omniGrayColor" format="reference|color" />
     <attr name="omniWizardFinishButtonColor" format="reference|color" />
+    <!---Automation -->
+    <attr name="userAction" format="reference|color" />
+    <attr name="validActions" format="reference|color" />
+    <attr name="actionsError" format="reference|color" />
+    <attr name="automationBackgroundColor" format="reference|color" />
+    <attr name="automationOverlayColor" format="reference|color" />
+    <!---BG source -->
+    <attr name="bgsourceError" format="reference|color" />
+    <!---TDD-statistics -->
+    <attr name="tddHeaderBackground" format="reference|color" />
+    <attr name="mainTableBackground" format="reference|color" />
+    <attr name="dummyBackground" format="reference|color" />
+    <!-- Icon Colors -->
+    <attr name="icCheckboxTrendColor" format="reference|color" />
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index fda28d7937..a7771698e2 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -9,7 +9,6 @@
     <color name="mdtp_line_dark">#808080</color>
     <color name="colorLightGray">#d8d8d8</color>
     <color name="cardColorBackground">@color/lightgray</color>
-    <color name="black_overlay">#66000000</color>
     <color name="gray">#BBBBBB</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
@@ -173,6 +172,7 @@
     <color name="info">#77dd77</color>
     <color name="error_background">#66FC0000</color>
     <color name="ok_background">@color/white</color>
+    <color name="dummy_background">#7DFF0000</color>
 
     <color name="tempTargetBackground">#77dd77</color>
     <color name="exercise">#67DFE8</color>
@@ -273,4 +273,17 @@
     <color name="ic_pod_management_rl_stats">@color/rl_board_shape</color>
     <color name="ic_pod_management_rl_stats_outline">@color/rl_icon_outline</color>
 
+    <!---Example light theme colors -->
+    <color name="aaps_theme_light_primary">#1D5FA5</color>
+    <color name="aaps_theme_light_onPrimary">#FFFFFF</color>
+    <color name="aaps_theme_light_secondary">#5954A8</color>
+    <color name="aaps_theme_light_onSecondary">#FFFFFF</color>
+    <color name="aaps_theme_light_error">#B3261E</color>
+    <color name="aaps_theme_light_onError">#FFFFFF</color>
+    <color name="aaps_theme_light_background">#FFFBFE</color>
+    <color name="aaps_theme_light_onBackground">#1C1B1F</color>
+    <color name="aaps_theme_light_surface">#FFFBFE</color>
+    <color name="aaps_theme_light_onSurface">#1C1B1F</color>
+    <color name="aaps_theme_light_surfaceVariant">#E7E0EC</color>
+
 </resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 7f50064f2a..bc6a94884d 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -2,22 +2,26 @@
 <resources xmlns:ns2="http://schemas.android.com/tools">
 
     <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
+        <!---Example light theme colors -->
+        <item name="colorPrimary">@color/lightSandGray</item>
+        <item name="colorOnPrimary">@color/aaps_theme_light_onPrimary</item>
+        <item name="colorSecondary">@color/aaps_theme_light_secondary</item>
+        <item name="colorOnSecondary">@color/aaps_theme_light_onSecondary</item>
+        <item name="colorError">@color/aaps_theme_light_error</item>
+        <item name="colorOnError">@color/aaps_theme_light_onError</item>
+        <item name="android:colorBackground">@color/aaps_theme_light_background</item>
+        <item name="colorOnBackground">@color/aaps_theme_light_onBackground</item>
+        <item name="colorSurface">@color/aaps_theme_light_surface</item>
+        <item name="colorOnSurface">@color/aaps_theme_light_onSurface</item>
+
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@android:color/holo_blue_light</item>
+        <item name="colorAccent">@color/aaps_theme_light_secondary</item>
         <item name="dialogTitleBackground">@color/dialog_title_background</item>
         <item name="dialogTitleColor">@color/dialog_title_color</item>
         <item name="dialogTitleIconTint">@color/dialog_title_icon_tint</item>
         <!-- New MaterialComponents attributes. -->
-        <item name="colorSecondary">@android:color/holo_blue_light</item>
         <item name="colorPrimaryVariant">@color/primaryLightColorDefault</item>
         <item name="colorSecondaryVariant">@color/secondaryLightColorDefault</item>
-        <item name="colorOnPrimary">@color/primaryTextColorDefault</item>
-        <item name="colorSurface">@color/white</item>
-        <item name="colorOnSurface">@color/gray</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <item name="colorOnBackground">@color/white</item>
-        <item name="colorOnError">@color/black</item>
         <item name="scrimBackground">@color/white</item>
         <item name="popupMenuStyle">@style/Widget.MaterialComponents.PopupMenu</item>
         <item name="actionOverflowMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Overflow</item>
@@ -120,7 +124,7 @@
         <item name="viewPortbackgroundColor">@color/white_alpha_20</item>
         <item name="tempTargetBackgroundColor">@color/tempTargetBackground</item>
         <!---CGM source-->
-        <item name="cgmdexColor">@color/colorLightGray</item>
+        <item name="cgmdexColor">@color/mdtp_line_dark</item>
         <item name="cgmxdripColor">@color/colorCalibrationButton</item>
         <!---BG color-->
         <item name="bgLow">@color/low</item>
@@ -153,6 +157,21 @@
         <!---Warning Colors : WarnColors.kt-->
         <item name="warnColor">@color/high</item>
         <item name="urgentColor">@color/alarm</item>
+        <!---Automation -->
+        <item name="userAction">@color/mdtp_line_dark</item>
+        <item name="validActions">@color/ribbonDefault</item>
+        <item name="actionsError">@color/errorAlertBackground</item>
+        <item name="automationBackgroundColor">@color/black</item>
+        <item name="automationOverlayColor">@color/black_alpha_40</item>
+        <!---BG source -->
+        <item name="bgsourceError">@color/errorAlertBackground</item>
+        <!---TDD-statistics -->
+        <item name="tddHeaderBackground">@android:color/darker_gray</item>
+        <item name="mainTableBackground">@android:color/transparent</item>
+        <item name="dummyBackground">@color/dummy_background</item>
+        <!-- Icon Colors -->
+        <!-- Trend Arrow -->
+        <item name="icCheckboxTrendColor">@color/black</item>
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>

From 0f4aed5ef5a7932eb0d3c8af95a7d5a7230f6e33 Mon Sep 17 00:00:00 2001
From: osodebailar <a.eggen@gmail.com>
Date: Wed, 30 Mar 2022 18:42:23 +0200
Subject: [PATCH 07/13] replace EventThemeSwitch to the right place and add
 event to nosplash

---
 .../nightscout/androidaps/MainActivity.kt     |  1 -
 .../activities/HistoryBrowseActivity.kt       |  1 -
 .../activities/ProfileHelperActivity.kt       |  1 -
 .../activities/SmsCommunicatorOtpActivity.kt  |  1 -
 .../setupwizard/SetupWizardActivity.kt        |  1 -
 .../activities/NoSplashAppCompatActivity.kt   | 22 +++++++++++++++++--
 .../androidaps/activities/TDDStatsActivity.kt |  1 -
 .../androidaps/events/EventThemeSwitch.kt     |  6 ++---
 .../dana/activities/DanaHistoryActivity.kt    |  1 -
 .../activities/DanaUserOptionsActivity.kt     |  1 -
 .../danars/activities/BLEScanActivity.kt      |  1 -
 .../danars/activities/EnterPinActivity.kt     |  1 -
 .../activities/DiaconnG8BLEScanActivity.kt    |  1 -
 .../activities/DiaconnG8HistoryActivity.kt    |  1 -
 .../DiaconnG8UserOptionsActivity.kt           |  1 -
 .../dash/ui/DashPodManagementActivity.kt      |  1 -
 .../eros/ui/ErosPodManagementActivity.kt      |  1 -
 17 files changed, 23 insertions(+), 20 deletions(-)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventThemeSwitch.kt (96%)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index 479bd6045c..9a5d86db99 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -70,7 +70,6 @@ class MainActivity : NoSplashAppCompatActivity() {
     private val disposable = CompositeDisposable()
 
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var androidPermission: AndroidPermission
     @Inject lateinit var sp: SP
     @Inject lateinit var versionCheckerUtils: VersionCheckerUtils
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
index 006732d5aa..96653af940 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
@@ -52,7 +52,6 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
index 22322c5bb9..03c3362d9a 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
@@ -38,7 +38,6 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var defaultProfile: DefaultProfile
     @Inject lateinit var defaultProfileDPV: DefaultProfileDPV
     @Inject lateinit var localProfilePlugin: LocalProfilePlugin
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var repository: AppRepository
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
index f3f7b150bb..680bbd2727 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
@@ -31,7 +31,6 @@ import javax.inject.Inject
 class SmsCommunicatorOtpActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
     @Inject lateinit var otp: OneTimePassword
     @Inject lateinit var uel: UserEntryLogger
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
index 090b9ae07d..a5d157707f 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
@@ -34,7 +34,6 @@ class SetupWizardActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var localProfilePlugin: LocalProfilePlugin
     @Inject lateinit var swDefinition: SWDefinition
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var aapsSchedulers: AapsSchedulers
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
index c8f9888ec6..430c562448 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
@@ -1,15 +1,33 @@
 package info.nightscout.androidaps.activities
-
 import android.content.Context
 import android.os.Bundle
 import info.nightscout.androidaps.core.R
+import info.nightscout.androidaps.events.EventThemeSwitch
+import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.utils.locale.LocaleHelper
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import javax.inject.Inject
+
 
 open class NoSplashAppCompatActivity : DaggerAppCompatActivityWithResult() {
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    @Inject lateinit var rxBus: RxBus
+
+    private val compositeDisposable = CompositeDisposable()
+
+    public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setTheme(R.style.AppTheme_NoActionBar)
+
+        compositeDisposable.add(rxBus.toObservable(EventThemeSwitch::class.java).subscribe {
+            recreate()
+        })
+
+    }
+
+    override fun onDestroy() {
+        compositeDisposable.clear()
+        super.onDestroy()
     }
 
     override fun attachBaseContext(newBase: Context) {
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
index c5bfd4a69b..51cbee7380 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
@@ -44,7 +44,6 @@ import kotlin.math.roundToInt
 
 class TDDStatsActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var activePlugin: ActivePlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventThemeSwitch.kt b/core/src/main/java/info/nightscout/androidaps/events/EventThemeSwitch.kt
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/events/EventThemeSwitch.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventThemeSwitch.kt
index 37cbef5ae3..8876540f00 100644
--- a/app/src/main/java/info/nightscout/androidaps/events/EventThemeSwitch.kt
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventThemeSwitch.kt
@@ -1,3 +1,3 @@
-package info.nightscout.androidaps.events
-
-class EventThemeSwitch : Event()
+package info.nightscout.androidaps.events
+
+class EventThemeSwitch : Event()
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
index b7055732c0..d978b295cf 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
@@ -38,7 +38,6 @@ import javax.inject.Inject
 
 class DanaHistoryActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var activePlugin: ActivePlugin
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
index 7c97bdf480..fed75385ff 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
@@ -26,7 +26,6 @@ import kotlin.math.min
 
 class DanaUserOptionsActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var context: Context
     @Inject lateinit var danaPump: DanaPump
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt b/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt
index 4352630f7f..da57033b39 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt
@@ -30,7 +30,6 @@ import javax.inject.Inject
 class BLEScanActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var sp: SP
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var blePreCheck: BlePreCheck
     @Inject lateinit var context: Context
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt b/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
index 8aff58f856..eca503acf5 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
@@ -22,7 +22,6 @@ import kotlin.experimental.xor
 
 class EnterPinActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var danaRSPlugin: DanaRSPlugin
     @Inject lateinit var sp: SP
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt
index 25dda64b2a..52165d828d 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt
@@ -32,7 +32,6 @@ import javax.inject.Inject
 class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() {
 
     @Inject lateinit var sp: SP
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var blePreCheck: BlePreCheck
     @Inject lateinit var context: Context
 
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt
index 2c9c5e23f6..0ee0bc8e54 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt
@@ -33,7 +33,6 @@ import javax.inject.Inject
 
 class DiaconnG8HistoryActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var activePlugin: ActivePlugin
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt
index 0f30c7e151..49d315f341 100644
--- a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt
@@ -25,7 +25,6 @@ import javax.inject.Inject
 
 class DiaconnG8UserOptionsActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var context: Context
     @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
index bdf09c0a36..791f655273 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
@@ -28,7 +28,6 @@ import javax.inject.Inject
 
 class DashPodManagementActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var injector: HasAndroidInjector
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
index 2ec76043d5..0aa199eabc 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
@@ -43,7 +43,6 @@ import javax.inject.Inject
  */
 class ErosPodManagementActivity : NoSplashAppCompatActivity() {
 
-    @Inject lateinit var rxBus: RxBus
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var podStateManager: ErosPodStateManager

From 784cd375287a1fe6f226104bf6375041f46c6407 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 30 Mar 2022 20:13:38 +0200
Subject: [PATCH 08/13] KeepAlive -> WorkManager

---
 app/src/main/AndroidManifest.xml              |   3 -
 .../info/nightscout/androidaps/MainApp.kt     |  27 ++-
 .../androidaps/di/ReceiversModule.kt          |   6 +-
 .../androidaps/receivers/KeepAliveReceiver.kt | 198 ------------------
 .../androidaps/receivers/KeepAliveWorker.kt   | 167 +++++++++++++++
 5 files changed, 188 insertions(+), 213 deletions(-)
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
 create mode 100644 app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4f40d65323..ff5347fce5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -126,9 +126,6 @@
             </intent-filter>
         </receiver>
 
-        <!-- Receiver keep alive, scheduled every 30 min -->
-        <receiver android:name=".receivers.KeepAliveReceiver" />
-
         <!-- Receive ignore 5m, 15m, 30m requests for carb notifications -->
         <receiver android:name=".plugins.aps.loop.CarbSuggestionReceiver" />
 
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
index b78b3084d7..bd01ce6abc 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
@@ -7,6 +7,10 @@ import android.net.ConnectivityManager
 import android.net.wifi.WifiManager
 import android.os.Build
 import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.work.Data
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.PeriodicWorkRequest
+import androidx.work.WorkManager
 import com.uber.rxdogtag.RxDogTag
 import dagger.android.AndroidInjector
 import dagger.android.DaggerApplication
@@ -27,14 +31,11 @@ import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionChec
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationStore
 import info.nightscout.androidaps.plugins.general.themes.ThemeSwitcherPlugin
-import info.nightscout.androidaps.receivers.BTReceiver
-import info.nightscout.androidaps.receivers.ChargingStateReceiver
-import info.nightscout.androidaps.receivers.KeepAliveReceiver.KeepAliveManager
-import info.nightscout.androidaps.receivers.NetworkChangeReceiver
-import info.nightscout.androidaps.receivers.TimeDateOrTZChangeReceiver
+import info.nightscout.androidaps.receivers.*
 import info.nightscout.androidaps.services.AlarmSoundServiceHelper
 import info.nightscout.androidaps.utils.ActivityMonitor
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.LocalAlertUtils
 import info.nightscout.androidaps.utils.ProcessLifecycleListener
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.locale.LocaleHelper
@@ -48,6 +49,7 @@ import io.reactivex.rxjava3.plugins.RxJavaPlugins
 import net.danlew.android.joda.JodaTimeAndroid
 import java.io.IOException
 import java.net.SocketException
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class MainApp : DaggerApplication() {
@@ -62,7 +64,6 @@ class MainApp : DaggerApplication() {
     @Inject lateinit var config: Config
     @Inject lateinit var buildHelper: BuildHelper
     @Inject lateinit var configBuilder: ConfigBuilder
-    @Inject lateinit var keepAliveManager: KeepAliveManager
     @Inject lateinit var plugins: List<@JvmSuppressWildcards PluginBase>
     @Inject lateinit var compatDBHelper: CompatDBHelper
     @Inject lateinit var repository: AppRepository
@@ -73,6 +74,7 @@ class MainApp : DaggerApplication() {
     @Inject lateinit var notificationStore: NotificationStore
     @Inject lateinit var processLifecycleListener: ProcessLifecycleListener
     @Inject lateinit var profileSwitchPlugin: ThemeSwitcherPlugin
+    @Inject lateinit var localAlertUtils: LocalAlertUtils
 
     override fun onCreate() {
         super.onCreate()
@@ -118,7 +120,17 @@ class MainApp : DaggerApplication() {
         // Register all tabs in app here
         pluginStore.plugins = plugins
         configBuilder.initialize()
-        keepAliveManager.setAlarm(this)
+
+        WorkManager.getInstance(this).enqueueUniquePeriodicWork(
+            "KeepAlive",
+            ExistingPeriodicWorkPolicy.REPLACE,
+            PeriodicWorkRequest.Builder(KeepAliveWorker::class.java, 15, TimeUnit.MINUTES)
+                .setInputData(Data.Builder().putString("schedule", "KeepAlive").build())
+                .setInitialDelay(5, TimeUnit.SECONDS)
+                .build()
+        )
+        localAlertUtils.shortenSnoozeInterval()
+        localAlertUtils.preSnoozeAlarms()
         doMigrations()
         uel.log(UserEntry.Action.START_AAPS, UserEntry.Sources.Aaps)
     }
@@ -190,7 +202,6 @@ class MainApp : DaggerApplication() {
     override fun onTerminate() {
         aapsLogger.debug(LTag.CORE, "onTerminate")
         unregisterActivityLifecycleCallbacks(activityMonitor)
-        keepAliveManager.cancelAlarm(this)
         alarmSoundServiceHelper.stopService(this)
         super.onTerminate()
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/di/ReceiversModule.kt b/app/src/main/java/info/nightscout/androidaps/di/ReceiversModule.kt
index 9d6615a362..72edb82bc1 100644
--- a/app/src/main/java/info/nightscout/androidaps/di/ReceiversModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/di/ReceiversModule.kt
@@ -2,12 +2,11 @@ package info.nightscout.androidaps.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.aps.loop.CarbSuggestionReceiver
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkBluetoothStateReceiver
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkBroadcastReceiver
-import info.nightscout.androidaps.plugins.aps.loop.CarbSuggestionReceiver
 import info.nightscout.androidaps.receivers.*
 
-
 @Module
 @Suppress("unused")
 abstract class ReceiversModule {
@@ -16,8 +15,7 @@ abstract class ReceiversModule {
     @ContributesAndroidInjector abstract fun contributesBTReceiver(): BTReceiver
     @ContributesAndroidInjector abstract fun contributesChargingStateReceiver(): ChargingStateReceiver
     @ContributesAndroidInjector abstract fun contributesDataReceiver(): DataReceiver
-    @ContributesAndroidInjector abstract fun contributesKeepAliveReceiver(): KeepAliveReceiver
-    @ContributesAndroidInjector abstract fun contributesKeepAliveWorker(): KeepAliveReceiver.KeepAliveWorker
+    @ContributesAndroidInjector abstract fun contributesKeepAliveWorker(): KeepAliveWorker
     @ContributesAndroidInjector abstract fun contributesRileyLinkBluetoothStateReceiver(): RileyLinkBluetoothStateReceiver
     @ContributesAndroidInjector abstract fun contributesSmsReceiver(): SmsReceiver
     @ContributesAndroidInjector abstract fun contributesTimeDateOrTZChangeReceiver(): TimeDateOrTZChangeReceiver
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
deleted file mode 100644
index e20ebcb414..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
+++ /dev/null
@@ -1,198 +0,0 @@
-package info.nightscout.androidaps.receivers
-
-import android.app.AlarmManager
-import android.app.PendingIntent
-import android.app.PendingIntent.CanceledException
-import android.app.PendingIntent.FLAG_IMMUTABLE
-import android.content.Context
-import android.content.Intent
-import android.os.SystemClock
-import androidx.work.*
-import com.google.common.util.concurrent.ListenableFuture
-import dagger.android.DaggerBroadcastReceiver
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.BuildConfig
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.ProfileSealed
-import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.events.EventProfileSwitchChanged
-import info.nightscout.androidaps.extensions.buildDeviceStatus
-import info.nightscout.androidaps.interfaces.*
-import info.nightscout.shared.logging.AAPSLogger
-import info.nightscout.shared.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.plugins.configBuilder.RunningConfiguration
-import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
-import info.nightscout.androidaps.queue.commands.Command
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.LocalAlertUtils
-import info.nightscout.androidaps.utils.T
-import info.nightscout.androidaps.utils.resources.ResourceHelper
-import javax.inject.Inject
-import kotlin.math.abs
-
-class KeepAliveReceiver : DaggerBroadcastReceiver() {
-
-    @Inject lateinit var aapsLogger: AAPSLogger
-
-    companion object {
-
-        private val KEEP_ALIVE_MILLISECONDS = T.mins(5).msecs()
-    }
-
-    override fun onReceive(context: Context, intent: Intent) {
-        super.onReceive(context, intent)
-        aapsLogger.debug(LTag.CORE, "KeepAlive received")
-
-        WorkManager.getInstance(context)
-            .enqueue(OneTimeWorkRequest.Builder(KeepAliveWorker::class.java).build())
-    }
-
-    class KeepAliveWorker(
-        private val context: Context,
-        params: WorkerParameters
-    ) : Worker(context, params) {
-
-        @Inject lateinit var aapsLogger: AAPSLogger
-        @Inject lateinit var localAlertUtils: LocalAlertUtils
-        @Inject lateinit var repository: AppRepository
-        @Inject lateinit var config: Config
-        @Inject lateinit var iobCobCalculator: IobCobCalculator
-        @Inject lateinit var loop: Loop
-        @Inject lateinit var dateUtil: DateUtil
-        @Inject lateinit var activePlugin: ActivePlugin
-        @Inject lateinit var profileFunction: ProfileFunction
-        @Inject lateinit var runningConfiguration: RunningConfiguration
-        @Inject lateinit var receiverStatusStore: ReceiverStatusStore
-        @Inject lateinit var rxBus: RxBus
-        @Inject lateinit var commandQueue: CommandQueue
-        @Inject lateinit var fabricPrivacy: FabricPrivacy
-        @Inject lateinit var maintenancePlugin: MaintenancePlugin
-        @Inject lateinit var rh: ResourceHelper
-
-        init {
-            (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
-        }
-
-        companion object {
-
-            private val STATUS_UPDATE_FREQUENCY = T.mins(15).msecs()
-            private const val IOB_UPDATE_FREQUENCY_IN_MINUTES = 5L
-
-            private var lastReadStatus: Long = 0
-            private var lastRun: Long = 0
-            private var lastIobUpload: Long = 0
-
-        }
-
-        override fun doWork(): Result {
-            localAlertUtils.shortenSnoozeInterval()
-            localAlertUtils.checkStaleBGAlert()
-            checkPump()
-            checkAPS()
-            maintenancePlugin.deleteLogs(30)
-            workerDbStatus()
-
-            return Result.success()
-        }
-
-        // When Worker DB grows too much, work operations become slow
-        // Library is cleaning DB every 7 days which may not be sufficient for NSClient full sync
-        private fun workerDbStatus() {
-            val workQuery = WorkQuery.Builder
-                .fromStates(listOf(WorkInfo.State.FAILED, WorkInfo.State.SUCCEEDED))
-                .build()
-
-            val workInfo: ListenableFuture<List<WorkInfo>> = WorkManager.getInstance(context).getWorkInfos(workQuery)
-            aapsLogger.debug(LTag.CORE, "WorkManager size is ${workInfo.get().size}")
-            if (workInfo.get().size > 1000) {
-                WorkManager.getInstance(context).pruneWork()
-                aapsLogger.debug(LTag.CORE, "WorkManager pruning ....")
-            }
-        }
-
-        // Usually deviceStatus is uploaded through LoopPlugin after every loop cycle.
-        // if there is no BG available, we have to upload anyway to have correct
-        // IOB displayed in NS
-        private fun checkAPS() {
-            var shouldUploadStatus = false
-            if (config.NSCLIENT) return
-            if (config.PUMPCONTROL) shouldUploadStatus = true
-            else if (!(loop as PluginBase).isEnabled() || iobCobCalculator.ads.actualBg() == null)
-                shouldUploadStatus = true
-            else if (dateUtil.isOlderThan(activePlugin.activeAPS.lastAPSRun, 5)) shouldUploadStatus = true
-            if (dateUtil.isOlderThan(lastIobUpload, IOB_UPDATE_FREQUENCY_IN_MINUTES) && shouldUploadStatus) {
-                lastIobUpload = dateUtil.now()
-                buildDeviceStatus(dateUtil, loop, iobCobCalculator, profileFunction,
-                    activePlugin.activePump, receiverStatusStore, runningConfiguration,
-                    BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION)?.also {
-                    repository.insert(it)
-                }
-            }
-        }
-
-        private fun checkPump() {
-            val pump = activePlugin.activePump
-            val ps = profileFunction.getRequestedProfile() ?: return
-            val requestedProfile = ProfileSealed.PS(ps)
-            val runningProfile = profileFunction.getProfile()
-            val lastConnection = pump.lastDataTime()
-            val isStatusOutdated = lastConnection + STATUS_UPDATE_FREQUENCY < System.currentTimeMillis()
-            val isBasalOutdated = abs(requestedProfile.getBasal() - pump.baseBasalRate) > pump.pumpDescription.basalStep
-            aapsLogger.debug(LTag.CORE, "Last connection: " + dateUtil.dateAndTimeString(lastConnection))
-            // sometimes keep alive broadcast stops
-            // as as workaround test if readStatus was requested before an alarm is generated
-            if (lastReadStatus != 0L && lastReadStatus > System.currentTimeMillis() - T.mins(5).msecs()) {
-                localAlertUtils.checkPumpUnreachableAlarm(lastConnection, isStatusOutdated, loop.isDisconnected)
-            }
-            if (loop.isDisconnected) {
-                // do nothing if pump is disconnected
-            } else if (runningProfile == null || ((!pump.isThisProfileSet(requestedProfile) || !requestedProfile.isEqual(runningProfile)) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE))) {
-                rxBus.send(EventProfileSwitchChanged())
-            } else if (isStatusOutdated && !pump.isBusy()) {
-                lastReadStatus = System.currentTimeMillis()
-                commandQueue.readStatus(rh.gs(R.string.keepalive_status_outdated), null)
-            } else if (isBasalOutdated && !pump.isBusy()) {
-                lastReadStatus = System.currentTimeMillis()
-                commandQueue.readStatus(rh.gs(R.string.keepalive_basal_outdated), null)
-            }
-            if (lastRun != 0L && System.currentTimeMillis() - lastRun > T.mins(10).msecs()) {
-                aapsLogger.error(LTag.CORE, "KeepAlive fail")
-                fabricPrivacy.logCustom("KeepAliveFail")
-            }
-            lastRun = System.currentTimeMillis()
-        }
-    }
-
-    class KeepAliveManager @Inject constructor(
-        private val aapsLogger: AAPSLogger,
-        private val localAlertUtils: LocalAlertUtils
-    ) {
-
-        //called by MainApp at first app start
-        fun setAlarm(context: Context) {
-            aapsLogger.debug(LTag.CORE, "KeepAlive scheduled")
-            SystemClock.sleep(5000) // wait for app initialization
-            localAlertUtils.shortenSnoozeInterval()
-            localAlertUtils.preSnoozeAlarms()
-            val am = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-            val i = Intent(context, KeepAliveReceiver::class.java)
-            val pi = PendingIntent.getBroadcast(context, 0, i, FLAG_IMMUTABLE)
-            try {
-                pi.send()
-            } catch (e: CanceledException) {
-            }
-            am.cancel(pi)
-            am.setInexactRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(), KEEP_ALIVE_MILLISECONDS, pi)
-        }
-
-        fun cancelAlarm(context: Context) {
-            aapsLogger.debug(LTag.CORE, "KeepAlive canceled")
-            val intent = Intent(context, KeepAliveReceiver::class.java)
-            val sender = PendingIntent.getBroadcast(context, 0, intent, FLAG_IMMUTABLE)
-            val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-            alarmManager.cancel(sender)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt
new file mode 100644
index 0000000000..dc705c4a84
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt
@@ -0,0 +1,167 @@
+package info.nightscout.androidaps.receivers
+
+import android.content.Context
+import androidx.work.*
+import com.google.common.util.concurrent.ListenableFuture
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.BuildConfig
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.ProfileSealed
+import info.nightscout.androidaps.database.AppRepository
+import info.nightscout.androidaps.events.EventProfileSwitchChanged
+import info.nightscout.androidaps.extensions.buildDeviceStatus
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.plugins.configBuilder.RunningConfiguration
+import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
+import info.nightscout.androidaps.queue.commands.Command
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.LocalAlertUtils
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.shared.logging.AAPSLogger
+import info.nightscout.shared.logging.LTag
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import kotlin.math.abs
+
+class KeepAliveWorker(
+    private val context: Context,
+    params: WorkerParameters
+) : Worker(context, params) {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var localAlertUtils: LocalAlertUtils
+    @Inject lateinit var repository: AppRepository
+    @Inject lateinit var config: Config
+    @Inject lateinit var iobCobCalculator: IobCobCalculator
+    @Inject lateinit var loop: Loop
+    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var runningConfiguration: RunningConfiguration
+    @Inject lateinit var receiverStatusStore: ReceiverStatusStore
+    @Inject lateinit var rxBus: RxBus
+    @Inject lateinit var commandQueue: CommandQueue
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var maintenancePlugin: MaintenancePlugin
+    @Inject lateinit var rh: ResourceHelper
+
+    init {
+        (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
+    }
+
+    companion object {
+
+        private val STATUS_UPDATE_FREQUENCY = T.mins(15).msecs()
+        private const val IOB_UPDATE_FREQUENCY_IN_MINUTES = 5L
+
+        private var lastReadStatus: Long = 0
+        private var lastRun: Long = 0
+        private var lastIobUpload: Long = 0
+
+    }
+
+    override fun doWork(): Result {
+        aapsLogger.debug(LTag.CORE, "KeepAlive received from: " + inputData.getString("schedule"))
+
+        // 15 min interval is WorkManager minimum so schedule another instances to have 5 min interval
+        if (inputData.getString("schedule") == "KeepAlive") {
+            WorkManager.getInstance(context).enqueueUniqueWork(
+                "KeepAlive_5",
+                ExistingWorkPolicy.REPLACE,
+                OneTimeWorkRequest.Builder(KeepAliveWorker::class.java)
+                    .setInputData(Data.Builder().putString("schedule", "KeepAlive_5").build())
+                    .setInitialDelay(5, TimeUnit.MINUTES)
+                    .build()
+            )
+            WorkManager.getInstance(context).enqueueUniqueWork(
+                "KeepAlive_10",
+                ExistingWorkPolicy.REPLACE,
+                OneTimeWorkRequest.Builder(KeepAliveWorker::class.java)
+                    .setInputData(Data.Builder().putString("schedule", "KeepAlive_10").build())
+                    .setInitialDelay(10, TimeUnit.MINUTES)
+                    .build()
+            )
+        }
+
+        localAlertUtils.shortenSnoozeInterval()
+        localAlertUtils.checkStaleBGAlert()
+        checkPump()
+        checkAPS()
+        maintenancePlugin.deleteLogs(30)
+        workerDbStatus()
+
+        return Result.success()
+    }
+
+    // When Worker DB grows too much, work operations become slow
+    // Library is cleaning DB every 7 days which may not be sufficient for NSClient full sync
+    private fun workerDbStatus() {
+        val workQuery = WorkQuery.Builder
+            .fromStates(listOf(WorkInfo.State.FAILED, WorkInfo.State.SUCCEEDED))
+            .build()
+
+        val workInfo: ListenableFuture<List<WorkInfo>> = WorkManager.getInstance(context).getWorkInfos(workQuery)
+        aapsLogger.debug(LTag.CORE, "WorkManager size is ${workInfo.get().size}")
+        if (workInfo.get().size > 1000) {
+            WorkManager.getInstance(context).pruneWork()
+            aapsLogger.debug(LTag.CORE, "WorkManager pruning ....")
+        }
+    }
+
+    // Usually deviceStatus is uploaded through LoopPlugin after every loop cycle.
+    // if there is no BG available, we have to upload anyway to have correct
+    // IOB displayed in NS
+    private fun checkAPS() {
+        var shouldUploadStatus = false
+        if (config.NSCLIENT) return
+        if (config.PUMPCONTROL) shouldUploadStatus = true
+        else if (!(loop as PluginBase).isEnabled() || iobCobCalculator.ads.actualBg() == null)
+            shouldUploadStatus = true
+        else if (dateUtil.isOlderThan(activePlugin.activeAPS.lastAPSRun, 5)) shouldUploadStatus = true
+        if (dateUtil.isOlderThan(lastIobUpload, IOB_UPDATE_FREQUENCY_IN_MINUTES) && shouldUploadStatus) {
+            lastIobUpload = dateUtil.now()
+            buildDeviceStatus(
+                dateUtil, loop, iobCobCalculator, profileFunction,
+                activePlugin.activePump, receiverStatusStore, runningConfiguration,
+                BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION
+            )?.also {
+                repository.insert(it)
+            }
+        }
+    }
+
+    private fun checkPump() {
+        val pump = activePlugin.activePump
+        val ps = profileFunction.getRequestedProfile() ?: return
+        val requestedProfile = ProfileSealed.PS(ps)
+        val runningProfile = profileFunction.getProfile()
+        val lastConnection = pump.lastDataTime()
+        val isStatusOutdated = lastConnection + STATUS_UPDATE_FREQUENCY < System.currentTimeMillis()
+        val isBasalOutdated = abs(requestedProfile.getBasal() - pump.baseBasalRate) > pump.pumpDescription.basalStep
+        aapsLogger.debug(LTag.CORE, "Last connection: " + dateUtil.dateAndTimeString(lastConnection))
+        // sometimes keep alive broadcast stops
+        // as as workaround test if readStatus was requested before an alarm is generated
+        if (lastReadStatus != 0L && lastReadStatus > System.currentTimeMillis() - T.mins(5).msecs()) {
+            localAlertUtils.checkPumpUnreachableAlarm(lastConnection, isStatusOutdated, loop.isDisconnected)
+        }
+        if (loop.isDisconnected) {
+            // do nothing if pump is disconnected
+        } else if (runningProfile == null || ((!pump.isThisProfileSet(requestedProfile) || !requestedProfile.isEqual(runningProfile)) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE))) {
+            rxBus.send(EventProfileSwitchChanged())
+        } else if (isStatusOutdated && !pump.isBusy()) {
+            lastReadStatus = System.currentTimeMillis()
+            commandQueue.readStatus(rh.gs(R.string.keepalive_status_outdated), null)
+        } else if (isBasalOutdated && !pump.isBusy()) {
+            lastReadStatus = System.currentTimeMillis()
+            commandQueue.readStatus(rh.gs(R.string.keepalive_basal_outdated), null)
+        }
+        if (lastRun != 0L && System.currentTimeMillis() - lastRun > T.mins(10).msecs()) {
+            aapsLogger.error(LTag.CORE, "KeepAlive fail")
+            fabricPrivacy.logCustom("KeepAliveFail")
+        }
+        lastRun = System.currentTimeMillis()
+    }
+}
\ No newline at end of file

From 0f67f74c96aa868813abf41661abba3754cb2fe5 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 30 Mar 2022 20:54:06 +0200
Subject: [PATCH 09/13] code cleanup

---
 .../androidaps/activities/MyPreferenceFragment.kt         | 2 +-
 .../androidaps/activities/PreferencesActivity.kt          | 2 +-
 .../plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt     | 2 +-
 .../wear/wearintegration/SendToDataLayerThread.java       | 2 +-
 .../iob/iobCobCalculator/IobCobCalculatorPlugin.kt        | 6 +++---
 .../plugins/pump/virtual/VirtualPumpFragment.kt           | 4 ----
 .../combo/ruffyscripter/commands/ReadHistoryCommand.java  | 8 ++++----
 .../graphExtensions/PointsWithLabelGraphSeries.java       | 6 ++----
 .../pump/medtronic/data/MedtronicHistoryDataUTest.kt      | 4 ++--
 .../plugins/pump/omnipod/eros/history/ErosHistoryTest.kt  | 4 ++--
 .../androidaps/plugins/pump/common/sync/PumpDbEntry.kt    | 5 +----
 .../pump/common/hw/rileylink/ble/data/RLMessageType.java  | 1 -
 .../pump/common/hw/rileylink/ble/defs/RLMessageType.java  | 1 -
 .../info/nightscout/androidaps/data/RawDisplayData.java   | 2 +-
 .../androidaps/interaction/utils/Persistence.java         | 8 ++++----
 .../nightscout/androidaps/interaction/utils/WearUtil.java | 2 +-
 .../nightscout/androidaps/tile/TempTargetTileService.kt   | 2 +-
 .../nightscout/androidaps/watchfaces/BaseWatchFace.java   | 6 ++++--
 18 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index 5da167b74b..57b39e4622 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -372,7 +372,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
                 if (sp.getString(pref.key, "").startsWith("hmac:")) {
                     pref.summary = "******"
                 } else {
-                    if (pref.getKey().contains("pin")) {
+                    if (pref.key.contains("pin")) {
                         pref.summary = rh.gs(R.string.pin_not_set)
                     }else {
                         pref.summary = rh.gs(R.string.password_not_set)
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt
index ed149949a0..60f0f5006a 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt
@@ -65,7 +65,7 @@ class PreferencesActivity : NoSplashAppCompatActivity(), PreferenceFragmentCompa
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.getItemId()) {
+        when (item.itemId) {
             android.R.id.home -> {
                 onBackPressed()
                 return true
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt
index ecef4ad3aa..d45fbfe26c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt
@@ -51,7 +51,7 @@ class DetermineBasalResultSMB private constructor(injector: HasAndroidInjector)
                     aapsLogger.error(LTag.APS, "Error parsing 'deliverAt' date: $date", e)
                 }
             }
-            if (result.has("variable_sens")) variableSens = result.getDouble("variable_sens");
+            if (result.has("variable_sens")) variableSens = result.getDouble("variable_sens")
         } catch (e: JSONException) {
             aapsLogger.error(LTag.APS, "Error parsing determine-basal result JSON", e)
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/SendToDataLayerThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/SendToDataLayerThread.java
index ee4c30e0d1..0852b0a6aa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/SendToDataLayerThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/SendToDataLayerThread.java
@@ -120,7 +120,7 @@ class SendToDataLayerThread extends AsyncTask<DataMap,Void,Void> {
             }
             state = 0;
         } catch (Exception e) {
-            Log.e(TAG, logPrefix + "Got exception in sendToWear: " + e.toString());
+            Log.e(TAG, logPrefix + "Got exception in sendToWear: " + e);
         } finally {
             lastlock = 0;
             lock.unlock();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
index d7991a6707..0262343266 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
@@ -574,17 +574,17 @@ class IobCobCalculatorPlugin @Inject constructor(
     override fun getTempBasalIncludingConvertedExtended(timestamp: Long): TemporaryBasal? {
         val tb = repository.getTemporaryBasalActiveAt(timestamp).blockingGet()
         if (tb is ValueWrapper.Existing) return tb.value
-        return getConvertedExtended(timestamp);
+        return getConvertedExtended(timestamp)
     }
 
     override fun getTempBasalIncludingConvertedExtendedForRange(startTime: Long, endTime: Long, calculationStep: Long): Map<Long, TemporaryBasal?> {
-        val tempBasals = HashMap<Long, TemporaryBasal?>();
+        val tempBasals = HashMap<Long, TemporaryBasal?>()
         val tbs = repository.getTemporaryBasalsDataActiveBetweenTimeAndTime(startTime, endTime).blockingGet()
         for (t in startTime until endTime step calculationStep) {
             val tb = tbs.firstOrNull { basal -> basal.timestamp <= t && (basal.timestamp + basal.duration) > t }
             tempBasals[t] = tb ?: getConvertedExtended(t)
         }
-        return tempBasals;
+        return tempBasals
     }
 
     override fun calculateAbsoluteIobFromBaseBasals(toTime: Long): IobTotal {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
index 1eb807dbfc..ea85e983b5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
@@ -52,10 +52,6 @@ class VirtualPumpFragment : DaggerFragment() {
         return binding.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-    }
-
     @Synchronized
     override fun onResume() {
         super.onResume()
diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
index d3f03ac6a2..b5dfb4044d 100644
--- a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
+++ b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ruffyscripter/commands/ReadHistoryCommand.java
@@ -109,25 +109,25 @@ public class ReadHistoryCommand extends BaseCommand {
         if (!history.bolusHistory.isEmpty()) {
             aapsLogger.debug(LTag.PUMP, "Read bolus history (" + history.bolusHistory.size() + "):");
             for (Bolus bolus : history.bolusHistory) {
-                aapsLogger.debug(LTag.PUMP, new Date(bolus.timestamp) + ": " + bolus.toString());
+                aapsLogger.debug(LTag.PUMP, new Date(bolus.timestamp) + ": " + bolus);
             }
         }
         if (!history.pumpAlertHistory.isEmpty()) {
             aapsLogger.debug(LTag.PUMP, "Read error history (" + history.pumpAlertHistory.size() + "):");
             for (PumpAlert pumpAlert : history.pumpAlertHistory) {
-                aapsLogger.debug(LTag.PUMP, new Date(pumpAlert.timestamp) + ": " + pumpAlert.toString());
+                aapsLogger.debug(LTag.PUMP, new Date(pumpAlert.timestamp) + ": " + pumpAlert);
             }
         }
         if (!history.tddHistory.isEmpty()) {
             aapsLogger.debug(LTag.PUMP, "Read TDD history (" + history.tddHistory.size() + "):");
             for (Tdd tdd : history.tddHistory) {
-                aapsLogger.debug(LTag.PUMP, new Date(tdd.timestamp) + ": " + tdd.toString());
+                aapsLogger.debug(LTag.PUMP, new Date(tdd.timestamp) + ": " + tdd);
             }
         }
         if (!history.tbrHistory.isEmpty()) {
             aapsLogger.debug(LTag.PUMP, "Read TBR history (" + history.tbrHistory.size() + "):");
             for (Tbr tbr : history.tbrHistory) {
-                aapsLogger.debug(LTag.PUMP, new Date(tbr.timestamp) + ": " + tbr.toString());
+                aapsLogger.debug(LTag.PUMP, new Date(tbr.timestamp) + ": " + tbr);
             }
         }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java
index 4067810b2c..1a657c01c2 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java
@@ -163,10 +163,8 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
             double x = graphWidth * ratX;
 
             // overdraw
-            boolean overdraw = false;
-            if (x > graphWidth) { // end right
-                overdraw = true;
-            }
+            boolean overdraw = x > graphWidth;
+            // end right
             if (y < 0) { // end bottom
                 overdraw = true;
             }
diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt
index 71c991a928..e90d6aa675 100644
--- a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt
+++ b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt
@@ -57,7 +57,7 @@ class MedtronicHistoryDataUTest : TestBase() {
 
         val fileText = ClassLoader.getSystemResource("tbr_data.json").readText()
 
-        val listType: Type = object : TypeToken<MutableList<PumpHistoryEntry?>?>() {}.getType()
+        val listType: Type = object : TypeToken<MutableList<PumpHistoryEntry?>?>() {}.type
         val yourClassList: MutableList<PumpHistoryEntry> = gson.fromJson(fileText, listType)
 
         for (pumpHistoryEntry in yourClassList) {
@@ -100,7 +100,7 @@ class MedtronicHistoryDataUTest : TestBase() {
 
         val fileText = ClassLoader.getSystemResource("tbr_data_special.json").readText()
 
-        val listType: Type = object : TypeToken<MutableList<PumpHistoryEntry?>?>() {}.getType()
+        val listType: Type = object : TypeToken<MutableList<PumpHistoryEntry?>?>() {}.type
         val yourClassList: MutableList<PumpHistoryEntry> = gson.fromJson(fileText, listType)
 
         for (pumpHistoryEntry in yourClassList) {
diff --git a/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt b/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt
index b441accbc1..29a44e961d 100644
--- a/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt
+++ b/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt
@@ -34,7 +34,7 @@ class ErosHistoryTest {
 
     @Test
     fun testInsertionAndRetrieval() {
-        var history = erosHistory.getAllErosHistoryRecordsFromTimestamp(0L);
+        var history = erosHistory.getAllErosHistoryRecordsFromTimestamp(0L)
         assert(history.isEmpty())
 
         val type = PodHistoryEntryType.SET_BOLUS.code.toLong()
@@ -42,7 +42,7 @@ class ErosHistoryTest {
         erosHistory.create(entity)
         erosHistory.create(ErosHistoryRecordEntity(3000L, PodHistoryEntryType.CANCEL_BOLUS.code.toLong()))
 
-        history = erosHistory.getAllErosHistoryRecordsFromTimestamp(0L);
+        history = erosHistory.getAllErosHistoryRecordsFromTimestamp(0L)
         assert(history.size == 2)
         assert(type.equals(history.first().podEntryTypeCode))
 
diff --git a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt
index 3061e9566a..019b217aea 100644
--- a/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt
+++ b/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/sync/PumpDbEntry.kt
@@ -67,10 +67,7 @@ data class PumpDbEntryBolus(override var temporaryId: Long,
                 detailedBolusInfo: DetailedBolusInfo) : this(temporaryId, date, pumpType, serialNumber, null,
                                                              detailedBolusInfo.insulin,
                                                              detailedBolusInfo.carbs,
-                                                             detailedBolusInfo.bolusType) {
-
-        }
-
+                                                             detailedBolusInfo.bolusType)
 
 }
 
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessageType.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessageType.java
index 4fbc3144bd..2fb334dcfe 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessageType.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessageType.java
@@ -7,5 +7,4 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data;
 public enum RLMessageType {
     PowerOn, // for powering on the pump (wakeup)
     ReadSimpleData, // for checking if pump is readable (for Medtronic we can use GetModel)
-    ;
 }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RLMessageType.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RLMessageType.java
index a55fa1db19..7cc11da498 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RLMessageType.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RLMessageType.java
@@ -7,5 +7,4 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs;
 public enum RLMessageType {
     PowerOn, // for powering on the pump (wakeup)
     ReadSimpleData, // for checking if pump is readable (for Medtronic we can use GetModel)
-    ;
 }
diff --git a/wear/src/main/java/info/nightscout/androidaps/data/RawDisplayData.java b/wear/src/main/java/info/nightscout/androidaps/data/RawDisplayData.java
index 024f72f676..ecadbd7d4f 100644
--- a/wear/src/main/java/info/nightscout/androidaps/data/RawDisplayData.java
+++ b/wear/src/main/java/info/nightscout/androidaps/data/RawDisplayData.java
@@ -22,7 +22,7 @@ import info.nightscout.androidaps.interaction.utils.WearUtil;
  */
 public class RawDisplayData {
 
-    private WearUtil wearUtil;
+    private final WearUtil wearUtil;
 
     public RawDisplayData(WearUtil wearUtil) {
         this.wearUtil = wearUtil;
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Persistence.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Persistence.java
index 997adea078..afb2b42bd2 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Persistence.java
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Persistence.java
@@ -26,10 +26,10 @@ import info.nightscout.shared.logging.LTag;
 @Singleton
 public class Persistence {
 
-    private Context context;
-    private AAPSLogger aapsLogger;
-    private WearUtil wearUtil;
-    private SharedPreferences preferences;
+    private final Context context;
+    private final AAPSLogger aapsLogger;
+    private final WearUtil wearUtil;
+    private final SharedPreferences preferences;
     private final String COMPLICATION_PROVIDER_PREFERENCES_FILE_KEY =
             "info.nightscout.androidaps.complications.COMPLICATION_PROVIDER_PREFERENCES_FILE_KEY";
 
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.java
index 81a5915806..05654ea6ea 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.java
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.java
@@ -76,7 +76,7 @@ public class WearUtil {
         PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AAPS::" + name);
         wl.acquire(millis);
         if (debug_wakelocks)
-            aapsLogger.debug(LTag.WEAR, "getWakeLock: " + name + " " + wl.toString());
+            aapsLogger.debug(LTag.WEAR, "getWakeLock: " + name + " " + wl);
         return wl;
     }
 
diff --git a/wear/src/main/java/info/nightscout/androidaps/tile/TempTargetTileService.kt b/wear/src/main/java/info/nightscout/androidaps/tile/TempTargetTileService.kt
index 6e0ff0e30f..e15b4d2dca 100644
--- a/wear/src/main/java/info/nightscout/androidaps/tile/TempTargetTileService.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/tile/TempTargetTileService.kt
@@ -3,6 +3,6 @@ package info.nightscout.androidaps.tile
 class TempTargetTileService : TileBase() {
 
     override val resourceVersion = "TempTargetTileService"
-    override val source = TempTargetSource;
+    override val source = TempTargetSource
 
 }
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
index 1e35d8f827..c28ac459ea 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
@@ -18,7 +18,6 @@ import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.support.wearable.view.WatchViewStub;
 import android.text.format.DateFormat;
-import android.util.Log;
 import android.view.Display;
 import android.view.View;
 import android.view.WindowInsets;
@@ -49,6 +48,8 @@ import info.nightscout.androidaps.data.ListenerService;
 import info.nightscout.androidaps.data.RawDisplayData;
 import info.nightscout.androidaps.interaction.utils.Persistence;
 import info.nightscout.androidaps.interaction.utils.WearUtil;
+import info.nightscout.shared.logging.AAPSLogger;
+import info.nightscout.shared.logging.LTag;
 import lecho.lib.hellocharts.view.LineChartView;
 
 /**
@@ -61,6 +62,7 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
 
     @Inject WearUtil wearUtil;
     @Inject Persistence persistence;
+    @Inject AAPSLogger aapsLogger;
 
     public final static IntentFilter INTENT_FILTER;
 
@@ -382,7 +384,7 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
     private void checkVibrateHourly(WatchFaceTime oldTime, WatchFaceTime newTime) {
         boolean hourlyVibratePref = sharedPrefs.getBoolean("vibrate_Hourly", false);
         if (hourlyVibratePref && layoutSet && newTime.hasHourChanged(oldTime)) {
-            Log.i("hourlyVibratePref", "true --> " + newTime.toString());
+            aapsLogger.info(LTag.WEAR, "hourlyVibratePref", "true --> " + newTime);
             Vibrator vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
             long[] vibrationPattern = {0, 150, 125, 100};
             vibrator.vibrate(vibrationPattern, -1);

From 8c7dd5d8e780fe048973b40455176919c2760b1c Mon Sep 17 00:00:00 2001
From: osodebailar <a.eggen@gmail.com>
Date: Wed, 30 Mar 2022 22:12:50 +0200
Subject: [PATCH 10/13] attributes for overviewbuttons - working on light theme
 colors

---
 .../main/res/drawable/ic_target_eatingsoon.xml    |  6 +++---
 app/src/main/res/drawable/ic_xdrip.xml            |  3 ++-
 .../main/res/layout/overview_buttons_layout.xml   | 14 +++++++-------
 app/src/main/res/layout/overview_fragment.xml     |  2 +-
 .../main/res/drawable-hdpi/background_total.xml   |  2 +-
 core/src/main/res/drawable-hdpi/border_gray.xml   |  2 +-
 core/src/main/res/drawable/ic_bolus.xml           |  2 +-
 core/src/main/res/drawable/ic_calculator.xml      | 15 ++++++++-------
 core/src/main/res/drawable/ic_calibration.xml     |  6 +++---
 core/src/main/res/drawable/ic_cp_bolus_carbs.xml  |  3 ++-
 core/src/main/res/drawable/ic_quick_wizard.xml    | 11 ++++++-----
 core/src/main/res/values-night/styles.xml         |  7 +++++++
 core/src/main/res/values/attrs.xml                |  7 +++++++
 core/src/main/res/values/colors.xml               | 12 ++++++------
 core/src/main/res/values/styles.xml               | 10 +++++++++-
 15 files changed, 64 insertions(+), 38 deletions(-)

diff --git a/app/src/main/res/drawable/ic_target_eatingsoon.xml b/app/src/main/res/drawable/ic_target_eatingsoon.xml
index 54b6162546..ec35d67c48 100644
--- a/app/src/main/res/drawable/ic_target_eatingsoon.xml
+++ b/app/src/main/res/drawable/ic_target_eatingsoon.xml
@@ -5,13 +5,13 @@
     android:viewportHeight="24">
   <path
       android:pathData="M21.107,18.396h-0.515c-0.23,-3.231 -2.587,-5.897 -5.66,-6.605c-0.089,-0.819 -0.777,-1.462 -1.62,-1.462c-0.843,0 -1.531,0.642 -1.62,1.462c-3.073,0.708 -5.429,3.374 -5.66,6.605H5.518c-0.221,0 -0.4,0.179 -0.4,0.4c0,0.221 0.179,0.4 0.4,0.4h15.59c0.221,0 0.4,-0.179 0.4,-0.4C21.507,18.575 21.328,18.396 21.107,18.396zM13.313,10.943c0.461,0 0.836,0.311 0.964,0.73c-0.317,-0.043 -0.637,-0.072 -0.964,-0.072c-0.327,0 -0.648,0.03 -0.965,0.072C12.477,11.254 12.852,10.943 13.313,10.943zM13.313,12.401c3.391,0 6.212,2.654 6.479,5.995H6.834C7.101,15.056 9.922,12.401 13.313,12.401z"
-      android:fillColor="@color/carbs"/>
+      android:fillColor="?attr/carbsColor"/>
   <path
       android:pathData="M15.428,13.489c-0.588,-0.271 -1.415,-0.457 -2.268,-0.509c-0.221,-0.014 -0.411,0.154 -0.424,0.375c-0.014,0.221 0.154,0.411 0.375,0.424c0.746,0.046 1.487,0.209 1.981,0.437c0.047,0.021 0.095,0.033 0.143,0.036c0.16,0.01 0.317,-0.078 0.388,-0.232C15.717,13.82 15.629,13.582 15.428,13.489z"
-      android:fillColor="@color/carbs"/>
+      android:fillColor="?attr/carbsColor"/>
   <path
       android:pathData="M8.051,17.801c-0.029,0.001 -0.061,-0.003 -0.095,-0.011c-0.188,-0.047 -0.304,-0.239 -0.257,-0.427c0.43,-1.726 1.665,-3.196 3.304,-3.933c0.043,-0.019 0.088,-0.029 0.135,-0.031c0.143,-0.004 0.273,0.078 0.331,0.208c0.039,0.086 0.042,0.182 0.008,0.271c-0.034,0.088 -0.099,0.158 -0.185,0.196c-1.444,0.649 -2.531,1.942 -2.909,3.458C8.346,17.687 8.209,17.797 8.051,17.801z"
-      android:fillColor="@color/carbs"/>
+      android:fillColor="?attr/carbsColor"/>
   <path
       android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
       android:fillColor="@color/inrange"/>
diff --git a/app/src/main/res/drawable/ic_xdrip.xml b/app/src/main/res/drawable/ic_xdrip.xml
index 54f88823ba..bf2ee9b482 100644
--- a/app/src/main/res/drawable/ic_xdrip.xml
+++ b/app/src/main/res/drawable/ic_xdrip.xml
@@ -4,5 +4,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#B92929" android:pathData="M12.143,3.619c1.326,1.335 2.613,2.639 3.908,3.934c0.86,0.86 1.735,1.695 2.294,2.811c1.242,2.477 0.847,5.53 -1.039,7.698c-1.763,2.026 -4.813,2.845 -7.35,1.973c-4.996,-1.716 -6.424,-7.776 -2.71,-11.543C8.837,6.878 10.458,5.294 12.143,3.619zM12.08,6.135c-1.258,1.251 -2.447,2.427 -3.628,3.61c-1.148,1.149 -1.65,2.542 -1.541,4.158c0.177,2.618 2.665,4.888 5.169,4.688C12.08,14.471 12.08,10.35 12.08,6.135z"/>
+    <path android:fillColor="?attr/icCalibrationColor"
+        android:pathData="M12.143,3.619c1.326,1.335 2.613,2.639 3.908,3.934c0.86,0.86 1.735,1.695 2.294,2.811c1.242,2.477 0.847,5.53 -1.039,7.698c-1.763,2.026 -4.813,2.845 -7.35,1.973c-4.996,-1.716 -6.424,-7.776 -2.71,-11.543C8.837,6.878 10.458,5.294 12.143,3.619zM12.08,6.135c-1.258,1.251 -2.447,2.427 -3.628,3.61c-1.148,1.149 -1.65,2.542 -1.541,4.158c0.177,2.618 2.665,4.888 5.169,4.688C12.08,14.471 12.08,10.35 12.08,6.135z"/>
 </vector>
diff --git a/app/src/main/res/layout/overview_buttons_layout.xml b/app/src/main/res/layout/overview_buttons_layout.xml
index 872963859e..d4142c46b1 100644
--- a/app/src/main/res/layout/overview_buttons_layout.xml
+++ b/app/src/main/res/layout/overview_buttons_layout.xml
@@ -45,7 +45,7 @@
             android:layout_weight="0.5"
             android:drawableTop="@drawable/icon_insulin_carbs"
             android:text="@string/overview_treatment_label"
-            android:textColor="?attr/treatmentButton"
+            android:textColor="?attr/icTreatmentColor"
             android:textSize="10sp"
             android:visibility="gone"
             tools:ignore="SmallSp" />
@@ -59,7 +59,7 @@
             android:layout_weight="0.5"
             android:drawableTop="@drawable/ic_bolus"
             android:text="@string/overview_insulin_label"
-            android:textColor="?attr/insulinButtonColor"
+            android:textColor="?attr/icBolusColor"
             android:textSize="10sp"
             tools:ignore="SmallSp" />
 
@@ -72,7 +72,7 @@
             android:layout_weight="0.5"
             android:drawableTop="@drawable/ic_cp_bolus_carbs"
             android:text="@string/treatments_wizard_carbs_label"
-            android:textColor="?attr/carbsButtonColor"
+            android:textColor="?attr/icBolusCarbsColor"
             android:textSize="10sp"
             tools:ignore="SmallSp" />
 
@@ -85,7 +85,7 @@
             android:layout_weight="0.5"
             android:drawableTop="@drawable/ic_calculator"
             android:text="@string/overview_calculator_label"
-            android:textColor="?attr/calculatorButtonColor"
+            android:textColor="?attr/icCalculatorColor"
             android:textSize="10sp"
             tools:ignore="SmallSp" />
 
@@ -98,7 +98,7 @@
             android:layout_weight="0.5"
             android:drawableTop="@drawable/ic_calibration"
             android:text="@string/overview_calibration"
-            android:textColor="?attr/calibrationButtonColor"
+            android:textColor="?attr/icCalibrationColor"
             android:textSize="10sp"
             android:visibility="gone"
             tools:ignore="SmallSp" />
@@ -112,7 +112,7 @@
             android:layout_weight="0.5"
             android:drawableTop="@drawable/ic_xdrip"
             android:text="@string/overview_cgm"
-            android:textColor="?attr/calibrationButtonColor"
+            android:textColor="?attr/icCalibrationColor"
             android:textSize="10sp"
             android:visibility="gone"
             tools:ignore="SmallSp" />
@@ -127,7 +127,7 @@
             android:drawableTop="@drawable/ic_quick_wizard"
             android:text="@string/quickwizard"
             android:hint="@string/quickwizard"
-            android:textColor="?attr/quickWizardButtonColor"
+            android:textColor="?attr/icQuickWizardColor"
             android:textSize="10sp"
             tools:ignore="SmallSp" />
 
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index d39ac7a4ea..39187564ca 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -135,7 +135,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
-            android:background="@color/pumpStatusBackground"
+            android:background="?attr/pumpStatusBackground"
             android:gravity="center_vertical|center_horizontal"
             android:paddingTop="6dp"
             android:paddingBottom="6dp"
diff --git a/core/src/main/res/drawable-hdpi/background_total.xml b/core/src/main/res/drawable-hdpi/background_total.xml
index 0a84006dee..e37fbd2035 100644
--- a/core/src/main/res/drawable-hdpi/background_total.xml
+++ b/core/src/main/res/drawable-hdpi/background_total.xml
@@ -3,6 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="?attr/totalBackground"/>
-    <stroke android:width="1dp" android:color="?attr/colorOnSecondary"/>
+    <stroke android:width="1dp" android:color="?attr/colorControlNormal"/>
     <corners android:radius="4dp" />
 </shape>
\ No newline at end of file
diff --git a/core/src/main/res/drawable-hdpi/border_gray.xml b/core/src/main/res/drawable-hdpi/border_gray.xml
index 7635f80234..a67f54bf90 100644
--- a/core/src/main/res/drawable-hdpi/border_gray.xml
+++ b/core/src/main/res/drawable-hdpi/border_gray.xml
@@ -3,7 +3,7 @@
     <item android:bottom="0dp">
         <shape
             android:shape="rectangle">
-            <stroke android:width="1dp" android:color="?attr/colorOnSecondary"/>
+            <stroke android:width="1dp" android:color="?attr/colorControlNormal"/>
             <solid android:color="@android:color/white" />
             <corners android:radius="0dp" />
         </shape>
diff --git a/core/src/main/res/drawable/ic_bolus.xml b/core/src/main/res/drawable/ic_bolus.xml
index 6bbe19f3fc..83b67c9989 100644
--- a/core/src/main/res/drawable/ic_bolus.xml
+++ b/core/src/main/res/drawable/ic_bolus.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#67DFE8"
+        android:fillColor="?attr/icBolusColor"
         android:pathData="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092,-0.07 -0.212,-0.09 -0.323,-0.055L5.115,5.89L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116 0.047,0.226 0.14,0.296l9.895,7.502l-0.428,0.564c-0.26,0.343 -0.193,0.832 0.15,1.092s0.832,0.193 1.092,-0.15l1.653,-2.18l2.219,1.683l-0.719,0.948c-0.26,0.343 -0.193,0.832 0.15,1.092c0.343,0.26 0.832,0.193 1.092,-0.15l2.379,-3.138c0.26,-0.343 0.193,-0.832 -0.15,-1.092c-0.343,-0.26 -0.832,-0.193 -1.092,0.15l-0.719,0.948l-2.219,-1.683l1.653,-2.18c0.26,-0.343 0.193,-0.832 -0.15,-1.092S18.762,11.659 18.501,12.002zM5.458,6.524l2.44,-0.783l9.748,7.39L17.26,13.64l-5.754,-4.362c-0.091,-0.069 -0.221,-0.053 -0.293,0.035L9.087,11.91l-0.67,-0.508l1.526,-1.833c0.002,-0.002 0.004,-0.005 0.006,-0.008c0.068,-0.09 0.054,-0.219 -0.033,-0.291c-0.09,-0.075 -0.224,-0.063 -0.299,0.027l-1.538,1.848l-0.769,-0.583l1.526,-1.833c0.002,-0.002 0.004,-0.005 0.006,-0.008c0.068,-0.09 0.054,-0.219 -0.033,-0.291c-0.09,-0.075 -0.224,-0.063 -0.299,0.027L6.97,10.305L6.201,9.721l1.526,-1.833C7.728,7.886 7.731,7.882 7.732,7.88c0.068,-0.09 0.054,-0.219 -0.033,-0.291C7.609,7.513 7.475,7.526 7.4,7.616L5.861,9.464L5.362,9.085L5.458,6.524z" />
 </vector>
diff --git a/core/src/main/res/drawable/ic_calculator.xml b/core/src/main/res/drawable/ic_calculator.xml
index 300e971bf4..3bd3d2e78d 100644
--- a/core/src/main/res/drawable/ic_calculator.xml
+++ b/core/src/main/res/drawable/ic_calculator.xml
@@ -4,11 +4,12 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#67E86A" android:pathData="M17.625,15.345h-4.083c-0.063,0 -0.113,0.051 -0.113,0.113v1.292c0,0.063 0.051,0.113 0.113,0.113h4.083c0.063,0 0.113,-0.051 0.113,-0.113v-1.292C17.738,15.396 17.688,15.345 17.625,15.345z"/>
-    <path android:fillColor="#67E86A" android:pathData="M16.343,14.036c0,-0.063 -0.051,-0.113 -0.113,-0.113h-1.292c-0.063,0 -0.113,0.051 -0.113,0.113v1.016h1.519V14.036z"/>
-    <path android:fillColor="#67E86A" android:pathData="M14.824,18.119c0,0.063 0.051,0.113 0.113,0.113h1.292c0.063,0 0.113,-0.051 0.113,-0.113v-1.017h-1.519V18.119z"/>
-    <path android:fillColor="#67E86A" android:pathData="M19.836,1.96h-15.1c-0.344,0 -0.624,0.279 -0.624,0.624v18.375c0,0.345 0.279,0.624 0.624,0.624h15.1c0.345,0 0.624,-0.279 0.624,-0.624V2.583C20.46,2.239 20.181,1.96 19.836,1.96zM19.212,20.334H5.36V7.04h13.852V20.334zM19.212,5.793H5.36V3.207h13.852V5.793z"/>
-    <path android:fillColor="#67E86A" android:pathData="M13.542,11.363h4.083c0.063,0 0.113,-0.051 0.113,-0.113V9.958c0,-0.063 -0.051,-0.113 -0.113,-0.113h-4.083c-0.063,0 -0.113,0.051 -0.113,0.113v1.292C13.429,11.313 13.479,11.363 13.542,11.363z"/>
-    <path android:fillColor="#67E86A" android:pathData="M7.042,11.363h1.283v1.282c0,0.063 0.051,0.113 0.113,0.113h1.292c0.063,0 0.113,-0.051 0.113,-0.113v-1.282h1.283c0.063,0 0.113,-0.051 0.113,-0.113V9.958c0,-0.063 -0.051,-0.113 -0.113,-0.113H9.842V8.563c0,-0.063 -0.051,-0.113 -0.113,-0.113H8.438c-0.063,0 -0.113,0.051 -0.113,0.113v1.283H7.042c-0.063,0 -0.113,0.051 -0.113,0.113v1.292C6.928,11.313 6.979,11.363 7.042,11.363z"/>
-    <path android:fillColor="#67E86A" android:pathData="M10.157,16.078l0.907,-0.907c0.021,-0.021 0.033,-0.05 0.033,-0.08s-0.012,-0.059 -0.033,-0.08l-0.914,-0.913c-0.044,-0.045 -0.116,-0.045 -0.16,0l-0.907,0.907l-0.907,-0.907c-0.044,-0.045 -0.116,-0.045 -0.16,0l-0.913,0.913c-0.044,0.044 -0.044,0.116 0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044 -0.044,0.116 0,0.16l0.913,0.914c0.021,0.021 0.05,0.033 0.08,0.033s0.059,-0.012 0.08,-0.033l0.907,-0.907l0.907,0.907c0.021,0.021 0.05,0.033 0.08,0.033s0.059,-0.012 0.08,-0.033l0.914,-0.914c0.044,-0.044 0.044,-0.116 0,-0.16L10.157,16.078z"/>
+    <path android:fillColor="?attr/icCalculatorColor"
+        android:pathData="M17.625,15.345h-4.083c-0.063,0 -0.113,0.051 -0.113,0.113v1.292c0,0.063 0.051,0.113 0.113,0.113h4.083c0.063,0 0.113,-0.051 0.113,-0.113v-1.292C17.738,15.396 17.688,15.345 17.625,15.345z"/>
+    <path android:fillColor="?attr/icCalculatorColor" android:pathData="M16.343,14.036c0,-0.063 -0.051,-0.113 -0.113,-0.113h-1.292c-0.063,0 -0.113,0.051 -0.113,0.113v1.016h1.519V14.036z"/>
+    <path android:fillColor="?attr/icCalculatorColor" android:pathData="M14.824,18.119c0,0.063 0.051,0.113 0.113,0.113h1.292c0.063,0 0.113,-0.051 0.113,-0.113v-1.017h-1.519V18.119z"/>
+    <path android:fillColor="?attr/icCalculatorColor" android:pathData="M19.836,1.96h-15.1c-0.344,0 -0.624,0.279 -0.624,0.624v18.375c0,0.345 0.279,0.624 0.624,0.624h15.1c0.345,0 0.624,-0.279 0.624,-0.624V2.583C20.46,2.239 20.181,1.96 19.836,1.96zM19.212,20.334H5.36V7.04h13.852V20.334zM19.212,5.793H5.36V3.207h13.852V5.793z"/>
+    <path android:fillColor="?attr/icCalculatorColor" android:pathData="M13.542,11.363h4.083c0.063,0 0.113,-0.051 0.113,-0.113V9.958c0,-0.063 -0.051,-0.113 -0.113,-0.113h-4.083c-0.063,0 -0.113,0.051 -0.113,0.113v1.292C13.429,11.313 13.479,11.363 13.542,11.363z"/>
+    <path android:fillColor="?attr/icCalculatorColor" android:pathData="M7.042,11.363h1.283v1.282c0,0.063 0.051,0.113 0.113,0.113h1.292c0.063,0 0.113,-0.051 0.113,-0.113v-1.282h1.283c0.063,0 0.113,-0.051 0.113,-0.113V9.958c0,-0.063 -0.051,-0.113 -0.113,-0.113H9.842V8.563c0,-0.063 -0.051,-0.113 -0.113,-0.113H8.438c-0.063,0 -0.113,0.051 -0.113,0.113v1.283H7.042c-0.063,0 -0.113,0.051 -0.113,0.113v1.292C6.928,11.313 6.979,11.363 7.042,11.363z"/>
+    <path android:fillColor="?attr/icCalculatorColor" android:pathData="M10.157,16.078l0.907,-0.907c0.021,-0.021 0.033,-0.05 0.033,-0.08s-0.012,-0.059 -0.033,-0.08l-0.914,-0.913c-0.044,-0.045 -0.116,-0.045 -0.16,0l-0.907,0.907l-0.907,-0.907c-0.044,-0.045 -0.116,-0.045 -0.16,0l-0.913,0.913c-0.044,0.044 -0.044,0.116 0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044 -0.044,0.116 0,0.16l0.913,0.914c0.021,0.021 0.05,0.033 0.08,0.033s0.059,-0.012 0.08,-0.033l0.907,-0.907l0.907,0.907c0.021,0.021 0.05,0.033 0.08,0.033s0.059,-0.012 0.08,-0.033l0.914,-0.914c0.044,-0.044 0.044,-0.116 0,-0.16L10.157,16.078z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_calibration.xml b/core/src/main/res/drawable/ic_calibration.xml
index cf3f592a41..3a1b98bcd4 100644
--- a/core/src/main/res/drawable/ic_calibration.xml
+++ b/core/src/main/res/drawable/ic_calibration.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="24">
   <path
       android:pathData="M7.305,4.482c1.782,2.914 4.332,5.382 3.916,9.05c-0.256,2.254 -2.529,3.635 -4.783,3.199c-2.145,-0.415 -3.625,-2.546 -3.171,-4.728C3.858,9.168 5.537,6.894 7.305,4.482zM5.08,10.061c-0.212,0.638 -0.489,1.262 -0.621,1.916c-0.205,1.017 -0.065,1.994 0.764,2.731c0.297,0.264 0.68,0.354 1.038,0.077c0.242,-0.187 0.269,-0.46 0.096,-0.692C5.468,12.903 5.032,11.589 5.08,10.061z"
-      android:fillColor="@color/calibration"/>
+      android:fillColor="?attr/icCalibrationColor"/>
   <path
       android:pathData="M17.959,4.566c1.073,1.453 2.073,2.837 2.489,4.535c0.28,1.143 -0.069,2.1 -1.037,2.763c-0.943,0.645 -1.961,0.655 -2.904,0.009c-0.967,-0.662 -1.318,-1.635 -1.041,-2.769C15.88,7.408 16.875,6.019 17.959,4.566z"
-      android:fillColor="@color/calibration"/>
+      android:fillColor="?attr/icCalibrationColor"/>
   <path
       android:pathData="M14.82,14.425c0.797,1.094 1.535,2.104 1.819,3.355c0.188,0.826 -0.096,1.498 -0.784,1.965c-0.669,0.454 -1.393,0.467 -2.067,0.014c-0.688,-0.462 -0.985,-1.13 -0.8,-1.959C13.272,16.531 14.004,15.503 14.82,14.425z"
-      android:fillColor="@color/calibration"/>
+      android:fillColor="?attr/icCalibrationColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_bolus_carbs.xml b/core/src/main/res/drawable/ic_cp_bolus_carbs.xml
index e21b236b4e..dc22cbd2b5 100644
--- a/core/src/main/res/drawable/ic_cp_bolus_carbs.xml
+++ b/core/src/main/res/drawable/ic_cp_bolus_carbs.xml
@@ -4,5 +4,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FEAD01" android:pathData="M16.074,14.883c-0.332,0.416 -0.691,0.722 -1.09,0.993c-0.378,0.257 -0.843,0.39 -1.203,0.468c-0.688,0.125 -0.25,0.188 0.096,0.657c-1.247,1.781 -3.348,1.9 -5.102,0.991c-0.141,-0.073 -0.272,-0.165 -0.403,-0.255c-0.276,-0.19 -0.398,-0.236 -0.63,0.004c-0.187,0.193 -0.628,0.618 -0.852,0.838L6.4,18.047c0.241,-0.219 0.518,-0.491 0.718,-0.678c0.435,-0.408 0.336,-0.458 -0.011,-0.955c-1.205,-1.725 -0.836,-3.976 0.859,-5.236c0.722,0.462 0.566,0.353 0.801,-0.327c0.251,-0.726 0.677,-1.345 1.325,-1.777c0.659,0.582 0.549,0.316 0.814,-0.351c0.286,-0.721 0.734,-1.309 1.353,-1.806c0.695,0.458 1.014,0.966 1.252,1.538c0.273,0.656 0.379,0.435 0.858,-0.03c1.023,-0.992 2.273,-1.385 3.491,-1.087c0.287,1.586 -0.39,3.005 -1.859,3.932c0.771,0.208 1.5,0.625 2.215,1.468c-0.439,0.643 -1.213,1.259 -1.993,1.39C15.105,14.317 15.734,14.359 16.074,14.883zM17.184,8.469c0.013,-0.442 -0.128,-0.559 -0.51,-0.508c-1.244,0.167 -2.413,1.284 -2.621,2.504c-0.072,0.422 0.15,0.648 0.571,0.551c0.267,-0.062 0.538,-0.144 0.783,-0.265C16.39,10.263 17,9.484 17.184,8.469zM13.259,10.211c0.011,-0.699 -0.231,-1.258 -0.566,-1.784c-0.322,-0.506 -0.546,-0.505 -0.868,-0.011c-0.744,1.138 -0.442,2.461 0.152,3.433c0.19,0.311 0.445,0.313 0.669,0.011C13.017,11.357 13.273,10.801 13.259,10.211zM10.925,17.86c0.517,0 1.245,-0.233 1.618,-0.515c0.317,-0.24 0.344,-0.436 0.03,-0.652c-1.164,-0.802 -2.354,-0.977 -3.585,-0.119c-0.414,0.289 -0.391,0.523 0.063,0.79C9.629,17.703 10.26,17.846 10.925,17.86zM11.109,12.297c0.02,-0.666 -0.231,-1.243 -0.569,-1.786c-0.316,-0.507 -0.532,-0.495 -0.854,0.026c-0.622,1.004 -0.57,2.408 0.126,3.37c0.241,0.334 0.449,0.355 0.707,0.03C10.896,13.459 11.123,12.916 11.109,12.297zM15.068,13.639c0.661,-0.003 1.381,-0.217 1.756,-0.502c0.32,-0.244 0.329,-0.403 0.036,-0.66c-0.936,-0.82 -2.634,-0.874 -3.605,-0.113c-0.351,0.275 -0.358,0.527 0.019,0.737C13.85,13.423 14.46,13.658 15.068,13.639zM7.124,14.258c-0.023,0.548 0.124,1.116 0.447,1.633c0.305,0.489 0.569,0.494 0.893,0.036c0.704,-0.995 0.645,-2.507 -0.135,-3.438c-0.254,-0.303 -0.471,-0.302 -0.713,0.03C7.253,13.017 7.116,13.587 7.124,14.258zM12.831,13.928c-0.667,-0.031 -1.25,0.192 -1.77,0.589c-0.26,0.198 -0.271,0.416 -0.005,0.636c0.852,0.704 2.692,0.765 3.599,0.114c0.367,-0.263 0.376,-0.482 0.005,-0.726C14.106,14.175 13.512,13.911 12.831,13.928z"/>
+    <path android:fillColor="?attr/icBolusCarbsColor"
+        android:pathData="M16.074,14.883c-0.332,0.416 -0.691,0.722 -1.09,0.993c-0.378,0.257 -0.843,0.39 -1.203,0.468c-0.688,0.125 -0.25,0.188 0.096,0.657c-1.247,1.781 -3.348,1.9 -5.102,0.991c-0.141,-0.073 -0.272,-0.165 -0.403,-0.255c-0.276,-0.19 -0.398,-0.236 -0.63,0.004c-0.187,0.193 -0.628,0.618 -0.852,0.838L6.4,18.047c0.241,-0.219 0.518,-0.491 0.718,-0.678c0.435,-0.408 0.336,-0.458 -0.011,-0.955c-1.205,-1.725 -0.836,-3.976 0.859,-5.236c0.722,0.462 0.566,0.353 0.801,-0.327c0.251,-0.726 0.677,-1.345 1.325,-1.777c0.659,0.582 0.549,0.316 0.814,-0.351c0.286,-0.721 0.734,-1.309 1.353,-1.806c0.695,0.458 1.014,0.966 1.252,1.538c0.273,0.656 0.379,0.435 0.858,-0.03c1.023,-0.992 2.273,-1.385 3.491,-1.087c0.287,1.586 -0.39,3.005 -1.859,3.932c0.771,0.208 1.5,0.625 2.215,1.468c-0.439,0.643 -1.213,1.259 -1.993,1.39C15.105,14.317 15.734,14.359 16.074,14.883zM17.184,8.469c0.013,-0.442 -0.128,-0.559 -0.51,-0.508c-1.244,0.167 -2.413,1.284 -2.621,2.504c-0.072,0.422 0.15,0.648 0.571,0.551c0.267,-0.062 0.538,-0.144 0.783,-0.265C16.39,10.263 17,9.484 17.184,8.469zM13.259,10.211c0.011,-0.699 -0.231,-1.258 -0.566,-1.784c-0.322,-0.506 -0.546,-0.505 -0.868,-0.011c-0.744,1.138 -0.442,2.461 0.152,3.433c0.19,0.311 0.445,0.313 0.669,0.011C13.017,11.357 13.273,10.801 13.259,10.211zM10.925,17.86c0.517,0 1.245,-0.233 1.618,-0.515c0.317,-0.24 0.344,-0.436 0.03,-0.652c-1.164,-0.802 -2.354,-0.977 -3.585,-0.119c-0.414,0.289 -0.391,0.523 0.063,0.79C9.629,17.703 10.26,17.846 10.925,17.86zM11.109,12.297c0.02,-0.666 -0.231,-1.243 -0.569,-1.786c-0.316,-0.507 -0.532,-0.495 -0.854,0.026c-0.622,1.004 -0.57,2.408 0.126,3.37c0.241,0.334 0.449,0.355 0.707,0.03C10.896,13.459 11.123,12.916 11.109,12.297zM15.068,13.639c0.661,-0.003 1.381,-0.217 1.756,-0.502c0.32,-0.244 0.329,-0.403 0.036,-0.66c-0.936,-0.82 -2.634,-0.874 -3.605,-0.113c-0.351,0.275 -0.358,0.527 0.019,0.737C13.85,13.423 14.46,13.658 15.068,13.639zM7.124,14.258c-0.023,0.548 0.124,1.116 0.447,1.633c0.305,0.489 0.569,0.494 0.893,0.036c0.704,-0.995 0.645,-2.507 -0.135,-3.438c-0.254,-0.303 -0.471,-0.302 -0.713,0.03C7.253,13.017 7.116,13.587 7.124,14.258zM12.831,13.928c-0.667,-0.031 -1.25,0.192 -1.77,0.589c-0.26,0.198 -0.271,0.416 -0.005,0.636c0.852,0.704 2.692,0.765 3.599,0.114c0.367,-0.263 0.376,-0.482 0.005,-0.726C14.106,14.175 13.512,13.911 12.831,13.928z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_quick_wizard.xml b/core/src/main/res/drawable/ic_quick_wizard.xml
index b2d1f2569b..8e5d42cd3e 100644
--- a/core/src/main/res/drawable/ic_quick_wizard.xml
+++ b/core/src/main/res/drawable/ic_quick_wizard.xml
@@ -4,9 +4,10 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FEAF05" android:pathData="M10.751,6.59c-0.561,0.69 -0.796,1.057 -1.25,1.797c-2.517,0.238 -3.932,2.751 -3.379,4.664c0.244,0.843 0.779,1.476 1.498,1.958c2.348,1.573 6.243,1.429 8.487,-0.306c1.187,-0.918 1.723,-2.084 1.334,-3.576c-0.412,-1.58 -1.445,-2.585 -3.039,-2.87c-1.112,-0.199 -1.973,0.37 -2.558,1.313c-0.494,0.796 -0.72,1.616 -1.628,2.345c-0.389,-0.431 -0.458,-0.961 -0.483,-1.481c-0.12,-2.486 2.019,-4.439 4.595,-4.213c2.365,0.207 4.466,1.956 5.114,4.256c0.611,2.172 -0.226,4.432 -2.19,5.909c-2.995,2.253 -7.895,2.327 -10.943,0.165c-2.057,-1.459 -2.88,-3.881 -2.099,-6.18C5.023,7.978 7.368,6.304 9.77,6.4C10.072,6.412 10.365,6.459 10.751,6.59z"/>
-    <path android:fillColor="#FEAF06" android:pathData="M7.141,13.406c0.526,-0.103 1.178,-0.22 1.665,-0.322c1.522,-0.319 2.625,-1.229 3.273,-2.678c0.289,-0.647 0.702,-1.125 1.448,-1.42c0.418,0.811 0.454,1.641 0.223,2.493c-0.284,1.049 -0.889,1.863 -1.819,2.429c-0.616,0.376 -1.284,0.638 -1.966,0.867C8.814,15.163 7.797,14.773 7.141,13.406z"/>
-    <path android:fillColor="#FEAF06" android:pathData="M12.313,14.203c0.734,-0.537 1.25,-1.089 1.469,-1.612c0.894,0.159 1.92,0.314 2.804,0.471C16.036,14.799 13.922,15.203 12.313,14.203z"/>
-    <path android:fillColor="#FEAF06" android:pathData="M2.377,13.882c0.179,-0.123 0.756,-0.189 1.192,-0.123c0.259,0.631 0.587,1.225 1.108,1.923c-0.572,0.116 -1.037,0.253 -1.567,0.224c-0.493,-0.027 -0.993,-0.353 -1.063,-0.989C2.013,14.61 2.047,14.109 2.377,13.882z"/>
-    <path android:fillColor="#FEAF06" android:pathData="M19.143,15.22c0.196,-0.497 0.362,-0.961 0.561,-1.411c0.235,-0.531 0.618,-0.76 1.121,-0.681c0.419,0.066 0.575,0.376 0.644,0.756c0.098,0.541 -0.078,0.989 -0.529,1.213C20.38,15.377 19.787,15.293 19.143,15.22z"/>
+    <path android:fillColor="?attr/icQuickWizardColor"
+        android:pathData="M10.751,6.59c-0.561,0.69 -0.796,1.057 -1.25,1.797c-2.517,0.238 -3.932,2.751 -3.379,4.664c0.244,0.843 0.779,1.476 1.498,1.958c2.348,1.573 6.243,1.429 8.487,-0.306c1.187,-0.918 1.723,-2.084 1.334,-3.576c-0.412,-1.58 -1.445,-2.585 -3.039,-2.87c-1.112,-0.199 -1.973,0.37 -2.558,1.313c-0.494,0.796 -0.72,1.616 -1.628,2.345c-0.389,-0.431 -0.458,-0.961 -0.483,-1.481c-0.12,-2.486 2.019,-4.439 4.595,-4.213c2.365,0.207 4.466,1.956 5.114,4.256c0.611,2.172 -0.226,4.432 -2.19,5.909c-2.995,2.253 -7.895,2.327 -10.943,0.165c-2.057,-1.459 -2.88,-3.881 -2.099,-6.18C5.023,7.978 7.368,6.304 9.77,6.4C10.072,6.412 10.365,6.459 10.751,6.59z"/>
+    <path android:fillColor="?attr/icQuickWizardColor" android:pathData="M7.141,13.406c0.526,-0.103 1.178,-0.22 1.665,-0.322c1.522,-0.319 2.625,-1.229 3.273,-2.678c0.289,-0.647 0.702,-1.125 1.448,-1.42c0.418,0.811 0.454,1.641 0.223,2.493c-0.284,1.049 -0.889,1.863 -1.819,2.429c-0.616,0.376 -1.284,0.638 -1.966,0.867C8.814,15.163 7.797,14.773 7.141,13.406z"/>
+    <path android:fillColor="?attr/icQuickWizardColor" android:pathData="M12.313,14.203c0.734,-0.537 1.25,-1.089 1.469,-1.612c0.894,0.159 1.92,0.314 2.804,0.471C16.036,14.799 13.922,15.203 12.313,14.203z"/>
+    <path android:fillColor="?attr/icQuickWizardColor" android:pathData="M2.377,13.882c0.179,-0.123 0.756,-0.189 1.192,-0.123c0.259,0.631 0.587,1.225 1.108,1.923c-0.572,0.116 -1.037,0.253 -1.567,0.224c-0.493,-0.027 -0.993,-0.353 -1.063,-0.989C2.013,14.61 2.047,14.109 2.377,13.882z"/>
+    <path android:fillColor="?attr/icQuickWizardColor" android:pathData="M19.143,15.22c0.196,-0.497 0.362,-0.961 0.561,-1.411c0.235,-0.531 0.618,-0.76 1.121,-0.681c0.419,0.066 0.575,0.376 0.644,0.756c0.098,0.541 -0.078,0.989 -0.529,1.213C20.38,15.377 19.787,15.293 19.143,15.22z"/>
 </vector>
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index 9adb3ad930..9814347521 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -169,6 +169,13 @@
         <item name="dummyBackground">@color/dummy_background</item>
         <!-- Icon Colors -->
         <item name="icCheckboxTrendColor">@color/white</item>
+        <!-- Overview Buttons -->
+        <item name="icBolusColor">@color/colorInsulinButton</item>
+        <item name="icBolusCarbsColor">@color/colorCarbsButton</item>
+        <item name="icCalculatorColor">@color/colorCalculatorButton</item>
+        <item name="icQuickWizardColor">@color/colorQuickWizardButton</item>
+        <item name="icCalibrationColor">@color/colorCalibrationButton</item>
+        <item name="icTreatmentColor">@color/colorTreatmentButton</item>
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 853fbb245c..9c2f6300a2 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -143,4 +143,11 @@
     <attr name="dummyBackground" format="reference|color" />
     <!-- Icon Colors -->
     <attr name="icCheckboxTrendColor" format="reference|color" />
+    <!-- Overview Buttons -->
+    <attr name="icBolusColor" format="reference|color" />
+    <attr name="icBolusCarbsColor" format="reference|color" />
+    <attr name="icCalculatorColor" format="reference|color" />
+    <attr name="icQuickWizardColor" format="reference|color" />
+    <attr name="icCalibrationColor" format="reference|color" />
+    <attr name="icTreatmentColor" format="reference|color" />
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index a7771698e2..0d2df61682 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -48,7 +48,7 @@
 
 
     <!--    Fragments-->
-    <color name="pumpStatusBackground">#505050</color>
+    <color name="pumpStatusBackground">#CCCCCC</color>
 
     <!--    Dialogs-->
     <color name="dialog_title_background">#CCCCCC</color>
@@ -149,7 +149,7 @@
 
     <color name="ribbonWarning">#f4d700</color>
     <color name="ribbonCritical">#ff0400</color>
-    <color name="ribbonTextDefault">#000000</color>
+    <color name="ribbonTextDefault">#FFFFFF</color>
     <color name="ribbonTextWarning">#303030</color>
     <color name="tempTargetConfirmation">#77dd77</color>
 
@@ -182,13 +182,13 @@
 
     <color name="cardObjectiveText">#779ECB</color>
 
-    <color name="colorAcceptTempButton">#f4d700</color>
+    <color name="colorAcceptTempButton">#ffffbb33</color>
     <color name="colorTreatmentButton">#67dfe8</color>
     <color name="colorInsulinButton">#67dfe8</color>
-    <color name="colorCarbsButton">#ffae01</color>
+    <color name="colorCarbsButton">#E19701</color>
     <color name="colorCalibrationButton">#e93057</color>
-    <color name="colorCalculatorButton">#67e86a</color>
-    <color name="colorQuickWizardButton">#ffae01</color>
+    <color name="colorCalculatorButton">#66BB6A</color>
+    <color name="colorQuickWizardButton">#E19701</color>
     <color name="colorSetTempButton">#FF478EFF</color>
     <color name="colorSetExtendedButton">#FFDD7792</color>
     <color name="colorProfileSwitchButton">#ca77dd</color>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index bc6a94884d..1cfff0322c 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -171,7 +171,15 @@
         <item name="dummyBackground">@color/dummy_background</item>
         <!-- Icon Colors -->
         <!-- Trend Arrow -->
-        <item name="icCheckboxTrendColor">@color/black</item>
+        <item name="icCheckboxTrendColor">@color/plastic_grey</item>
+        <!-- Overview Buttons -->
+        <item name="icBolusColor">@color/bolus</item>
+        <item name="icBolusCarbsColor">@color/colorCarbsButton</item>
+        <item name="icCalculatorColor">@color/colorCalculatorButton</item>
+        <item name="icQuickWizardColor">@color/colorQuickWizardButton</item>
+        <item name="icCalibrationColor">@color/colorCalibrationButton</item>
+        <item name="icTreatmentColor">@color/bolus</item>
+
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>

From 25d51d73117914316a6e62ff93a1e5f40913091f Mon Sep 17 00:00:00 2001
From: osodebailar <a.eggen@gmail.com>
Date: Thu, 31 Mar 2022 08:47:35 +0200
Subject: [PATCH 11/13] workaround fix for byoda

---
 app/src/main/res/drawable/ic_byoda.xml    | 2 +-
 core/src/main/res/values-night/colors.xml | 1 +
 core/src/main/res/values-night/styles.xml | 2 +-
 core/src/main/res/values/colors.xml       | 1 +
 core/src/main/res/values/styles.xml       | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/drawable/ic_byoda.xml b/app/src/main/res/drawable/ic_byoda.xml
index 97edb8f9d5..da63bef0df 100644
--- a/app/src/main/res/drawable/ic_byoda.xml
+++ b/app/src/main/res/drawable/ic_byoda.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M12.107,3.666c-4.603,0 -8.335,3.732 -8.335,8.335s3.732,8.335 8.335,8.335s8.335,-3.731 8.335,-8.335V3.666H12.107zM12.107,18.335c-3.498,0 -6.334,-2.836 -6.334,-6.334c0,-3.498 2.836,-6.334 6.334,-6.334c3.498,0 6.334,2.836 6.334,6.334C18.442,15.499 15.606,18.335 12.107,18.335z"
-      android:fillColor="?attr/cgmdexColor"/>
+      android:fillColor="@color/byodagray"/>
 </vector>
diff --git a/core/src/main/res/values-night/colors.xml b/core/src/main/res/values-night/colors.xml
index f0cd81a3ae..407645b3d1 100644
--- a/core/src/main/res/values-night/colors.xml
+++ b/core/src/main/res/values-night/colors.xml
@@ -209,6 +209,7 @@
     <color name="darkgrayVariant">#424242</color>
     <color name="objectivesBackground">#3C3C3C</color>
     <color name="plastic_grey">#666666</color>
+    <color name="byodagray">#999999</color>
     <color name="sphere_plastic_grey">#8c8c8c</color>
     <color name="lightSandGray">#72000000</color>
     <color name="sandGray">#c8666666</color>
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index 9814347521..2d60869111 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -121,7 +121,7 @@
         <item name="viewPortbackgroundColor">@color/white_alpha_20</item>
         <item name="tempTargetBackgroundColor">@color/tempTargetBackground</item>
         <!---CGM source-->
-        <item name="cgmdexColor">@color/colorLightGray</item>
+        <item name="cgmdexColor">@color/byodagray</item>
         <item name="cgmxdripColor">@color/colorCalibrationButton</item>
         <!---BG color-->
         <item name="bgLow">@color/low</item>
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 0d2df61682..f112deb931 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -210,6 +210,7 @@
     <color name="darkgrayVariant">#424242</color>
     <color name="objectivesBackground">#3C3C3C</color>
     <color name="plastic_grey">#666666</color>
+    <color name="byodagray">#777777</color>
     <color name="sphere_plastic_grey">#8c8c8c</color>
     <color name="lightSandGray">#72000000</color>
     <color name="sandGray">#c8666666</color>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 1cfff0322c..fd14dc94f5 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -124,7 +124,7 @@
         <item name="viewPortbackgroundColor">@color/white_alpha_20</item>
         <item name="tempTargetBackgroundColor">@color/tempTargetBackground</item>
         <!---CGM source-->
-        <item name="cgmdexColor">@color/mdtp_line_dark</item>
+        <item name="cgmdexColor">@color/byodagray</item>
         <item name="cgmxdripColor">@color/colorCalibrationButton</item>
         <!---BG color-->
         <item name="bgLow">@color/low</item>

From 2134a580df9a0c251c653fc76bdad961234daf4e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 31 Mar 2022 16:16:20 +0200
Subject: [PATCH 12/13] remove unused code

---
 .../careportal_stats_fragment_lowres.xml      | 224 ------------------
 1 file changed, 224 deletions(-)
 delete mode 100644 app/src/main/res/layout/careportal_stats_fragment_lowres.xml

diff --git a/app/src/main/res/layout/careportal_stats_fragment_lowres.xml b/app/src/main/res/layout/careportal_stats_fragment_lowres.xml
deleted file mode 100644
index da803e3354..0000000000
--- a/app/src/main/res/layout/careportal_stats_fragment_lowres.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:stretchColumns="0,2,4"
-    tools:context=".plugins.general.actions.ActionsFragment">
-
-    <TableRow
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="25dp"
-            android:gravity="center_vertical"
-            android:paddingStart="15dp"
-            android:paddingEnd="2dp"
-            android:text="@string/careportal_sensor_label"
-            android:textSize="14sp"
-            app:drawableStartCompat="@drawable/ic_cp_age_sensor" />
-
-
-        <TextView
-            android:id="@+id/sensor_age"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
-            android:textSize="14sp" />
-
-
-        <TextView
-            android:id="@+id/sensor_level"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="20dp"
-            android:gravity="center_vertical"
-            android:paddingStart="2dp"
-            android:textSize="14sp"
-            tools:ignore="RtlSymmetry" />
-
-    </TableRow>
-
-    <TableRow
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginBottom="2dp"
-            android:layout_span="3"
-            android:background="@color/list_delimiter" />
-
-    </TableRow>
-
-    <TableRow
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="25dp"
-            android:gravity="center_vertical"
-            android:paddingStart="15dp"
-            android:paddingEnd="2dp"
-            android:text="@string/careportal_insulin_label"
-            android:textSize="14sp"
-            app:drawableStartCompat="@drawable/ic_cp_age_insulin" />
-
-
-        <TextView
-            android:id="@+id/insulin_age"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
-            android:textSize="14sp" />
-
-
-        <TextView
-            android:id="@+id/reservoir_level"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="20dp"
-            android:gravity="center_vertical"
-            android:paddingStart="2dp"
-            android:textSize="14sp"
-            tools:ignore="RtlSymmetry" />
-
-    </TableRow>
-
-    <TableRow
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginBottom="2dp"
-            android:layout_span="3"
-            android:background="@color/list_delimiter" />
-
-    </TableRow>
-
-    <TableRow
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true">
-
-        <TextView
-            android:id="@+id/cannula_or_patch"
-            android:layout_width="wrap_content"
-            android:layout_height="25dp"
-            android:gravity="center_vertical"
-            android:paddingStart="15dp"
-            android:paddingEnd="2dp"
-            android:text="@string/cannula"
-            android:textSize="14sp"
-            app:drawableStartCompat="@drawable/ic_cp_age_cannula" />
-
-        <TextView
-            android:id="@+id/cannula_age"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
-            android:textSize="14sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="20dp"
-            android:gravity="center_vertical"
-            android:paddingStart="2dp"
-            android:text=""
-            android:textSize="14sp"
-            tools:ignore="RtlSymmetry" />
-
-    </TableRow>
-
-    <TableRow
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginBottom="2dp"
-            android:layout_span="3"
-            android:background="@color/list_delimiter" />
-
-    </TableRow>
-
-    <TableRow
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true">
-
-        <TextView
-            android:id="@+id/pb_label"
-            android:layout_width="wrap_content"
-            android:layout_height="25dp"
-            android:gravity="center_vertical"
-            android:paddingStart="15dp"
-            android:paddingEnd="2dp"
-            android:text="@string/pump"
-            android:textSize="14sp"
-            app:drawableStartCompat="@drawable/ic_cp_age_battery" />
-
-
-        <TextView
-            android:id="@+id/pb_age"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/battery_level"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="20dp"
-            android:gravity="center_vertical"
-            android:paddingStart="2dp"
-            android:textSize="14sp"
-            tools:ignore="RtlSymmetry" />
-
-    </TableRow>
-
-    <TableRow
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginBottom="2dp"
-            android:layout_span="3"
-            android:background="@color/list_delimiter" />
-
-    </TableRow>
-
-</TableLayout>

From b8744f6cdf5f3e650bc30f8914fcf5c472c6af0a Mon Sep 17 00:00:00 2001
From: osodebailar <a.eggen@gmail.com>
Date: Thu, 31 Mar 2022 18:04:40 +0200
Subject: [PATCH 13/13] overview and action dialog icons , colors for light
 theme

---
 .../drawable/ic_actions_cancelextbolus.xml    |  8 ++--
 app/src/main/res/drawable/ic_cancelbasal.xml  |  7 +--
 .../main/res/drawable/ic_loop_disabled.xml    |  6 +--
 .../res/drawable/ic_loop_disconnected.xml     |  4 +-
 app/src/main/res/drawable/ic_loop_lgs.xml     | 12 ++---
 app/src/main/res/drawable/ic_loop_open.xml    | 14 +++---
 app/src/main/res/drawable/ic_loop_paused.xml  |  6 +--
 .../main/res/drawable/ic_loop_reconnect.xml   |  4 +-
 app/src/main/res/drawable/ic_loop_resume.xml  |  4 +-
 .../main/res/drawable/ic_loop_superbolus.xml  |  4 +-
 .../main/res/drawable/ic_target_activity.xml  | 16 +++----
 .../main/res/drawable/ic_target_cancel.xml    | 14 +++---
 .../res/drawable/ic_target_eatingsoon.xml     | 12 ++---
 app/src/main/res/drawable/ic_target_hypo.xml  | 10 ++--
 .../res/drawable/ic_actions_startextbolus.xml |  5 +-
 .../main/res/drawable/ic_cp_announcement.xml  | 10 ++--
 core/src/main/res/drawable/ic_cp_bgcheck.xml  |  6 +--
 .../main/res/drawable/ic_cp_cgm_insert.xml    |  4 +-
 core/src/main/res/drawable/ic_cp_exercise.xml |  4 +-
 core/src/main/res/drawable/ic_cp_note.xml     |  2 +-
 .../main/res/drawable/ic_cp_pump_battery.xml  |  4 +-
 .../main/res/drawable/ic_cp_pump_canula.xml   |  2 +-
 core/src/main/res/drawable/ic_cp_question.xml |  4 +-
 core/src/main/res/drawable/ic_loop_closed.xml |  2 +-
 .../src/main/res/drawable/ic_pump_history.xml |  4 +-
 .../main/res/drawable/ic_temptarget_high.xml  |  4 +-
 core/src/main/res/values-night/colors.xml     | 10 ++++
 core/src/main/res/values-night/styles.xml     | 39 +++++++++++++---
 core/src/main/res/values/attrs.xml            | 29 ++++++++++++
 core/src/main/res/values/colors.xml           | 22 ++++++---
 core/src/main/res/values/styles.xml           | 46 +++++++++++++++----
 31 files changed, 213 insertions(+), 105 deletions(-)

diff --git a/app/src/main/res/drawable/ic_actions_cancelextbolus.xml b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
index 913b1b9aeb..92998ff78e 100644
--- a/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
+++ b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
@@ -5,14 +5,14 @@
     android:viewportHeight="24">
   <path
       android:pathData="M20.164,7.697l0.353,-0.684c0.18,-0.348 0.043,-0.775 -0.305,-0.955c-0.351,-0.181 -0.775,-0.043 -0.955,0.305l-0.354,0.685c-0.379,-0.148 -0.772,-0.265 -1.18,-0.344V6.106c0.45,-0.061 0.802,-0.431 0.802,-0.897c0,-0.509 -0.412,-0.921 -0.921,-0.921h-2.312c-0.509,0 -0.921,0.413 -0.921,0.921c0,0.467 0.352,0.836 0.802,0.897v0.598c-3.125,0.599 -5.495,3.349 -5.495,6.646c0,3.732 3.037,6.77 6.77,6.77c3.732,0 6.77,-3.037 6.77,-6.77C23.218,10.989 22.001,8.909 20.164,7.697zM16.448,19.119c-3.182,0 -5.77,-2.588 -5.77,-5.77s2.588,-5.77 5.77,-5.77s5.77,2.588 5.77,5.77S19.63,19.119 16.448,19.119z"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/extBolusStopColor"/>
   <path
       android:pathData="M16.45,8.814c-0.086,0 -0.169,0.035 -0.23,0.096s-0.096,0.144 -0.096,0.23v4.198c0,0.08 0.029,0.157 0.083,0.217l2.789,3.14c0.058,0.064 0.139,0.104 0.226,0.108c0.006,0.001 0.013,0.001 0.019,0.001c0.08,0 0.157,-0.029 0.217,-0.083c0.971,-0.866 1.527,-2.095 1.527,-3.372C20.983,10.85 18.95,8.816 16.45,8.814z"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/extBolusStopColor"/>
   <path
       android:pathData="M1.972,12.381c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708l-5.514,5.514C2.228,12.333 2.1,12.381 1.972,12.381z"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/extBolusStopColor"/>
   <path
       android:pathData="M7.486,12.381c-0.128,0 -0.256,-0.049 -0.354,-0.146L1.618,6.721c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C7.743,12.333 7.614,12.381 7.486,12.381z"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/extBolusStopColor"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cancelbasal.xml b/app/src/main/res/drawable/ic_cancelbasal.xml
index 76640a4534..dcc01452e3 100644
--- a/app/src/main/res/drawable/ic_cancelbasal.xml
+++ b/app/src/main/res/drawable/ic_cancelbasal.xml
@@ -4,7 +4,8 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#CF8BFE" android:pathData="M3.923,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708l-5.514,5.514C4.179,11.972 4.051,12.021 3.923,12.021z"/>
-    <path android:fillColor="#CF8BFE" android:pathData="M9.438,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146L3.569,6.361c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C9.694,11.972 9.566,12.021 9.438,12.021z"/>
-    <path android:fillColor="#CF8BFE" android:pathData="M16.578,18.026l0,-11.042l-3.698,0l0,11.042l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"/>
+    <path android:fillColor="?attr/basalCancelColor"
+        android:pathData="M3.923,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708l-5.514,5.514C4.179,11.972 4.051,12.021 3.923,12.021z"/>
+    <path android:fillColor="?attr/basalCancelColor" android:pathData="M9.438,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146L3.569,6.361c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C9.694,11.972 9.566,12.021 9.438,12.021z"/>
+    <path android:fillColor="?attr/basalCancelColor" android:pathData="M16.578,18.026l0,-11.042l-3.698,0l0,11.042l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_disabled.xml b/app/src/main/res/drawable/ic_loop_disabled.xml
index 685118b92d..e8004f78fe 100644
--- a/app/src/main/res/drawable/ic_loop_disabled.xml
+++ b/app/src/main/res/drawable/ic_loop_disabled.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="24">
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopDisabled"/>
+      android:fillColor="?attr/loopDisabled"/>
   <path
       android:pathData="M10.2429,8.7408l5.0162,5.0162l-1.5026,1.5026l-5.0162,-5.0162z"
-      android:fillColor="@color/loopDisabled"/>
+      android:fillColor="?attr/loopDisabled"/>
   <path
       android:pathData="M8.7408,13.7571l5.0162,-5.0162l1.5026,1.5026l-5.0162,5.0162z"
-      android:fillColor="@color/loopDisabled"/>
+      android:fillColor="?attr/loopDisabled"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_disconnected.xml b/app/src/main/res/drawable/ic_loop_disconnected.xml
index ea2cd137f4..3753c6a451 100644
--- a/app/src/main/res/drawable/ic_loop_disconnected.xml
+++ b/app/src/main/res/drawable/ic_loop_disconnected.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M17.523,3.764c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938c0,1.803 0.484,3.49 1.325,4.945l-0.319,0.365c-0.001,0.842 0.325,1.681 1.01,2.277l2.416,2.103l0.872,-1.002l1.746,1.523l0.472,-0.542l-1.747,-1.523l1.272,-1.461l1.748,1.524l0.472,-0.542l-1.749,-1.525l0.872,-1.001l-2.416,-2.103c-0.684,-0.596 -1.557,-0.803 -2.39,-0.687l-0.277,0.318c-0.335,-0.825 -0.528,-1.723 -0.528,-2.67c0,-3.952 3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784L17.523,3.764z"
-      android:fillColor="@color/loopDisconnected"/>
+      android:fillColor="?attr/loopDisconnected"/>
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,0.938 -0.183,1.833 -0.511,2.653l-0.263,-0.302c-0.833,-0.116 -1.706,0.091 -2.39,0.687l-2.416,2.103l3.96,4.549l2.416,-2.103c0.685,-0.596 1.011,-1.435 1.01,-2.277l-0.346,-0.397C21.51,15.526 22,13.855 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopDisconnected"/>
+      android:fillColor="?attr/loopDisconnected"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_lgs.xml b/app/src/main/res/drawable/ic_loop_lgs.xml
index c570403dbf..23a4ddf300 100644
--- a/app/src/main/res/drawable/ic_loop_lgs.xml
+++ b/app/src/main/res/drawable/ic_loop_lgs.xml
@@ -5,20 +5,20 @@
     android:viewportHeight="24">
   <path
       android:pathData="M6.349,7.767c0.408,-0.542 0.89,-1.022 1.433,-1.429L6.38,3.917C5.424,4.584 4.593,5.415 3.924,6.37L6.349,7.767z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M9.258,5.478c0.613,-0.262 1.272,-0.436 1.959,-0.517l-0.003,-2.793c-1.191,0.101 -2.318,0.414 -3.352,0.898L9.258,5.478z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M12.922,2.189l0.003,2.773c0.754,0.093 1.472,0.301 2.135,0.608c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538C16.182,2.88 14.61,2.336 12.922,2.189z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M4.963,11.199c0.083,-0.687 0.259,-1.345 0.523,-1.958L3.072,7.85c-0.485,1.034 -0.801,2.16 -0.903,3.351L4.963,11.199z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156c-2.345,0 -4.42,-1.133 -5.725,-2.876l-2.421,1.401C5.712,20.315 8.689,22 12.063,22C17.551,22 22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M5.478,14.867c-0.262,-0.614 -0.436,-1.272 -0.517,-1.96L2.168,12.91c0.101,1.191 0.414,2.319 0.898,3.353L5.478,14.867z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_open.xml b/app/src/main/res/drawable/ic_loop_open.xml
index 6f97953808..c7b4f00e3b 100644
--- a/app/src/main/res/drawable/ic_loop_open.xml
+++ b/app/src/main/res/drawable/ic_loop_open.xml
@@ -5,23 +5,23 @@
     android:viewportHeight="24">
   <path
       android:pathData="M6.349,7.767c0.408,-0.542 0.89,-1.022 1.433,-1.429L6.38,3.917C5.424,4.584 4.593,5.415 3.924,6.37L6.349,7.767z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
   <path
       android:pathData="M3.072,7.85c-0.485,1.034 -0.801,2.16 -0.903,3.351l2.795,-0.003c0.083,-0.687 0.259,-1.345 0.523,-1.958L3.072,7.85z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
   <path
       android:pathData="M21.059,7.862l-2.412,1.396c0.262,0.614 0.437,1.272 0.518,1.96l2.793,-0.003C21.856,10.024 21.543,8.896 21.059,7.862z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
   <path
       android:pathData="M17.787,7.781l2.421,-1.401c-0.668,-0.956 -1.499,-1.787 -2.454,-2.456l-1.397,2.425C16.9,6.757 17.38,7.238 17.787,7.781z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
   <path
       android:pathData="M19.162,12.926c-0.427,3.544 -3.44,6.293 -7.099,6.293c-3.666,0 -6.684,-2.758 -7.102,-6.312L2.168,12.91C2.599,18.001 6.86,22 12.063,22c5.198,0 9.457,-3.992 9.894,-9.077L19.162,12.926z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
   <path
       android:pathData="M9.258,5.478c0.613,-0.262 1.272,-0.436 1.959,-0.517l-0.003,-2.793c-1.191,0.101 -2.318,0.414 -3.352,0.898L9.258,5.478z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
   <path
       android:pathData="M12.925,4.963c0.687,0.083 1.345,0.259 1.958,0.522l1.391,-2.414c-1.034,-0.485 -2.161,-0.801 -3.352,-0.903L12.925,4.963z"
-      android:fillColor="@color/loopOpened"/>
+      android:fillColor="?attr/loopOpened"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_paused.xml b/app/src/main/res/drawable/ic_loop_paused.xml
index c49d3084c3..372b6a7d61 100644
--- a/app/src/main/res/drawable/ic_loop_paused.xml
+++ b/app/src/main/res/drawable/ic_loop_paused.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="24">
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopSuspended"/>
+      android:fillColor="?attr/loopDisabled"/>
   <path
       android:pathData="M8.813,8.453h2.125v7.094h-2.125z"
-      android:fillColor="@color/loopSuspended"/>
+      android:fillColor="?attr/loopDisabled"/>
   <path
       android:pathData="M13.063,8.453h2.125v7.094h-2.125z"
-      android:fillColor="@color/loopSuspended"/>
+      android:fillColor="?attr/loopDisabled"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_reconnect.xml b/app/src/main/res/drawable/ic_loop_reconnect.xml
index f61d0f97b1..ca8e54fa6c 100644
--- a/app/src/main/res/drawable/ic_loop_reconnect.xml
+++ b/app/src/main/res/drawable/ic_loop_reconnect.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156c-3.952,0 -7.156,-3.204 -7.156,-7.156c0,-3.952 3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.937,4.449 -9.937,9.938c0,5.488 4.449,9.937 9.937,9.937C17.551,22 22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M14.868,22.154c0.794,0 1.49,-0.418 1.973,-1.054l-0.001,-3.926c-0.482,-0.634 -1.177,-1.052 -1.969,-1.052l-5.612,-0.001c-0.793,0 -1.487,0.416 -1.97,1.05l-0.004,3.926c0.482,0.636 1.178,1.055 1.972,1.055"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_resume.xml b/app/src/main/res/drawable/ic_loop_resume.xml
index ade6ba2f8d..cf80f79567 100644
--- a/app/src/main/res/drawable/ic_loop_resume.xml
+++ b/app/src/main/res/drawable/ic_loop_resume.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156c-3.952,0 -7.156,-3.204 -7.156,-7.156c0,-3.952 3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.937,4.449 -9.937,9.938c0,5.488 4.449,9.937 9.937,9.937C17.551,22 22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
   <path
       android:pathData="M9.401,8.391l6.599,3.609l-6.599,3.609z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loop_superbolus.xml b/app/src/main/res/drawable/ic_loop_superbolus.xml
index 2f94edf2c4..fd9223c587 100644
--- a/app/src/main/res/drawable/ic_loop_superbolus.xml
+++ b/app/src/main/res/drawable/ic_loop_superbolus.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="#FEAD01"/>
+      android:fillColor="?attr/loopSuperBolus"/>
   <path
       android:pathData="M15.026,13.715c-0.267,0.334 -0.555,0.58 -0.875,0.798c-0.304,0.206 -0.678,0.313 -0.966,0.376c-0.552,0.1 -0.201,0.151 0.077,0.528c-1.002,1.431 -2.69,1.526 -4.098,0.796c-0.113,-0.059 -0.219,-0.132 -0.324,-0.205c-0.222,-0.152 -0.32,-0.189 -0.506,0.003c-0.151,0.155 -0.504,0.496 -0.684,0.673l-0.394,-0.427c0.193,-0.176 0.417,-0.394 0.577,-0.545c0.349,-0.328 0.27,-0.368 -0.009,-0.767c-0.968,-1.386 -0.672,-3.195 0.69,-4.207c0.58,0.372 0.455,0.284 0.643,-0.263c0.201,-0.583 0.544,-1.081 1.064,-1.427c0.529,0.467 0.441,0.254 0.654,-0.282c0.23,-0.58 0.59,-1.052 1.087,-1.451c0.559,0.368 0.815,0.776 1.006,1.236c0.219,0.527 0.304,0.35 0.689,-0.024c0.822,-0.797 1.826,-1.113 2.805,-0.873c0.23,1.274 -0.314,2.414 -1.494,3.159c0.619,0.167 1.205,0.502 1.78,1.179c-0.352,0.516 -0.974,1.011 -1.601,1.117C14.247,13.26 14.753,13.295 15.026,13.715zM15.918,8.562c0.01,-0.355 -0.102,-0.449 -0.41,-0.408c-0.999,0.134 -1.939,1.031 -2.105,2.011c-0.058,0.339 0.121,0.52 0.459,0.442c0.215,-0.049 0.432,-0.116 0.629,-0.213C15.279,10.004 15.77,9.378 15.918,8.562zM12.764,9.962c0.009,-0.561 -0.185,-1.011 -0.454,-1.433c-0.259,-0.406 -0.438,-0.405 -0.697,-0.009c-0.598,0.914 -0.355,1.977 0.122,2.758c0.152,0.25 0.358,0.252 0.537,0.009C12.57,10.882 12.775,10.436 12.764,9.962zM10.889,16.107c0.415,0 1,-0.187 1.3,-0.414c0.255,-0.193 0.276,-0.35 0.024,-0.524c-0.935,-0.644 -1.891,-0.785 -2.88,-0.096c-0.333,0.232 -0.314,0.421 0.05,0.635C9.848,15.981 10.355,16.096 10.889,16.107zM11.037,11.638c0.016,-0.535 -0.186,-0.998 -0.457,-1.435c-0.254,-0.407 -0.427,-0.398 -0.686,0.021c-0.5,0.806 -0.458,1.935 0.101,2.707c0.194,0.268 0.361,0.285 0.568,0.024C10.866,12.571 11.048,12.136 11.037,11.638zM14.217,12.716c0.531,-0.002 1.109,-0.174 1.411,-0.403c0.257,-0.196 0.264,-0.324 0.029,-0.53c-0.752,-0.659 -2.116,-0.702 -2.896,-0.091c-0.282,0.221 -0.288,0.423 0.015,0.592C13.239,12.543 13.729,12.732 14.217,12.716zM7.835,13.214c-0.019,0.44 0.1,0.897 0.359,1.312c0.245,0.392 0.457,0.397 0.717,0.029c0.566,-0.8 0.518,-2.014 -0.108,-2.762c-0.204,-0.244 -0.378,-0.243 -0.573,0.024C7.939,12.217 7.829,12.674 7.835,13.214zM12.42,12.948c-0.536,-0.025 -1.004,0.155 -1.422,0.473c-0.209,0.159 -0.218,0.334 -0.004,0.511c0.685,0.566 2.162,0.614 2.891,0.091c0.295,-0.212 0.302,-0.387 0.004,-0.583C13.445,13.147 12.968,12.935 12.42,12.948z"
-      android:fillColor="#FEAD01"/>
+      android:fillColor="?attr/loopSuperBolus"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_target_activity.xml b/app/src/main/res/drawable/ic_target_activity.xml
index 4439597b75..4873b388cc 100644
--- a/app/src/main/res/drawable/ic_target_activity.xml
+++ b/app/src/main/res/drawable/ic_target_activity.xml
@@ -5,14 +5,14 @@
     android:viewportHeight="24">
   <path
       android:pathData="M18.253,15.869c1.19,0 2.158,-1.02 2.158,-2.274c0,-1.254 -0.968,-2.275 -2.158,-2.275c-1.19,0 -2.158,1.02 -2.158,2.275C16.095,14.849 17.063,15.869 18.253,15.869zM18.253,12.018c0.824,0 1.496,0.707 1.496,1.576c0,0.869 -0.671,1.576 -1.496,1.576s-1.496,-0.707 -1.496,-1.576C16.757,12.725 17.429,12.018 18.253,12.018z"
-      android:fillColor="@color/exercise"/>
+      android:fillColor="?attr/exerciseColor"/>
   <path
       android:pathData="M21.442,18.522c-0.03,-0.043 -0.745,-1.039 -1.801,-1.039c-0.785,0 -1.295,0.514 -1.746,0.969c-0.399,0.402 -0.744,0.75 -1.226,0.75h-0.001c-0.393,0 -0.714,-0.242 -1.034,-0.538l1.665,-1.325l-4.553,-6.356l-4.394,3.496c-0.259,0.242 -0.627,0.87 -0.164,1.515c0.214,0.298 0.463,0.387 0.635,0.41c0.409,0.053 0.738,-0.217 0.765,-0.24l2.759,-2.195l0.676,0.943l-3.964,3.153c-0.371,-0.351 -0.791,-0.637 -1.305,-0.637H7.753c-0.788,0 -1.457,0.64 -2.048,1.205c-0.352,0.337 -0.752,0.72 -0.973,0.72c-0.428,0 -0.982,-0.647 -1.142,-0.874c-0.109,-0.154 -0.316,-0.186 -0.464,-0.071c-0.147,0.115 -0.178,0.333 -0.069,0.488c0.083,0.119 0.837,1.155 1.674,1.155c0.477,0 0.913,-0.417 1.418,-0.9c0.502,-0.48 1.071,-1.024 1.603,-1.024h0c0.469,0 0.879,0.45 1.313,0.927c0.482,0.529 0.981,1.077 1.659,1.077c0.647,0 1.193,-0.472 1.722,-0.929c0.494,-0.427 1.005,-0.868 1.542,-0.868c0.321,0.001 0.622,0.293 0.97,0.631c0.453,0.439 0.965,0.936 1.71,0.936h0.001c0.748,0 1.245,-0.501 1.684,-0.943c0.413,-0.416 0.769,-0.776 1.287,-0.776c0.719,0 1.264,0.751 1.269,0.759c0.11,0.155 0.317,0.184 0.464,0.07C21.52,18.894 21.551,18.677 21.442,18.522zM12.027,18.661c-0.459,0.396 -0.892,0.771 -1.301,0.771c-0.395,-0.001 -0.777,-0.42 -1.181,-0.862c-0.002,-0.003 -0.005,-0.005 -0.007,-0.008l4.415,-3.512l-1.475,-2.059L9.18,15.614c-0.022,0.019 -0.161,0.12 -0.276,0.096c-0.024,-0.003 -0.097,-0.012 -0.186,-0.136c-0.195,-0.273 0.01,-0.509 0.055,-0.555l3.844,-3.058l3.754,5.241l-1.24,0.986c-0.332,-0.301 -0.69,-0.554 -1.143,-0.554C13.214,17.635 12.584,18.18 12.027,18.661z"
-      android:fillColor="@color/exercise"/>
-  <path
-      android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
-      android:fillColor="@color/inrange"/>
-  <path
-      android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
-      android:fillColor="@color/tempTargetConfirmation"/>
+      android:fillColor="?attr/exerciseColor"/>
+    <path
+        android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
+        android:fillColor="?attr/bgInRange"/>
+    <path
+        android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
+        android:fillColor="?attr/tempTargetConfirmation"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_target_cancel.xml b/app/src/main/res/drawable/ic_target_cancel.xml
index 50d7304662..c00ad238f7 100644
--- a/app/src/main/res/drawable/ic_target_cancel.xml
+++ b/app/src/main/res/drawable/ic_target_cancel.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="24">
   <path
       android:pathData="M16.954,15.325l3.851,-3.85c0.314,-0.314 0.314,-0.821 0.001,-1.134c-0.315,-0.315 -0.82,-0.314 -1.134,-0.001l-3.851,3.851l-3.851,-3.851c-0.315,-0.313 -0.821,-0.314 -1.134,0.001c-0.313,0.313 -0.313,0.82 0.001,1.134l3.851,3.85l-3.851,3.851c-0.314,0.313 -0.314,0.82 -0.001,1.133c0.157,0.156 0.362,0.235 0.567,0.235s0.41,-0.078 0.567,-0.235l3.851,-3.85l3.851,3.85c0.157,0.156 0.362,0.235 0.567,0.235c0.205,0 0.411,-0.078 0.567,-0.235c0.313,-0.313 0.313,-0.82 -0.001,-1.133L16.954,15.325z"
-      android:fillColor="@color/tempTargetConfirmation"/>
-  <path
-      android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
-      android:fillColor="@color/inrange"/>
-  <path
-      android:pathData="M13.949,6.338H2.595c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h11.354c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
-      android:fillColor="@color/tempTargetConfirmation"/>
+      android:fillColor="?attr/tempTargetConfirmation"/>
+    <path
+        android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
+        android:fillColor="?attr/bgInRange"/>
+    <path
+        android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
+        android:fillColor="?attr/tempTargetConfirmation"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_target_eatingsoon.xml b/app/src/main/res/drawable/ic_target_eatingsoon.xml
index ec35d67c48..70d0ab72d4 100644
--- a/app/src/main/res/drawable/ic_target_eatingsoon.xml
+++ b/app/src/main/res/drawable/ic_target_eatingsoon.xml
@@ -12,10 +12,10 @@
   <path
       android:pathData="M8.051,17.801c-0.029,0.001 -0.061,-0.003 -0.095,-0.011c-0.188,-0.047 -0.304,-0.239 -0.257,-0.427c0.43,-1.726 1.665,-3.196 3.304,-3.933c0.043,-0.019 0.088,-0.029 0.135,-0.031c0.143,-0.004 0.273,0.078 0.331,0.208c0.039,0.086 0.042,0.182 0.008,0.271c-0.034,0.088 -0.099,0.158 -0.185,0.196c-1.444,0.649 -2.531,1.942 -2.909,3.458C8.346,17.687 8.209,17.797 8.051,17.801z"
       android:fillColor="?attr/carbsColor"/>
-  <path
-      android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
-      android:fillColor="@color/inrange"/>
-  <path
-      android:pathData="M11.122,8.486H5.436c-0.232,0 -0.42,-0.193 -0.42,-0.431l0,-1.717h-2.42c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.84c0.232,0 0.42,0.193 0.42,0.431l0,1.717h4.845V5.907c0,-0.238 0.188,-0.431 0.421,-0.431h2.827c0.232,0 0.421,0.193 0.421,0.431c0,0.238 -0.188,0.431 -0.421,0.431h-2.407v1.717C11.542,8.293 11.354,8.486 11.122,8.486z"
-      android:fillColor="@color/tempTargetConfirmation"/>
+    <path
+        android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
+        android:fillColor="?attr/bgInRange"/>
+    <path
+        android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
+        android:fillColor="?attr/tempTargetConfirmation"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_target_hypo.xml b/app/src/main/res/drawable/ic_target_hypo.xml
index 30721cbf14..eab6df8e3f 100644
--- a/app/src/main/res/drawable/ic_target_hypo.xml
+++ b/app/src/main/res/drawable/ic_target_hypo.xml
@@ -5,17 +5,17 @@
     android:viewportHeight="24">
   <path
       android:pathData="M8.822,17.137c-0.016,-0.28 0.022,-0.543 0.363,-0.583c0.313,-0.037 0.426,0.189 0.462,0.448c0.135,0.983 0.67,1.563 1.668,1.692c0.292,0.038 0.514,0.167 0.459,0.498c-0.051,0.305 -0.324,0.337 -0.568,0.336C10.03,19.526 8.835,18.321 8.822,17.137z"
-      android:fillColor="@color/low"/>
+      android:fillColor="?attr/lowColor"/>
   <path
       android:pathData="M15.21,16.109c-0.631,-2.484 -3.383,-6.32 -3.773,-6.32s-3.151,3.845 -3.779,6.324c-0.42,1.658 0.111,3.081 1.577,4.049c1.43,0.944 2.973,0.929 4.402,-0.013C15.106,19.18 15.634,17.779 15.21,16.109zM13.255,19.568c-0.603,0.397 -1.221,0.599 -1.835,0.599c-0.607,0 -1.213,-0.197 -1.802,-0.586c-1.206,-0.796 -1.639,-1.906 -1.287,-3.298c0.489,-1.929 2.895,-5.336 3.105,-5.336s2.609,3.403 3.1,5.333C14.889,17.668 14.458,18.774 13.255,19.568z"
-      android:fillColor="@color/low"/>
+      android:fillColor="?attr/lowColor"/>
   <path
       android:pathData="M19.522,16.771v-6.712h-1.423v6.712h-2.135l2.846,3.82l2.846,-3.82H19.522z"
-      android:fillColor="@color/low"/>
+      android:fillColor="?attr/lowColor"/>
   <path
       android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
-      android:fillColor="@color/inrange"/>
+      android:fillColor="?attr/bgInRange"/>
   <path
       android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
-      android:fillColor="@color/tempTargetConfirmation"/>
+      android:fillColor="?attr/tempTargetConfirmation"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_actions_startextbolus.xml b/core/src/main/res/drawable/ic_actions_startextbolus.xml
index 35aa4cfb27..8d7f5bc3db 100644
--- a/core/src/main/res/drawable/ic_actions_startextbolus.xml
+++ b/core/src/main/res/drawable/ic_actions_startextbolus.xml
@@ -4,6 +4,7 @@
     android:viewportHeight="24"
     android:viewportWidth="24"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/extendedBolus" android:pathData="M15.714,7.697l0.353,-0.684c0.18,-0.348 0.043,-0.775 -0.305,-0.955c-0.351,-0.181 -0.775,-0.043 -0.955,0.305l-0.354,0.685c-0.379,-0.148 -0.772,-0.265 -1.18,-0.344V6.106c0.45,-0.061 0.802,-0.431 0.802,-0.897c0,-0.509 -0.412,-0.921 -0.921,-0.921h-2.313c-0.509,0 -0.921,0.413 -0.921,0.921c0,0.467 0.352,0.836 0.802,0.897v0.598c-3.125,0.599 -5.495,3.349 -5.495,6.646c0,3.732 3.037,6.77 6.77,6.77c3.732,0 6.77,-3.037 6.77,-6.77C18.768,10.989 17.551,8.909 15.714,7.697zM11.998,19.119c-3.182,0 -5.77,-2.588 -5.77,-5.77s2.588,-5.77 5.77,-5.77s5.77,2.588 5.77,5.77S15.18,19.119 11.998,19.119z"/>
-    <path android:fillColor="@color/extendedBolus" android:pathData="M12,8.814c-0.086,0 -0.169,0.035 -0.23,0.096s-0.096,0.144 -0.096,0.23v4.198c0,0.08 0.029,0.157 0.083,0.217l2.789,3.14c0.058,0.064 0.139,0.104 0.226,0.108c0.006,0.001 0.013,0.001 0.019,0.001c0.08,0 0.157,-0.029 0.217,-0.083c0.971,-0.866 1.527,-2.095 1.527,-3.372C16.533,10.85 14.5,8.816 12,8.814z"/>
+    <path android:fillColor="?attr/extBolusColor"
+        android:pathData="M15.714,7.697l0.353,-0.684c0.18,-0.348 0.043,-0.775 -0.305,-0.955c-0.351,-0.181 -0.775,-0.043 -0.955,0.305l-0.354,0.685c-0.379,-0.148 -0.772,-0.265 -1.18,-0.344V6.106c0.45,-0.061 0.802,-0.431 0.802,-0.897c0,-0.509 -0.412,-0.921 -0.921,-0.921h-2.313c-0.509,0 -0.921,0.413 -0.921,0.921c0,0.467 0.352,0.836 0.802,0.897v0.598c-3.125,0.599 -5.495,3.349 -5.495,6.646c0,3.732 3.037,6.77 6.77,6.77c3.732,0 6.77,-3.037 6.77,-6.77C18.768,10.989 17.551,8.909 15.714,7.697zM11.998,19.119c-3.182,0 -5.77,-2.588 -5.77,-5.77s2.588,-5.77 5.77,-5.77s5.77,2.588 5.77,5.77S15.18,19.119 11.998,19.119z"/>
+    <path android:fillColor="?attr/extBolusColor" android:pathData="M12,8.814c-0.086,0 -0.169,0.035 -0.23,0.096s-0.096,0.144 -0.096,0.23v4.198c0,0.08 0.029,0.157 0.083,0.217l2.789,3.14c0.058,0.064 0.139,0.104 0.226,0.108c0.006,0.001 0.013,0.001 0.019,0.001c0.08,0 0.157,-0.029 0.217,-0.083c0.971,-0.866 1.527,-2.095 1.527,-3.372C16.533,10.85 14.5,8.816 12,8.814z"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_announcement.xml b/core/src/main/res/drawable/ic_cp_announcement.xml
index 3799ad551c..1488a6e33a 100644
--- a/core/src/main/res/drawable/ic_cp_announcement.xml
+++ b/core/src/main/res/drawable/ic_cp_announcement.xml
@@ -5,17 +5,17 @@
     android:viewportHeight="24">
   <path
       android:pathData="M11.206,16.276c0.251,0.308 0.504,0.635 0.459,1.095c-0.02,0.201 0.178,0.295 0.327,0.395c0.265,0.178 0.542,0.34 0.793,0.536c0.408,0.32 0.385,0.624 -0.047,0.896c-0.017,0.011 -0.037,0.016 -0.054,0.026c-1.333,0.78 -1.335,0.782 -2.448,-0.311c-0.215,-0.211 -0.453,-0.389 -0.696,-0.565c-0.365,-0.264 -0.719,-0.395 -1.143,-0.101c-0.277,0.192 -0.624,0.169 -0.934,0.111c-1.354,-0.252 -2.631,-1.535 -2.535,-3.042c0.019,-0.294 0.105,-0.547 0.297,-0.763c0.331,-0.373 0.657,-0.751 1.001,-1.112c0.736,-0.77 1.133,-1.67 1.129,-2.747C7.352,9.78 7.347,8.864 7.824,8.024C8.29,7.202 8.837,6.939 9.766,7.135c1.042,0.219 1.921,0.766 2.751,1.396c1.204,0.914 2.211,2.014 2.978,3.322c0.396,0.675 0.718,1.372 0.734,2.185c0.011,0.586 -0.253,1.005 -0.706,1.303c-0.505,0.331 -1.057,0.532 -1.687,0.526c-0.775,-0.007 -1.55,0.059 -2.314,0.208C11.404,16.097 11.284,16.119 11.206,16.276zM14.578,14.418c0.569,0.014 0.801,-0.217 0.737,-0.695c-0.053,-0.395 -0.183,-0.77 -0.384,-1.124c-0.907,-1.598 -2.196,-2.833 -3.677,-3.881c-0.47,-0.333 -0.977,-0.61 -1.569,-0.705C9.095,7.917 8.867,8.093 8.882,8.694C8.892,9.151 9.077,9.55 9.303,9.927c0.927,1.55 2.165,2.807 3.667,3.802C13.487,14.072 14.032,14.361 14.578,14.418zM13.257,14.946c-2.056,-1.171 -3.673,-2.769 -4.904,-4.794c-0.061,0.218 -0.053,0.408 -0.063,0.597c-0.032,0.619 -0.081,1.262 -0.399,1.789c-0.344,0.571 -0.24,1.045 0.049,1.556c0.411,0.726 0.998,1.233 1.805,1.473c0.216,0.064 0.444,0.108 0.642,-0.002C11.274,15.069 12.238,14.986 13.257,14.946z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/announcementColor"/>
   <path
       android:pathData="M16.92,11.417c-0.248,0 -0.368,0.005 -0.487,-0.001c-0.156,-0.008 -0.262,-0.092 -0.297,-0.245c-0.037,-0.161 0.051,-0.281 0.186,-0.335c0.294,-0.118 0.596,-0.219 0.898,-0.317c0.245,-0.079 0.496,-0.141 0.743,-0.212c0.48,-0.137 0.537,-0.086 0.689,0.353c0.159,0.461 -0.153,0.519 -0.447,0.573C17.737,11.318 17.264,11.369 16.92,11.417z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/announcementColor"/>
   <path
       android:pathData="M11.785,6.597c0.078,-0.501 0.158,-1.052 0.25,-1.6c0.063,-0.378 0.362,-0.329 0.61,-0.283c0.282,0.052 0.473,0.195 0.346,0.547c-0.182,0.506 -0.335,1.022 -0.505,1.531c-0.072,0.216 -0.175,0.437 -0.45,0.385C11.746,7.123 11.777,6.868 11.785,6.597z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/announcementColor"/>
   <path
       android:pathData="M14.693,8.893c-0.307,-0.002 -0.468,-0.26 -0.292,-0.486c0.388,-0.501 0.798,-0.987 1.226,-1.453c0.207,-0.225 0.452,-0.092 0.631,0.079c0.161,0.154 0.301,0.364 0.087,0.569c-0.472,0.453 -0.968,0.879 -1.508,1.251C14.792,8.884 14.725,8.885 14.693,8.893z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/announcementColor"/>
   <path
       android:pathData="M12.97,11.989c0,0.14 0.021,0.283 -0.004,0.419c-0.061,0.328 -0.321,0.463 -0.563,0.249c-0.644,-0.568 -1.271,-1.159 -1.812,-1.829c-0.18,-0.223 -0.127,-0.384 0.163,-0.488C11.871,9.941 12.986,10.76 12.97,11.989z"
-      android:fillColor="#CF8BFE"/>
+      android:fillColor="?attr/announcementColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_bgcheck.xml b/core/src/main/res/drawable/ic_cp_bgcheck.xml
index 76a9bbe22f..9448450909 100644
--- a/core/src/main/res/drawable/ic_cp_bgcheck.xml
+++ b/core/src/main/res/drawable/ic_cp_bgcheck.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="24">
   <path
       android:pathData="M6.384,15.052c-0.018,-0.323 0.025,-0.625 0.418,-0.671c0.36,-0.042 0.49,0.218 0.531,0.516c0.155,1.131 0.771,1.799 1.92,1.948c0.336,0.043 0.592,0.192 0.528,0.573c-0.059,0.351 -0.373,0.388 -0.654,0.387C7.775,17.801 6.4,16.415 6.384,15.052z"
-      android:fillColor="@color/calibration"/>
+      android:fillColor="?attr/calibrationButtonColor"/>
   <path
       android:pathData="M18.817,9.875c-0.377,-1.485 -1.932,-3.719 -2.256,-3.719c-0.325,0 -1.884,2.238 -2.26,3.721c-0.251,0.991 0.067,1.842 0.943,2.421c0.855,0.565 1.778,0.556 2.632,-0.008C18.755,11.712 19.071,10.874 18.817,9.875zM17.437,11.623c-0.297,0.196 -0.595,0.295 -0.886,0.295c-0.286,0 -0.577,-0.097 -0.866,-0.287c-0.586,-0.387 -0.779,-0.882 -0.608,-1.558c0.236,-0.933 0.997,-2.169 1.484,-2.813c0.486,0.644 1.244,1.878 1.481,2.812C18.213,10.745 18.021,11.237 17.437,11.623z"
-      android:fillColor="@color/calibration"/>
+      android:fillColor="?attr/calibrationButtonColor"/>
   <path
       android:pathData="M13.737,13.869c-0.726,-2.859 -3.893,-7.275 -4.343,-7.275c-0.45,0 -3.627,4.425 -4.349,7.278c-0.483,1.908 0.128,3.546 1.816,4.66c1.646,1.087 3.422,1.07 5.067,-0.015C13.617,17.403 14.225,15.791 13.737,13.869zM11.487,17.85c-0.694,0.457 -1.405,0.689 -2.112,0.689c-0.698,0 -1.396,-0.227 -2.074,-0.675c-1.389,-0.916 -1.887,-2.193 -1.481,-3.796c0.563,-2.22 3.332,-6.141 3.574,-6.141s3.003,3.917 3.568,6.138C13.368,15.663 12.871,16.937 11.487,17.85z"
-      android:fillColor="@color/calibration"/>
+      android:fillColor="?attr/calibrationButtonColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_cgm_insert.xml b/core/src/main/res/drawable/ic_cp_cgm_insert.xml
index 30107ac8fe..20e16e9b7d 100644
--- a/core/src/main/res/drawable/ic_cp_cgm_insert.xml
+++ b/core/src/main/res/drawable/ic_cp_cgm_insert.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M22.44,7.685l-1.772,-1.804L7.299,6.383C5.777,6.404 4.707,7.29 4.373,8.099c-1.247,0.944 -2.605,2.549 -2.668,3.198c-0.035,0.357 0.038,0.638 0.216,0.834c0.104,0.115 0.292,0.251 0.599,0.251h18.345c0.719,0 1.282,-0.721 1.282,-1.642c0,-0.065 -0.011,-0.137 -0.028,-0.213c0.221,-0.181 0.402,-0.429 0.53,-0.737C22.965,9.026 22.875,8.119 22.44,7.685zM5.398,8.111C5.56,7.917 6.176,7.283 7.322,7.267l12.99,-0.488l1.501,1.528c0.139,0.139 0.217,0.666 0.019,1.144c-0.146,0.352 -0.375,0.531 -0.682,0.531h-2.753l-2.385,-0.57H13.83c-0.459,0 -0.699,-0.151 -0.713,-0.449l-0.021,-0.421l-7.942,0C5.177,8.45 5.246,8.294 5.398,8.111zM20.865,11.498l-18.284,0c-0.002,-0.025 -0.002,-0.059 0.002,-0.103c0.061,-0.277 0.881,-1.363 1.879,-2.229C4.61,9.327 4.83,9.423 5.1,9.427h7.216c0.201,0.546 0.748,0.87 1.514,0.87h2.078l2.385,0.57h2.857c0.036,0 0.07,-0.002 0.105,-0.004C21.219,11.258 21.016,11.498 20.865,11.498z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/cgmInsertColor"/>
   <path
       android:pathData="M15.313,15.801c-0.167,-0.195 -0.463,-0.218 -0.659,-0.052l-2.228,1.903v-4.09c0,-0.259 -0.209,-0.468 -0.468,-0.468s-0.468,0.209 -0.468,0.468v4.09l-2.229,-1.904c-0.196,-0.167 -0.492,-0.145 -0.659,0.052c-0.168,0.196 -0.145,0.491 0.052,0.659l3,2.563c0.023,0.02 0.05,0.03 0.076,0.044c0.018,0.01 0.033,0.023 0.052,0.03c0.057,0.023 0.116,0.038 0.176,0.038s0.12,-0.015 0.176,-0.038c0.019,-0.008 0.034,-0.02 0.052,-0.03c0.025,-0.015 0.053,-0.025 0.076,-0.044l3,-2.563C15.458,16.292 15.481,15.997 15.313,15.801z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/cgmInsertColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_exercise.xml b/core/src/main/res/drawable/ic_cp_exercise.xml
index de04c4ecce..60b246221d 100644
--- a/core/src/main/res/drawable/ic_cp_exercise.xml
+++ b/core/src/main/res/drawable/ic_cp_exercise.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M19.75,12.706c1.526,0 2.769,-1.242 2.769,-2.769s-1.242,-2.769 -2.769,-2.769s-2.769,1.242 -2.769,2.769S18.224,12.706 19.75,12.706zM19.75,8.019c1.058,0 1.919,0.86 1.919,1.918s-0.861,1.918 -1.919,1.918s-1.919,-0.86 -1.919,-1.918S18.692,8.019 19.75,8.019z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/exerciseColor"/>
   <path
       android:pathData="M23.841,15.936c-0.039,-0.052 -0.956,-1.265 -2.311,-1.265c-1.007,0 -1.661,0.626 -2.239,1.18c-0.512,0.489 -0.954,0.913 -1.572,0.913h-0.001c-0.504,0 -0.916,-0.294 -1.326,-0.655l2.136,-1.613l-5.841,-7.737l-5.636,4.256c-0.332,0.294 -0.804,1.059 -0.211,1.845c0.274,0.363 0.594,0.472 0.814,0.499c0.524,0.064 0.946,-0.265 0.981,-0.292l3.539,-2.671l0.867,1.148l-5.085,3.838c-0.476,-0.427 -1.015,-0.776 -1.674,-0.776c0,0 -0.001,0 -0.001,0c-1.011,0 -1.87,0.779 -2.627,1.467c-0.452,0.41 -0.965,0.876 -1.248,0.876c-0.549,0 -1.259,-0.787 -1.465,-1.063c-0.14,-0.188 -0.405,-0.227 -0.595,-0.087c-0.188,0.14 -0.228,0.405 -0.088,0.594c0.106,0.145 1.074,1.406 2.147,1.406c0.611,0 1.171,-0.508 1.819,-1.096c0.644,-0.584 1.374,-1.247 2.056,-1.247h0c0.601,0 1.127,0.548 1.684,1.128c0.619,0.645 1.259,1.311 2.128,1.311c0.83,0 1.531,-0.574 2.209,-1.131c0.634,-0.52 1.289,-1.057 1.979,-1.057c0.411,0.001 0.798,0.356 1.244,0.768c0.581,0.534 1.238,1.14 2.193,1.14h0.001c0.96,0 1.598,-0.61 2.16,-1.148c0.529,-0.507 0.986,-0.944 1.651,-0.944c0.923,0 1.621,0.914 1.628,0.924c0.142,0.188 0.407,0.224 0.595,0.085C23.94,16.389 23.98,16.124 23.841,15.936zM11.763,16.105c-0.588,0.482 -1.144,0.938 -1.669,0.938c-0.507,-0.001 -0.997,-0.511 -1.515,-1.05c-0.003,-0.003 -0.006,-0.006 -0.009,-0.009l5.663,-4.275L12.34,9.204l-4.229,3.193c-0.028,0.023 -0.207,0.146 -0.354,0.117c-0.031,-0.004 -0.124,-0.015 -0.238,-0.166c-0.25,-0.332 0.013,-0.619 0.071,-0.675l4.932,-3.722l4.815,6.38l-1.591,1.201c-0.426,-0.366 -0.885,-0.674 -1.466,-0.674C13.286,14.856 12.477,15.52 11.763,16.105z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/exerciseColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_note.xml b/core/src/main/res/drawable/ic_cp_note.xml
index 8308aabedf..9b0459d1bb 100644
--- a/core/src/main/res/drawable/ic_cp_note.xml
+++ b/core/src/main/res/drawable/ic_cp_note.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M13.909,5.715l-7.634,7.634c-0.061,0.061 -0.102,0.139 -0.118,0.224l-0.911,4.941c-0.025,0.138 0.019,0.279 0.118,0.378c0.099,0.099 0.24,0.143 0.378,0.118l4.941,-0.911c0.085,-0.016 0.163,-0.057 0.224,-0.118l7.634,-7.634c0.445,-0.445 0.444,-1.17 -0.003,-1.617l-3.012,-3.012C15.079,5.271 14.354,5.27 13.909,5.715zM9.891,16.927c0.097,0.097 0.132,0.24 0.091,0.371c-0.018,0.058 -0.05,0.109 -0.091,0.15c-0.053,0.053 -0.121,0.089 -0.197,0.102l-2.462,0.435c-0.244,-0.008 -0.486,-0.103 -0.673,-0.29c-0.187,-0.187 -0.282,-0.429 -0.29,-0.673l0.435,-2.463c0.024,-0.135 0.121,-0.246 0.252,-0.287c0.131,-0.041 0.274,-0.006 0.371,0.091L9.891,16.927zM17.903,9.269c0.141,0.141 0.141,0.369 0,0.509l-6.746,6.746c-0.141,0.141 -0.369,0.141 -0.509,0l-0.265,-0.265c-0.141,-0.141 -0.141,-0.369 0,-0.509l6.746,-6.746c0.141,-0.141 0.369,-0.141 0.509,0L17.903,9.269zM16.588,7.933c0.141,0.141 0.141,0.369 0,0.509l-6.746,6.746c-0.141,0.141 -0.369,0.141 -0.509,0l-0.265,-0.265c-0.141,-0.141 -0.141,-0.369 0,-0.509l6.746,-6.746c0.141,-0.141 0.369,-0.141 0.509,0L16.588,7.933zM15.273,6.596c0.141,0.141 0.141,0.369 0,0.509l-6.746,6.746c-0.141,0.141 -0.369,0.141 -0.509,0l-0.265,-0.265c-0.141,-0.141 -0.141,-0.369 0,-0.509l6.746,-6.746c0.141,-0.141 0.369,-0.141 0.509,0L15.273,6.596z"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/noteColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_pump_battery.xml b/core/src/main/res/drawable/ic_cp_pump_battery.xml
index e83067fded..f83d3289c1 100644
--- a/core/src/main/res/drawable/ic_cp_pump_battery.xml
+++ b/core/src/main/res/drawable/ic_cp_pump_battery.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M20.234,10.422c-0.362,0 -0.656,0.294 -0.656,0.656v0.297h-0.469V9.031c0,-0.87 -0.708,-1.578 -1.578,-1.578H4.188c-0.87,0 -1.578,0.708 -1.578,1.578v5.938c0,0.87 0.708,1.578 1.578,1.578h13.344c0.72,0 1.323,-0.488 1.511,-1.149c0.01,0.001 0.018,0.006 0.028,0.006c0.332,0 0.602,-0.297 0.602,-0.664c0,-0.351 -0.25,-0.632 -0.563,-0.655v-1.46h0.469v0.297c0,0.362 0.294,0.656 0.656,0.656s0.656,-0.294 0.656,-0.656v-1.844C20.891,10.716 20.597,10.422 20.234,10.422zM18.109,14.969c0,0.318 -0.26,0.578 -0.578,0.578H4.188c-0.319,0 -0.578,-0.26 -0.578,-0.578V9.031c0,-0.319 0.259,-0.578 0.578,-0.578h13.344c0.318,0 0.578,0.259 0.578,0.578V14.969z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="?attr/pumpBatteryColor"/>
   <path
       android:pathData="M9.703,10.273l-3.937,2.922l3.453,-1.218l1.781,1.765l4.438,-3.484l-4.297,1.687z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="?attr/pumpBatteryColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_pump_canula.xml b/core/src/main/res/drawable/ic_cp_pump_canula.xml
index b43de7ceaa..7e8bce4d17 100644
--- a/core/src/main/res/drawable/ic_cp_pump_canula.xml
+++ b/core/src/main/res/drawable/ic_cp_pump_canula.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M23.706,7.373c-0.149,-0.541 -0.728,-0.854 -1.294,-0.699L19.87,7.373c-0.325,-0.913 -1.301,-1.438 -2.255,-1.175l-3.008,0.826c-0.954,0.262 -1.525,1.212 -1.338,2.163l-2.542,0.698c-0.499,0.137 -0.799,0.593 -0.767,1.07c-1.696,0.439 -3.037,0.067 -4.101,-0.248c-1.047,-0.309 -1.951,-0.578 -2.713,0.152c-1.307,1.253 -0.369,2.87 0.384,4.17c0.501,0.863 1.019,1.757 0.766,2.3c-0.519,1.124 -2.729,1.128 -3.537,1.033c-0.203,-0.022 -0.392,0.122 -0.417,0.328c-0.024,0.206 0.123,0.391 0.329,0.414c0.086,0.01 1.376,0.152 2.554,-0.172c0.734,-0.202 1.424,-0.585 1.753,-1.292c0.416,-0.896 -0.173,-1.912 -0.797,-2.987c-0.844,-1.456 -1.336,-2.47 -0.515,-3.257c0.426,-0.409 0.972,-0.272 1.977,0.026c1.128,0.334 2.648,0.808 4.674,0.215c0.255,0.206 0.598,0.304 0.949,0.207l5.63,-1.547l2.016,7.338l0.127,-1.203l-1.718,-6.252l5.63,-1.547C23.517,8.479 23.855,7.914 23.706,7.373z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/pumpCanulaColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_cp_question.xml b/core/src/main/res/drawable/ic_cp_question.xml
index fc6d14c656..11e4f2cff6 100644
--- a/core/src/main/res/drawable/ic_cp_question.xml
+++ b/core/src/main/res/drawable/ic_cp_question.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M12.042,18.479m-0.979,0a0.979,0.979 0,1 1,1.958 0a0.979,0.979 0,1 1,-1.958 0"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/questionColor"/>
   <path
       android:pathData="M12,16.126c-0.392,0 -0.708,-0.317 -0.708,-0.709c0,-2.548 1.188,-3.437 2.142,-4.151c0.8,-0.599 1.378,-1.032 1.378,-2.432c0,-1.931 -1.854,-2.531 -2.53,-2.531c-1.456,0 -2.631,0.873 -3.225,2.393C8.914,9.06 8.501,9.241 8.138,9.098C7.773,8.955 7.594,8.544 7.736,8.18c0.806,-2.063 2.505,-3.294 4.545,-3.294c1.592,0 3.948,1.255 3.948,3.948c0,2.11 -1.079,2.917 -1.946,3.566c-0.88,0.659 -1.574,1.178 -1.574,3.017C12.709,15.809 12.392,16.126 12,16.126z"
-      android:fillColor="#FEAF05"/>
+      android:fillColor="?attr/questionColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_loop_closed.xml b/core/src/main/res/drawable/ic_loop_closed.xml
index 9bddec63b6..110a3537ee 100644
--- a/core/src/main/res/drawable/ic_loop_closed.xml
+++ b/core/src/main/res/drawable/ic_loop_closed.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
-      android:fillColor="@color/loopClosed"/>
+      android:fillColor="?attr/loopClosed"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_pump_history.xml b/core/src/main/res/drawable/ic_pump_history.xml
index d4ef6ac5f0..fbd047a23a 100644
--- a/core/src/main/res/drawable/ic_pump_history.xml
+++ b/core/src/main/res/drawable/ic_pump_history.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M12.069,3.578c-4.48,0 -8.144,3.518 -8.398,7.936L2.71,10.552c-0.268,-0.267 -0.699,-0.267 -0.966,0c-0.267,0.267 -0.267,0.699 0,0.966l2.103,2.102c0.133,0.133 0.308,0.2 0.483,0.2c0.175,0 0.35,-0.067 0.483,-0.2l2.102,-2.102c0.267,-0.267 0.267,-0.699 0,-0.966c-0.267,-0.267 -0.699,-0.267 -0.966,0L5.04,11.461c0.277,-3.64 3.32,-6.518 7.03,-6.518c3.891,0 7.057,3.166 7.057,7.057c0,3.891 -3.166,7.057 -7.057,7.057c-1.921,0 -3.719,-0.762 -5.062,-2.148c-0.263,-0.27 -0.695,-0.276 -0.966,-0.015c-0.271,0.262 -0.278,0.695 -0.015,0.966c1.603,1.652 3.749,2.562 6.043,2.562c4.644,0 8.423,-3.779 8.423,-8.423S16.714,3.578 12.069,3.578z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/pumpHistoryColor"/>
   <path
       android:pathData="M12.069,12.683h3.814c0.377,0 0.683,-0.306 0.683,-0.683s-0.305,-0.683 -0.683,-0.683h-3.131V6.915c0,-0.377 -0.306,-0.683 -0.683,-0.683s-0.683,0.306 -0.683,0.683V12C11.387,12.377 11.692,12.683 12.069,12.683z"
-      android:fillColor="#67DFE8"/>
+      android:fillColor="?attr/pumpHistoryColor"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_temptarget_high.xml b/core/src/main/res/drawable/ic_temptarget_high.xml
index 9fbfe2eb08..ae0e9799ca 100644
--- a/core/src/main/res/drawable/ic_temptarget_high.xml
+++ b/core/src/main/res/drawable/ic_temptarget_high.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M7.242,17.689c-0.005,0 -0.011,0 -0.017,0c-0.695,-0.013 -1.318,-0.829 -1.709,-2.24c-0.285,-1.029 -0.542,-2.103 -0.792,-3.141c-0.156,-0.65 -0.313,-1.301 -0.476,-1.945L4.14,9.929c-0.369,-1.486 -0.75,-3.024 -1.746,-3.197c-0.116,-0.02 -0.193,-0.13 -0.173,-0.246s0.129,-0.189 0.246,-0.173C3.735,6.534 4.15,8.208 4.552,9.827l0.108,0.432c0.164,0.646 0.321,1.298 0.478,1.951c0.249,1.035 0.506,2.104 0.789,3.127c0.322,1.163 0.834,1.92 1.307,1.929c0.002,0 0.005,0 0.008,0c0.443,0 0.905,-0.656 1.269,-1.804c0.188,-0.592 0.349,-1.229 0.504,-1.847l0.124,-0.487c0.138,-0.536 0.268,-1.08 0.398,-1.624c0.267,-1.114 0.542,-2.265 0.878,-3.332c0.373,-1.182 0.928,-1.836 1.565,-1.842c0.003,0 0.005,0 0.008,0c0.639,0 1.208,0.65 1.603,1.832c0.278,0.833 0.514,1.729 0.74,2.598l0.177,0.671c0.147,0.553 0.288,1.112 0.43,1.672c0.24,0.956 0.489,1.945 0.769,2.879c0.229,0.77 0.619,1.26 1.017,1.28c0.356,0.043 0.729,-0.362 1.011,-1.041c0.271,-0.651 0.521,-1.41 0.761,-2.318c0.333,-1.265 0.648,-2.547 0.964,-3.829c0.146,-0.592 0.291,-1.184 0.438,-1.773c0.281,-1.125 0.812,-1.774 1.62,-1.983c0.111,-0.028 0.229,0.04 0.259,0.153c0.029,0.114 -0.039,0.229 -0.153,0.259c-0.652,0.168 -1.069,0.7 -1.313,1.674c-0.147,0.589 -0.293,1.181 -0.438,1.772c-0.316,1.284 -0.633,2.568 -0.966,3.836c-0.245,0.928 -0.5,1.704 -0.779,2.374c-0.487,1.17 -1.097,1.32 -1.426,1.302c-0.59,-0.03 -1.114,-0.622 -1.402,-1.584c-0.281,-0.941 -0.531,-1.936 -0.773,-2.896c-0.14,-0.558 -0.28,-1.115 -0.427,-1.666l-0.178,-0.673c-0.225,-0.861 -0.458,-1.751 -0.731,-2.57c-0.323,-0.966 -0.772,-1.541 -1.201,-1.541c-0.001,0 -0.002,0 -0.004,0c-0.425,0.003 -0.86,0.581 -1.164,1.544c-0.331,1.052 -0.605,2.196 -0.87,3.303c-0.131,0.546 -0.262,1.092 -0.399,1.63l-0.124,0.486c-0.158,0.623 -0.32,1.268 -0.512,1.871C8.367,17.32 7.706,17.689 7.242,17.689z"
-      android:fillColor="@color/inrange"/>
+      android:fillColor="?attr/bgInRange"/>
   <path
       android:pathData="M21.569,12.709h-4.772c-0.392,0 -0.709,-0.317 -0.709,-0.709V9.177H7.927l0,2.823c0,0.392 -0.317,0.709 -0.708,0.709H2.431c-0.392,0 -0.708,-0.317 -0.708,-0.709s0.317,-0.708 0.708,-0.708H6.51l0,-2.823c0,-0.392 0.317,-0.708 0.708,-0.708h9.578c0.392,0 0.709,0.317 0.709,0.708v2.823h4.063c0.392,0 0.709,0.317 0.709,0.708S21.961,12.709 21.569,12.709z"
-      android:fillColor="@color/tempTargetConfirmation"/>
+      android:fillColor="?attr/tempTargetConfirmation"/>
 </vector>
diff --git a/core/src/main/res/values-night/colors.xml b/core/src/main/res/values-night/colors.xml
index 407645b3d1..ba771afa38 100644
--- a/core/src/main/res/values-night/colors.xml
+++ b/core/src/main/res/values-night/colors.xml
@@ -204,6 +204,16 @@
 
     <color name="splashBackground">#000000</color>
 
+    <color name="extBolusStop">#FEAF05</color>
+    <color name="actionBasal">#CF8BFE</color>
+    <color name="pumpCanula">#67dfe8</color>
+    <color name="cgmInsert">#67dfe8</color>
+    <color name="pumpBattery">#36FF00</color>
+    <color name="note">#FEAF05</color>
+    <color name="announcement">#CF8BFE</color>
+    <color name="question">#FEAF05</color>
+    <color name="pumpHistory">#67DFE8</color>
+
     <!-- Gray colors -->
     <color name="darkgray">#323232</color>
     <color name="darkgrayVariant">#424242</color>
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index 2d60869111..b55dc56cb4 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -29,7 +29,6 @@
         <item name="notificationLow">@color/notificationLow</item>
         <item name="notificationInfo">@color/notificationInfo</item>
         <item name="notificationAnnouncement">@color/notificationAnnouncement</item>
-
         <item name="actionModeCloseDrawable">@drawable/ic_close</item>
         <!---bolus color -->
         <item name="bolusColor">@color/bolus</item>
@@ -47,14 +46,10 @@
         <item name="setTempButton">@color/colorSetTempButton</item>
         <!-- Card Item-->
         <item name="cardItemBackgroundColor">@color/cardColorBackground</item>
-        <!-- Carbs -->
-        <item name="carbsColor">@color/carbs</item>
         <!-- Exercise -->
         <item name="exerciseColor">@color/exercise</item>
         <!-- BG low -->
         <item name="lowColor">@color/low</item>
-        <!-- Temp Target -->
-        <item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
         <!-- Treatments -->
         <item name="setExtendedButtonColor">@color/colorSetExtendedButton</item>
         <item name="activeColor">@color/colorActive</item>
@@ -154,7 +149,6 @@
         <!---Warning Colors : WarnColors.kt-->
         <item name="warnColor">@color/omni_yellow</item>
         <item name="urgentColor">@color/alarm</item>
-
         <!---Automation -->
         <item name="userAction">@color/mdtp_line_dark</item>
         <item name="validActions">@color/ribbonDefault</item>
@@ -176,6 +170,39 @@
         <item name="icQuickWizardColor">@color/colorQuickWizardButton</item>
         <item name="icCalibrationColor">@color/colorCalibrationButton</item>
         <item name="icTreatmentColor">@color/colorTreatmentButton</item>
+        <!-- IOB -->
+        <item name="iobColor">@color/iob</item>
+        <!-- Basal -->
+        <item name="basal">@color/basal</item>
+        <!-- Carbs -->
+        <item name="carbsColor">@color/carbs</item>
+        <!-- Temp Target -->
+        <item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
+        <!---Loop Icon-->
+        <!---Loop Paused Icon Color-->
+        <item name="loopPaused">@color/loopSuspended</item>
+        <!---Loop Closed Icon Color-->
+        <item name="loopClosed">@color/loopClosed</item>
+        <!---Loop Disabled Icon Color-->
+        <item name="loopDisabled">@color/loopDisabled</item>
+        <!---Loop Disconnected Icon Color-->
+        <item name="loopDisconnected">@color/loopDisconnected</item>
+        <!---Loop Opened Icon Color-->
+        <item name="loopOpened">@color/loopOpened</item>
+        <!---Loop Super Bolus Icon Color-->
+        <item name="loopSuperBolus">@color/carbs</item>
+        <!---Action Icons Color-->
+        <item name="extBolusColor">@color/extendedBolus</item>
+        <item name="extBolusStopColor">@color/extBolusStop</item>
+        <item name="basalstartColor">@color/actionBasal</item>
+        <item name="basalCancelColor">@color/actionBasal</item>
+        <item name="pumpCanulaColor">@color/pumpCanula</item>
+        <item name="cgmInsertColor">@color/cgmInsert</item>
+        <item name="pumpBatteryColor">@color/pumpBattery</item>
+        <item name="noteColor">@color/note</item>
+        <item name="announcementColor">@color/announcement</item>
+        <item name="questionColor">@color/question</item>
+        <item name="pumpHistoryColor">@color/pumpHistory</item>
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 9c2f6300a2..c7c2ca658d 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -150,4 +150,33 @@
     <attr name="icQuickWizardColor" format="reference|color" />
     <attr name="icCalibrationColor" format="reference|color" />
     <attr name="icTreatmentColor" format="reference|color" />
+    <!-- IOB -->
+    <attr name="iobColor" format="reference|color" />
+    <!-- Basal -->
+    <attr name="basal" format="reference|color" />
+    <!---Loop Icon-->
+    <!---Loop Paused Icon Color-->
+    <attr name="loopPaused" format="reference|color" />
+    <!---Loop Closed Icon Color-->
+    <attr name="loopClosed" format="reference|color" />
+    <!---Loop Disabled Icon Color-->
+    <attr name="loopDisabled" format="reference|color" />
+    <!---Loop Disconnected Icon Color-->
+    <attr name="loopDisconnected" format="reference|color" />
+    <!---Loop Opened Icon Color-->
+    <attr name="loopOpened" format="reference|color" />
+    <!---Loop Super Bolus Icon Color-->
+    <attr name="loopSuperBolus" format="reference|color" />
+    <!---Extended Bolus Icon Color-->
+    <attr name="extBolusColor" format="reference|color" />
+    <attr name="extBolusStopColor" format="reference|color" />
+    <attr name="basalstartColor" format="reference|color" />
+    <attr name="basalCancelColor" format="reference|color" />
+    <attr name="pumpCanulaColor" format="reference|color" />
+    <attr name="cgmInsertColor" format="reference|color" />
+    <attr name="pumpBatteryColor" format="reference|color" />
+    <attr name="noteColor" format="reference|color" />
+    <attr name="announcementColor" format="reference|color" />
+    <attr name="questionColor" format="reference|color" />
+    <attr name="pumpHistoryColor" format="reference|color" />
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index f112deb931..ca608ef91c 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -32,11 +32,11 @@
     <color name="background_light">#FFFFFF</color>
 
     <!--    Tabs-->
-    <color name="tabText">#d0d0d0</color>
-    <color name="tabSelectedText">@color/white</color>
+    <color name="tabText">@color/black_alpha_90</color>
+    <color name="tabSelectedText">@color/black_alpha_90</color>
 
     <!--    Buttons-->
-    <color name="buttonBackground">#555555</color>
+    <color name="buttonBackground">#888888</color>
     <color name="buttonText">#ffffff</color>
     <color name="okButtonText">@color/colorAccent</color>
     <color name="okButtonSelected">#33969696</color>
@@ -82,7 +82,7 @@
     <color name="low">#FF0000</color>
     <color name="high">#FFFB8C00</color>
     <color name="iob">#1e88e5</color>
-    <color name="extendedBolus">#67DFE8</color>
+    <color name="extendedBolus">#1e88e5</color>
     <color name="iobPredAS">#1ea3e5</color>
     <color name="cob">#FFFB8C00</color>
     <color name="carbs">#FFFB8C00</color>
@@ -151,7 +151,7 @@
     <color name="ribbonCritical">#ff0400</color>
     <color name="ribbonTextDefault">#FFFFFF</color>
     <color name="ribbonTextWarning">#303030</color>
-    <color name="tempTargetConfirmation">#77dd77</color>
+    <color name="tempTargetConfirmation">#6BD16B</color>
 
     <color name="prediction">#ff00ff</color>
     <color name="iobPred">#00d2d2</color>
@@ -175,7 +175,7 @@
     <color name="dummy_background">#7DFF0000</color>
 
     <color name="tempTargetBackground">#77dd77</color>
-    <color name="exercise">#67DFE8</color>
+    <color name="exercise">#42A5F5</color>
 
     <color name="action">#ffffbb33</color>
     <color name="alarm">#ffff4444</color>
@@ -205,6 +205,16 @@
 
     <color name="splashBackground">#FFFFFF</color>
 
+    <color name="extBolusStop">#FEAF05</color>
+    <color name="actionBasal">#CF8BFE</color>
+    <color name="pumpCanula">#42A5F5</color>
+    <color name="cgmInsert">#42A5F5</color>
+    <color name="pumpBattery">#66BB6A</color>
+    <color name="note">#FEAF05</color>
+    <color name="announcement">#CF8BFE</color>
+    <color name="question">#FEAF05</color>
+    <color name="pumpHistory">#42A5F5</color>
+
     <!-- Gray colors -->
     <color name="darkgray">#323232</color>
     <color name="darkgrayVariant">#424242</color>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index fd14dc94f5..d1f9e81951 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -3,7 +3,7 @@
 
     <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!---Example light theme colors -->
-        <item name="colorPrimary">@color/lightSandGray</item>
+        <item name="colorPrimary">@color/plastic</item>
         <item name="colorOnPrimary">@color/aaps_theme_light_onPrimary</item>
         <item name="colorSecondary">@color/aaps_theme_light_secondary</item>
         <item name="colorOnSecondary">@color/aaps_theme_light_onSecondary</item>
@@ -13,7 +13,6 @@
         <item name="colorOnBackground">@color/aaps_theme_light_onBackground</item>
         <item name="colorSurface">@color/aaps_theme_light_surface</item>
         <item name="colorOnSurface">@color/aaps_theme_light_onSurface</item>
-
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/aaps_theme_light_secondary</item>
         <item name="dialogTitleBackground">@color/dialog_title_background</item>
@@ -25,6 +24,9 @@
         <item name="scrimBackground">@color/white</item>
         <item name="popupMenuStyle">@style/Widget.MaterialComponents.PopupMenu</item>
         <item name="actionOverflowMenuStyle">@style/Widget.MaterialComponents.PopupMenu.Overflow</item>
+        <!---Text Colors -->
+        <item name="android:textColorPrimary">@color/black</item>
+        <item name="android:textColor">@color/black</item>
         <!---Notification -->
         <item name="notificationUrgent">@color/notificationUrgent</item>
         <item name="notificationNormal">@color/notificationNormal</item>
@@ -50,14 +52,10 @@
         <item name="setTempButton">@color/colorSetTempButton</item>
         <!-- Card Item-->
         <item name="cardItemBackgroundColor">@color/cardColorBackground</item>
-        <!-- Carbs -->
-        <item name="carbsColor">@color/carbs</item>
         <!-- Exercise -->
         <item name="exerciseColor">@color/exercise</item>
         <!-- BG low -->
         <item name="lowColor">@color/low</item>
-        <!-- Temp Target -->
-        <item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
         <!-- Treatments -->
         <item name="setExtendedButtonColor">@color/colorSetExtendedButton</item>
         <item name="activeColor">@color/colorActive</item>
@@ -129,7 +127,7 @@
         <!---BG color-->
         <item name="bgLow">@color/low</item>
         <item name="highColor">@color/high</item>
-        <item name="bgInRange">@color/inrange</item>
+        <item name="bgInRange">@color/tempTargetConfirmation</item>
         <!---Profile Helper -->
         <item name="helperProfileColor">@color/helperProfile</item>
         <item name="examinedProfileColor">@color/examinedProfile</item>
@@ -179,7 +177,39 @@
         <item name="icQuickWizardColor">@color/colorQuickWizardButton</item>
         <item name="icCalibrationColor">@color/colorCalibrationButton</item>
         <item name="icTreatmentColor">@color/bolus</item>
-
+        <!-- IOB -->
+        <item name="iobColor">@color/iob</item>
+        <!-- Basal -->
+        <item name="basal">@color/basal</item>
+        <!-- Carbs -->
+        <item name="carbsColor">@color/carbs</item>
+        <!-- Temp Target -->
+        <item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
+        <!---Loop Icon-->
+        <!---Loop Paused Icon Color-->
+        <item name="loopPaused">@color/loopSuspended</item>
+        <!---Loop Closed Icon Color-->
+        <item name="loopClosed">@color/loopClosed</item>
+        <!---Loop Disabled Icon Color-->
+        <item name="loopDisabled">@color/loopDisabled</item>
+        <!---Loop Disconnected Icon Color-->
+        <item name="loopDisconnected">@color/loopDisconnected</item>
+        <!---Loop Opened Icon Color-->
+        <item name="loopOpened">@color/loopOpened</item>
+        <!---Loop Super Bolus Icon Color-->
+        <item name="loopSuperBolus">@color/carbs</item>
+        <!---Action Icons Color-->
+        <item name="extBolusColor">@color/extendedBolus</item>
+        <item name="extBolusStopColor">@color/extBolusStop</item>
+        <item name="basalstartColor">@color/actionBasal</item>
+        <item name="basalCancelColor">@color/actionBasal</item>
+        <item name="pumpCanulaColor">@color/pumpCanula</item>
+        <item name="cgmInsertColor">@color/cgmInsert</item>
+        <item name="pumpBatteryColor">@color/pumpBattery</item>
+        <item name="noteColor">@color/note</item>
+        <item name="announcementColor">@color/announcement</item>
+        <item name="questionColor">@color/question</item>
+        <item name="pumpHistoryColor">@color/pumpHistory</item>
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>