From 57504a0a8035b58c74fc89147942c6bba4a1c6d1 Mon Sep 17 00:00:00 2001
From: MCelliotG <mcelliotg@gmail.com>
Date: Fri, 4 Aug 2023 05:03:44 +0300
Subject: [PATCH] More UI changes and themes optimization

---
 src/gui.cpp | 12 ++++++------
 src/gui.h   |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/gui.cpp b/src/gui.cpp
index e96eaa1..9b67825 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -407,13 +407,13 @@ void BuildDisplay() {
       tft.drawCircle(86, 15, 9, SecondaryColor);
     }
 
-    if (bandforbidden) bandColor = GreyoutColor; else bandColor = SecondaryColor;
+    if (bandforbidden) bandColor = GreyoutColor; else bandColor = PrimaryColor;
     switch (band) {
-      case BAND_LW: tftPrint(-1, myLanguage[language][102], 70, 32, bandColor, SecondaryColorSmooth, FONT16); break;
-      case BAND_MW: tftPrint(-1, myLanguage[language][103], 70, 32, bandColor, SecondaryColorSmooth, FONT16); break;
-      case BAND_SW: tftPrint(-1, myLanguage[language][104], 70, 32, bandColor, SecondaryColorSmooth, FONT16); break;
-      case BAND_FM: tftPrint(-1, myLanguage[language][105], 70, 32, bandColor, SecondaryColorSmooth, FONT16); break;
-      case BAND_OIRT: tftPrint(-1, myLanguage[language][106], 70, 32, bandColor, SecondaryColorSmooth, FONT16); break;
+      case BAND_LW: tftPrint(-1, myLanguage[language][102], 70, 32, bandColor, PrimaryColorSmooth, FONT16); break;
+      case BAND_MW: tftPrint(-1, myLanguage[language][103], 70, 32, bandColor, PrimaryColorSmooth, FONT16); break;
+      case BAND_SW: tftPrint(-1, myLanguage[language][104], 70, 32, bandColor, PrimaryColorSmooth, FONT16); break;
+      case BAND_FM: tftPrint(-1, myLanguage[language][105], 70, 32, bandColor, PrimaryColorSmooth, FONT16); break;
+      case BAND_OIRT: tftPrint(-1, myLanguage[language][106], 70, 32, bandColor, PrimaryColorSmooth, FONT16); break;
     }
   }
   RDSstatusold = false;
diff --git a/src/gui.h b/src/gui.h
index 77f1243..29816c1 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -92,6 +92,8 @@ extern int BackgroundColor;
 extern int BackgroundColorSmooth;
 extern int BarInsignificantColor;
 extern int BarSignificantColor;
+extern int BatteryValueColor;
+extern int BatteryValueColorSmooth;
 extern int FrameColor;
 extern int GreyoutColor;
 extern int menuoption;