Equil: Text colors to follow theme

nightscout · Mar 8, 2024 · 2b993aa · 2b993aa
1 parent d69293d
commit 2b993aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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" />
 
                     <ProgressBar
@@ -75,7 +74,6 @@
                     android:layout_height="match_parent"
                     android:layout_weight="3"
                     android:gravity="center"
-                    android:textColor="@android:color/white"
                     android:textSize="14sp" />
             </TableRow>
 
@@ -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" />
 
                     <FrameLayout
@@ -146,7 +143,6 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:gravity="center"
-                        android:textColor="@android:color/white"
                         android:textSize="14sp" />
 
                     <FrameLayout
@@ -193,7 +189,6 @@
                     android:layout_height="match_parent"
                     android:layout_weight="3"
                     android:gravity="center"
-                    android:textColor="@android:color/white"
                     android:textSize="14sp" />
             </TableRow>
 
@@ -216,7 +211,6 @@
                     android:layout_height="match_parent"
                     android:layout_weight="3"
                     android:gravity="center"
-                    android:textColor="@android:color/white"
                     android:textSize="14sp" />
             </TableRow>
 
@@ -239,7 +233,6 @@
                     android:layout_height="match_parent"
                     android:layout_weight="3"
                     android:gravity="center"
-                    android:textColor="@android:color/white"
                     android:textSize="14sp" />
             </TableRow>
 
@@ -263,7 +256,6 @@
                     android:layout_height="match_parent"
                     android:layout_weight="3"
                     android:gravity="center"
-                    android:textColor="@android:color/white"
                     android:textSize="14sp" />
             </TableRow>
 
@@ -286,7 +278,6 @@
                     android:layout_height="match_parent"
                     android:layout_weight="3"
                     android:gravity="center"
-                    android:textColor="@android:color/white"
                     android:textSize="14sp" />
             </TableRow>
 
@@ -309,7 +300,6 @@
                     android:layout_height="match_parent"
                     android:layout_weight="3"
                     android:gravity="center"
-                    android:textColor="@android:color/white"
                     android:textSize="14sp" />
             </TableRow>