From 2fb59a61606b1aaaef6b9fd03240acbd7953a6fc Mon Sep 17 00:00:00 2001
From: jbr7rr <>
Date: Fri, 8 Mar 2024 20:48:08 +0100
Subject: [PATCH 1/4] Medtrum: Text colors to follow theme
---
.../main/res/layout/fragment_medtrum_overview.xml | 13 -------------
.../res/layout/fragment_medtrum_prepare_patch.xml | 2 +-
.../fragment_medtrum_prepare_patch_connect.xml | 2 +-
.../src/main/res/layout/fragment_medtrum_prime.xml | 2 +-
.../res/layout/fragment_medtrum_prime_complete.xml | 2 +-
.../main/res/layout/fragment_medtrum_priming.xml | 2 +-
6 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_overview.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_overview.xml
index b0d09ebda66..05259703b32 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_overview.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_overview.xml
@@ -117,7 +117,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.lastConnectionMinAgo}"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -166,7 +165,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.medtrumPump.pumpStateFlow.toString()}"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -206,7 +204,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.medtrumPump.lastBasalTypeFlow.toString()}"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -246,7 +243,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text='@{@string/current_basal_rate(viewmodel.medtrumPump.lastBasalRateFlow)}'
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -286,7 +282,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text='@{viewmodel.lastBolus}'
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -326,7 +321,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text='@{viewmodel.activeBolusStatus}'
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -375,7 +369,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.activeAlarms}"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -424,7 +417,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text='@{@string/reservoir_level(viewmodel.medtrumPump.reservoirFlow)}'
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -464,7 +456,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text='@{@string/battery_voltage(viewmodel.medtrumPump.batteryVoltage_BFlow)}'
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -513,7 +504,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.pumpType}"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -553,7 +543,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.fwVersion}"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -594,7 +583,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.patchNo}"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -634,7 +622,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.patchExpiry}"
- android:textColor="@android:color/white"
android:textSize="14sp" />
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_prepare_patch.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_prepare_patch.xml
index b9b654575fd..71be0ad6b18 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_prepare_patch.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_prepare_patch.xml
@@ -62,7 +62,7 @@
android:layout_marginBottom="40dp"
android:gravity="center"
android:text="@string/patch_not_active_note"
- android:textColor="@color/red"
+ android:textColor="@color/warning"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/layout_button"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_prepare_patch_connect.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_prepare_patch_connect.xml
index 06843e91c4e..33b962a39a9 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_prepare_patch_connect.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_prepare_patch_connect.xml
@@ -62,7 +62,7 @@
android:layout_marginBottom="40dp"
android:gravity="center"
android:text="@string/do_not_attach_to_body"
- android:textColor="@color/red"
+ android:textColor="@color/warning"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/layout_button"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_prime.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_prime.xml
index e5ba59c7c24..a1d1500d63b 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_prime.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_prime.xml
@@ -49,7 +49,7 @@
android:layout_marginBottom="40dp"
android:gravity="center"
android:text="@string/do_not_attach_to_body"
- android:textColor="@color/red"
+ android:textColor="@color/warning"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/layout_button"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_prime_complete.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_prime_complete.xml
index 071e755529f..7294a2bc126 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_prime_complete.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_prime_complete.xml
@@ -49,7 +49,7 @@
android:layout_marginBottom="40dp"
android:gravity="center"
android:text="@string/do_not_attach_to_body"
- android:textColor="@color/red"
+ android:textColor="@color/warning"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/layout_button"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_priming.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_priming.xml
index cebfa521df3..31d3db5d6e3 100644
--- a/pump/medtrum/src/main/res/layout/fragment_medtrum_priming.xml
+++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_priming.xml
@@ -60,7 +60,7 @@
android:layout_marginBottom="40dp"
android:gravity="center"
android:text="@string/do_not_attach_to_body"
- android:textColor="@color/red"
+ android:textColor="@color/warning"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/layout_button"
app:layout_constraintEnd_toEndOf="parent"
From 424128d65c902d1da75a1d9ea4ae21bbf1d3885b Mon Sep 17 00:00:00 2001
From: jbr7rr <>
Date: Fri, 8 Mar 2024 21:28:21 +0100
Subject: [PATCH 2/4] Combo: Text colors to follow theme
---
.../pump/combov2/ComboV2Fragment.kt | 27 +++++++++----------
.../src/main/res/layout/combov2_fragment.xml | 10 -------
2 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt
index 7e426957733..595e0625418 100644
--- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt
+++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt
@@ -1,6 +1,5 @@
package info.nightscout.pump.combov2
-import android.graphics.Color
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@@ -116,9 +115,9 @@ class ComboV2Fragment : DaggerFragment() {
binding.combov2DriverState.setTextColor(
when (connectionState) {
- ComboV2Plugin.DriverState.Error -> Color.RED
- ComboV2Plugin.DriverState.Suspended -> Color.YELLOW
- else -> Color.WHITE
+ ComboV2Plugin.DriverState.Error -> rh.gac(app.aaps.core.ui.R.attr.warningColor)
+ ComboV2Plugin.DriverState.Suspended -> rh.gac(app.aaps.core.ui.R.attr.urgentColor)
+ else -> rh.gac(app.aaps.core.ui.R.attr.defaultTextColor)
}
)
}
@@ -150,17 +149,17 @@ class ComboV2Fragment : DaggerFragment() {
BatteryState.NO_BATTERY -> {
binding.combov2Battery.text = rh.gs(R.string.combov2_battery_empty_indicator)
- binding.combov2Battery.setTextColor(Color.RED)
+ binding.combov2Battery.setTextColor(rh.gac(app.aaps.core.ui.R.attr.warningColor))
}
BatteryState.LOW_BATTERY -> {
binding.combov2Battery.text = rh.gs(R.string.combov2_battery_low_indicator)
- binding.combov2Battery.setTextColor(Color.YELLOW)
+ binding.combov2Battery.setTextColor(rh.gac(app.aaps.core.ui.R.attr.urgentColor))
}
BatteryState.FULL_BATTERY -> {
binding.combov2Battery.text = rh.gs(R.string.combov2_battery_full_indicator)
- binding.combov2Battery.setTextColor(Color.WHITE)
+ binding.combov2Battery.setTextColor(rh.gac(app.aaps.core.ui.R.attr.defaultTextColor))
}
}
}
@@ -175,10 +174,10 @@ class ComboV2Fragment : DaggerFragment() {
binding.combov2Reservoir.setTextColor(
when (reservoirLevel?.state) {
- null -> Color.WHITE
- ReservoirState.EMPTY -> Color.RED
- ReservoirState.LOW -> Color.YELLOW
- ReservoirState.FULL -> Color.WHITE
+ null -> rh.gac(app.aaps.core.ui.R.attr.defaultTextColor)
+ ReservoirState.EMPTY -> rh.gac(app.aaps.core.ui.R.attr.warningColor)
+ ReservoirState.LOW -> rh.gac(app.aaps.core.ui.R.attr.urgentColor)
+ ReservoirState.FULL -> rh.gac(app.aaps.core.ui.R.attr.defaultTextColor)
}
)
}
@@ -249,17 +248,17 @@ class ComboV2Fragment : DaggerFragment() {
in 0..60 -> {
binding.combov2LastConnection.text = rh.gs(R.string.combov2_less_than_one_minute_ago)
- binding.combov2LastConnection.setTextColor(Color.WHITE)
+ binding.combov2LastConnection.setTextColor(rh.gac(app.aaps.core.ui.R.attr.defaultTextColor))
}
in 60..(30 * 60) -> {
binding.combov2LastConnection.text = rh.gs(app.aaps.core.interfaces.R.string.minago, secondsPassed / 60)
- binding.combov2LastConnection.setTextColor(Color.WHITE)
+ binding.combov2LastConnection.setTextColor(rh.gac(app.aaps.core.ui.R.attr.defaultTextColor))
}
else -> {
binding.combov2LastConnection.text = rh.gs(R.string.combov2_no_connection_for_n_mins, secondsPassed / 60)
- binding.combov2LastConnection.setTextColor(Color.RED)
+ binding.combov2LastConnection.setTextColor(rh.gac(app.aaps.core.ui.R.attr.warningColor))
}
}
}
diff --git a/pump/combov2/src/main/res/layout/combov2_fragment.xml b/pump/combov2/src/main/res/layout/combov2_fragment.xml
index 16aede9c875..71efc833f2a 100644
--- a/pump/combov2/src/main/res/layout/combov2_fragment.xml
+++ b/pump/combov2/src/main/res/layout/combov2_fragment.xml
@@ -76,7 +76,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -109,7 +108,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -144,7 +142,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -187,7 +184,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
- android:textColor="@android:color/white"
android:text=""
android:textSize="14sp" />
@@ -222,7 +218,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -256,7 +251,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -290,7 +284,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -324,7 +317,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -358,7 +350,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -392,7 +383,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
- android:textColor="@android:color/white"
android:textSize="14sp" />
From d69293d519c58ddadcd112fa57f4ded03c1447b8 Mon Sep 17 00:00:00 2001
From: jbr7rr <>
Date: Fri, 8 Mar 2024 21:28:37 +0100
Subject: [PATCH 3/4] EOPatch: Text colors to follow theme
---
.../src/main/res/layout/fragment_eopatch_overview.xml | 10 ----------
pump/eopatch/src/main/res/values/colors.xml | 5 -----
2 files changed, 15 deletions(-)
delete mode 100644 pump/eopatch/src/main/res/values/colors.xml
diff --git a/pump/eopatch/src/main/res/layout/fragment_eopatch_overview.xml b/pump/eopatch/src/main/res/layout/fragment_eopatch_overview.xml
index b1b9c02757f..8ca7151e4e5 100644
--- a/pump/eopatch/src/main/res/layout/fragment_eopatch_overview.xml
+++ b/pump/eopatch/src/main/res/layout/fragment_eopatch_overview.xml
@@ -85,7 +85,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.bleStatus}"
- android:textColor="@android:color/white"
android:textSize="16sp" />
@@ -134,7 +133,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.patchConfig.patchSerialNumber}"
- android:textColor="@android:color/white"
android:textSize="16sp" />
@@ -173,7 +171,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.patchConfig.patchLotNumber}"
- android:textColor="@android:color/white"
android:textSize="16sp" />
@@ -212,7 +209,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{CommonUtils.dateString(viewmodel.patchConfig.patchWakeupTimestamp)}"
- android:textColor="@android:color/white"
android:textSize="16sp" />
@@ -252,7 +248,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{CommonUtils.dateString(viewmodel.patchConfig.expireTimestamp)}"
- android:textColor="@android:color/white"
android:textSize="16sp" />
@@ -292,7 +287,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.status}"
- android:textColor="@android:color/white"
android:textSize="16sp" />
@@ -340,7 +334,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.normalBasal}"
- android:textColor="@android:color/white"
android:textSize="16sp" />
@@ -388,7 +381,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.tempBasal}"
- android:textColor="@android:color/white"
android:textSize="16sp" />
@@ -436,7 +428,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.patchRemainingInsulin}"
- android:textColor="@android:color/white"
android:textSize="16sp" />
@@ -484,7 +475,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.patchConfig.insulinInjectionAmountStr}"
- android:textColor="@android:color/white"
android:textSize="16sp" />
diff --git a/pump/eopatch/src/main/res/values/colors.xml b/pump/eopatch/src/main/res/values/colors.xml
deleted file mode 100644
index c8524cd961d..00000000000
--- a/pump/eopatch/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- #FF000000
- #FFFFFFFF
-
\ No newline at end of file
From 2b993aa68038237f46cedb07070128a735a16d9a Mon Sep 17 00:00:00 2001
From: jbr7rr <>
Date: Fri, 8 Mar 2024 21:28:50 +0100
Subject: [PATCH 4/4] Equil: Text colors to follow theme
---
.../src/main/java/app/aaps/pump/equil/EquilFragment.kt | 5 ++---
pump/equil/src/main/res/layout/equil_fra.xml | 10 ----------
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/pump/equil/src/main/java/app/aaps/pump/equil/EquilFragment.kt b/pump/equil/src/main/java/app/aaps/pump/equil/EquilFragment.kt
index 18c88af07a5..3abc6523c26 100644
--- a/pump/equil/src/main/java/app/aaps/pump/equil/EquilFragment.kt
+++ b/pump/equil/src/main/java/app/aaps/pump/equil/EquilFragment.kt
@@ -2,7 +2,6 @@ package app.aaps.pump.equil
import android.annotation.SuppressLint
import android.content.Intent
-import android.graphics.Color
import android.os.Bundle
import android.os.Handler
import android.os.HandlerThread
@@ -143,7 +142,7 @@ class EquilFragment : DaggerFragment() {
binding.timeDevice.text = dateUtil.dateAndTimeAndSecondsString(equilManager.lastDataTime)
val runMode = equilManager.runMode
- binding.mode.setTextColor(Color.WHITE)
+ binding.mode.setTextColor(rh.gac(app.aaps.core.ui.R.attr.defaultTextColor))
if (equilManager.isActivationCompleted) {
when (runMode) {
RunMode.RUN -> {
@@ -174,7 +173,7 @@ class EquilFragment : DaggerFragment() {
binding.btnResumeDelivery.visibility = View.GONE
binding.btnSuspendDelivery.visibility = View.GONE
binding.mode.text = rh.gs(R.string.equil_init_insulin_error)
- binding.mode.setTextColor(Color.RED)
+ binding.mode.setTextColor(rh.gac(app.aaps.core.ui.R.attr.warningColor))
}
binding.serialNumber.text = devName
diff --git a/pump/equil/src/main/res/layout/equil_fra.xml b/pump/equil/src/main/res/layout/equil_fra.xml
index e71b62abcf6..f89486dbde4 100644
--- a/pump/equil/src/main/res/layout/equil_fra.xml
+++ b/pump/equil/src/main/res/layout/equil_fra.xml
@@ -42,7 +42,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -102,7 +100,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -216,7 +211,6 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -239,7 +233,6 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -263,7 +256,6 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -286,7 +278,6 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center"
- android:textColor="@android:color/white"
android:textSize="14sp" />
@@ -309,7 +300,6 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center"
- android:textColor="@android:color/white"
android:textSize="14sp" />