From 5df425a79197eacb8dbb102e61e0dd58928b64ce Mon Sep 17 00:00:00 2001
From: MCelliotG <mcelliotg@gmail.com>
Date: Sun, 1 Sep 2024 02:57:00 +0300
Subject: [PATCH] Some theme tweaks, added new theme

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

diff --git a/src/constants.h b/src/constants.h
index f989f4a..1697628 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -121,20 +121,22 @@
 
 //MAIN COLORS                      /* RGB 565 CODES */
 #define Black               0x0000    /*  0,  0,  0 */
+#define BlackOlive          0x39E7    /*  7, 15,  7 */
 #define Blue                0x001F    /*  0,  0, 31 */
 #define Cabbage             0x06D0    /*  0, 54, 16 */
 #define Coral               0xFBEF    /* 31, 31, 15 */
 #define Crimson             0xF8C3    /* 31,  6,  3 */
 #define Cyan                0x0F3F    /*  1, 57, 31 */
 #define Cherry              0xF00A    /* 30,  0, 10 */
-#define Grey                0x7BEF    /* 15, 31, 15 */
 #define Darkgrey            0x1082    /*  2,  4,  2 */
 #define Deepsky             0x051F    /*  0, 40, 31 */
 #define Green               0x07E0    /*  0, 63,  0 */
+#define Grey                0x7BEF    /* 15, 31, 15 */
 #define Indigo              0x881F    /* 17,  0, 31 */
 #define Maroon              0x5140    /* 10, 10,  0 */
 #define Ocean               0x01FF    /*  0, 15, 31 */
 #define Orange              0xFC00    /* 31, 32,  0 */
+#define Pink                0xFDBF    /* 31, 45, 31 */
 #define Purple              0xAA1C    /* 21, 16, 28 */
 #define Red                 0xF800    /* 31,  0,  0 */
 #define Sakura              0xF3D5    /* 30, 30, 21 */
@@ -159,6 +161,7 @@
 #define OceanSmooth         0x0006    /*  0,  0,  6 */
 #define MaroonSmooth        0x2001    /*  4,  0,  1 */
 #define OrangeSmooth        0x3165    /*  6, 11,  5 */
+#define PinkSmooth          0x620C    /* 12, 16, 12 */
 #define PurpleSmooth        0x2887    /*  5,  4,  7 */
 #define RedSmooth           0x2000    /*  4,  0,  0 */
 #define SakuraSmooth        0x3008    /*  6,  0,  8 */
@@ -186,6 +189,7 @@
 #define CyanGrey            0x2A08    /*  5, 16,  8 */
 #define Dallas              0x6A86    /* 13, 20,  6 */
 #define DallasSmooth        0x3123    /*  6,  9,  3 */
+#define EerieBlack          0x1825    /*  3,  1,  5 */
 #define Electric            0x6016    /* 12,  0, 22 */
 #define GreenDark           0x0200    /*  0, 16,  0 */
 #define GreenGrey           0x2965    /*  5, 11,  5 */
@@ -331,7 +335,7 @@
 
 static const char* const unitString[] = {"dBμV", "dBf", "dBm"};
 static const char* const FreqFont[] = {"Classic", "Roubenstil", "Motoya", "Aura2", "Comic", "Modern"};
-static const char* const Theme[] = {"Essence", "Cyan", "Crimson", "Monochrome", "Volcano", "Dendro", "Sakura", "Whiteout", "Tangerine", "Ocean", "Indigo", "Maroon", "GoldBrite"};
+static const char* const Theme[] = {"Essence", "Cyan", "Crimson", "Monochrome", "Volcano", "Dendro", "Sakura", "Whiteout", "Tangerine", "Ocean", "Indigo", "Maroon", "GoldBrite", "Bubblegum"};
 static const char* const Skin[] = {"Essential"};
 
 // Memory channel database
diff --git a/src/gui.cpp b/src/gui.cpp
index 6ebd3f9..083a5f4 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -20,7 +20,7 @@ void doTheme() {  // Use this to put your own colors in: http://www.barth-dev.de
       SecondaryColor = Skyblue;
       SecondaryColorSmooth = SkyblueSmooth;
       FrameColor = Blue;
-      GreyoutColor = Darkgrey;
+      GreyoutColor = BlackOlive;
       BackgroundColor = Black;
       ActiveColor = White;
       ActiveColorSmooth = WhiteSmooth;
@@ -395,7 +395,7 @@ void doTheme() {  // Use this to put your own colors in: http://www.barth-dev.de
       SecondaryColor = Skyblue;
       SecondaryColorSmooth = SkyblueSmooth;
       FrameColor = Blue;
-      GreyoutColor = Darkgrey;
+      GreyoutColor = BlackOlive;
       BackgroundColor = Black;
       ActiveColor = White;
       ActiveColorSmooth = WhiteSmooth;
@@ -420,6 +420,38 @@ void doTheme() {  // Use this to put your own colors in: http://www.barth-dev.de
       BatteryValueColor = Teal;
       BatteryValueColorSmooth = Black;
       break;
+
+    case 13:  // Bubblegum
+      PrimaryColor = Cyan;
+      PrimaryColorSmooth = CyanSmooth;
+      SecondaryColor = Cherry;
+      SecondaryColorSmooth = CherrySmooth;
+      FrameColor = Electric;
+      GreyoutColor = Meteorite;
+      BackgroundColor = EerieBlack;
+      ActiveColor = White;
+      ActiveColorSmooth = WhiteSmooth;
+      FreqColor = Pink;
+      FreqColorSmooth = PinkSmooth;
+      SignificantColor = Purple;
+      SignificantColorSmooth = PurpleSmooth;
+      InsignificantColor = Cherry;
+      InsignificantColorSmooth = CherrySmooth;
+      StereoColor = Cherry;
+      StereoColorSmooth = CherrySmooth;
+      RDSColor = Teal;
+      RDSColorSmooth = TealSmooth;
+      RDSDropoutColor = Logan;
+      RDSDropoutColorSmooth = LoganSmooth;
+      BarSignificantColor = Coral;
+      BarInsignificantColor = Teal;
+      ModBarSignificantColor = Sakura;
+      ModBarInsignificantColor = Skyblue;
+      BWAutoColor = Violet;
+      BWAutoColorSmooth = VioletSmooth;
+      BatteryValueColor = Turquoise;
+      BatteryValueColorSmooth = CyanDarkSmooth;
+      break;
   }
 }
 
@@ -1712,9 +1744,9 @@ void BuildDisplay() {
   tft.drawLine(53, 30, 53, 0, FrameColor);
   tft.drawLine(89, 30, 89, 0, FrameColor);
   tft.drawLine(158, 30, 158, 0, FrameColor);
-  tft.drawLine(20, 114, 204, 114, TFT_DARKGREY);
+  tft.drawLine(20, 114, 204, 114, Darkgrey);
 
-  if (!showmodulation) tft.drawLine(20, 143, 204, 143, GreyoutColor); else tft.drawLine(20, 143, 204, 143, TFT_DARKGREY);
+  if (!showmodulation) tft.drawLine(20, 143, 204, 143, GreyoutColor); else tft.drawLine(20, 143, 204, 143, Darkgrey);
   for (byte segments = 0; segments < 94; segments++) {
     if (segments > 54) {
       if (((segments - 53) % 10) == 0) {