* refactor of Color mapping in UITasks / DisplayDrivers

* color displays now with a new light theme

src/helpers/ui/DisplayDriver.h

@@ -3,12 +3,20 @@
 #include <stdint.h>
 #include <string.h>
 
+using ColorVal = uint16_t;
+
+class UIColor {
+public:
+  // color definitions (by element _type_)
+  static ColorVal window_bkg, title_bkg, title_txt, primary_txt, secondary_txt, warning_txt, popup_bkg, popup_txt, corp_blue;
+};
+
 class DisplayDriver {
   int _w, _h;
 protected:
   DisplayDriver(int w, int h) { _w = w; _h = h; }
 public:
-  enum Color { DARK=0, LIGHT, RED, GREEN, BLUE, YELLOW, ORANGE }; // on b/w screen, colors will be !=0 synonym of light
+  //enum Color { DARK=0, LIGHT, RED, GREEN, BLUE, YELLOW, ORANGE }; // on b/w screen, colors will be !=0 synonym of light
 
   int width() const { return _w; }
   int height() const { return _h; }
@@ -18,9 +26,9 @@ public:
   virtual void turnOn() = 0;
   virtual void turnOff() = 0;
   virtual void clear() = 0;
-  virtual void startFrame(Color bkg = DARK) = 0;
+  virtual void startFrame(ColorVal bkg = UIColor::window_bkg) = 0;
   virtual void setTextSize(int sz) = 0;
-  virtual void setColor(Color c) = 0;
+  virtual void setColor(ColorVal c) = 0;
   virtual void setCursor(int x, int y) = 0;
   virtual void print(const char* str) = 0;
   virtual void printWordWrap(const char* str, int max_width) { print(str); }   // fallback to basic print() if no override

src/helpers/ui/E213Display.cpp

@@ -2,6 +2,17 @@
 
 #include "../../MeshCore.h"
 
+// Color scheme
+ColorVal UIColor::window_bkg = WHITE;
+ColorVal UIColor::title_bkg = BLACK;
+ColorVal UIColor::title_txt = WHITE;
+ColorVal UIColor::primary_txt = BLACK;
+ColorVal UIColor::secondary_txt = BLACK;
+ColorVal UIColor::warning_txt = BLACK;
+ColorVal UIColor::popup_bkg = BLACK;
+ColorVal UIColor::popup_txt = WHITE;
+ColorVal UIColor::corp_blue = BLACK;
+
 BaseDisplay* E213Display::detectEInk()
 {
     // Test 1: Logic of BUSY pin
@@ -108,16 +119,18 @@ void E213Display::clear() {
   display->clear();
 }
 
-void E213Display::startFrame(Color bkg) {
+void E213Display::startFrame(ColorVal bkg) {
   display_crc.reset();
 
   // Fill screen with white first to ensure clean background
   display->fillRect(0, 0, width(), height(), WHITE);
 
-  if (bkg == LIGHT) {
+  if (bkg == 0) {
     // Fill with black if light background requested (inverted for e-ink)
     display->fillRect(0, 0, width(), height(), BLACK);
   }
+  _color = UIColor::primary_txt;
+  display->setTextColor(_color);
 }
 
 void E213Display::setTextSize(int sz) {
@@ -126,9 +139,10 @@ void E213Display::setTextSize(int sz) {
     display->setTextSize(sz);
 }
 
-void E213Display::setColor(Color c) {
-  display_crc.update<Color>(c);
-  // implemented in individual display methods
+void E213Display::setColor(ColorVal c) {
+  _color = c;
+  display_crc.update<ColorVal>(c);
+  display->setTextColor(_color);
 }
 
 void E213Display::setCursor(int x, int y) {
@@ -147,7 +161,7 @@ void E213Display::fillRect(int x, int y, int w, int h) {
   display_crc.update<int>(y);
   display_crc.update<int>(w);
   display_crc.update<int>(h);
-    display->fillRect(x, y, w, h, BLACK);
+    display->fillRect(x, y, w, h, _color);
 }
 
 void E213Display::drawRect(int x, int y, int w, int h) {
@@ -155,7 +169,7 @@ void E213Display::drawRect(int x, int y, int w, int h) {
   display_crc.update<int>(y);
   display_crc.update<int>(w);
   display_crc.update<int>(h);
-    display->drawRect(x, y, w, h, BLACK);
+    display->drawRect(x, y, w, h, _color);
 }
 
 void E213Display::drawXbm(int x, int y, const uint8_t *bits, int w, int h) {
@@ -179,7 +193,7 @@ void E213Display::drawXbm(int x, int y, const uint8_t *bits, int w, int h) {
 
       // If the bit is set, draw the pixel
       if (bitSet) {
-          display->drawPixel(x + bx, y + by, BLACK);
+          display->drawPixel(x + bx, y + by, _color);
       }
     }
   }

src/helpers/ui/E213Display.h

@@ -16,6 +16,7 @@ class E213Display : public DisplayDriver {
   RefCountedDigitalPin* _periph_power;
   CRC32 display_crc;
   uint32_t last_display_crc_value = 0;
+  uint16_t _color;
 
 public:
   E213Display(RefCountedDigitalPin* periph_power = NULL) : DisplayDriver(250, 122), _periph_power(periph_power) {}
@@ -30,9 +31,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal c) override;
   void setCursor(int x, int y) override;
   void print(const char *str) override;
   void fillRect(int x, int y, int w, int h) override;

src/helpers/ui/E290Display.cpp

@@ -2,6 +2,17 @@
 
 #include "../../MeshCore.h"
 
+// Color scheme
+ColorVal UIColor::window_bkg = WHITE;
+ColorVal UIColor::title_bkg = BLACK;
+ColorVal UIColor::title_txt = WHITE;
+ColorVal UIColor::primary_txt = BLACK;
+ColorVal UIColor::secondary_txt = BLACK;
+ColorVal UIColor::warning_txt = BLACK;
+ColorVal UIColor::popup_bkg = BLACK;
+ColorVal UIColor::popup_txt = WHITE;
+ColorVal UIColor::corp_blue = BLACK;
+
 bool E290Display::begin() {
   if (_init) return true;
 
@@ -62,15 +73,17 @@ void E290Display::clear() {
   display.clear();
 }
 
-void E290Display::startFrame(Color bkg) {
+void E290Display::startFrame(ColorVal bkg) {
   display_crc.reset();
 
   // Fill screen with white first to ensure clean background
   display.fillRect(0, 0, width(), height(), WHITE);
-  if (bkg == LIGHT) {
+  if (bkg == 0) {
     // Fill with black if light background requested (inverted for e-ink)
     display.fillRect(0, 0, width(), height(), BLACK);
   }
+  _color = UIColor::primary_txt;
+  display.setTextColor(_color);
 }
 
 void E290Display::setTextSize(int sz) {
@@ -79,9 +92,10 @@ void E290Display::setTextSize(int sz) {
   display.setTextSize(sz);
 }
 
-void E290Display::setColor(Color c) {
-  display_crc.update<Color>(c);
-  // implemented in individual display methods
+void E290Display::setColor(ColorVal c) {
+  _color = c;
+  display_crc.update<ColorVal>(c);
+  display.setTextColor(_color);
 }
 
 void E290Display::setCursor(int x, int y) {
@@ -100,7 +114,7 @@ void E290Display::fillRect(int x, int y, int w, int h) {
   display_crc.update<int>(y);
   display_crc.update<int>(w);
   display_crc.update<int>(h);
-  display.fillRect(x, y, w, h, BLACK);
+  display.fillRect(x, y, w, h, _color);
 }
 
 void E290Display::drawRect(int x, int y, int w, int h) {
@@ -108,7 +122,7 @@ void E290Display::drawRect(int x, int y, int w, int h) {
   display_crc.update<int>(y);
   display_crc.update<int>(w);
   display_crc.update<int>(h);
-  display.drawRect(x, y, w, h, BLACK);
+  display.drawRect(x, y, w, h, _color);
 }
 
 void E290Display::drawXbm(int x, int y, const uint8_t *bits, int w, int h) {
@@ -132,7 +146,7 @@ void E290Display::drawXbm(int x, int y, const uint8_t *bits, int w, int h) {
 
       // If the bit is set, draw the pixel
       if (bitSet) {
-        display.drawPixel(x + bx, y + by, BLACK);
+        display.drawPixel(x + bx, y + by, _color);
       }
     }
   }

src/helpers/ui/E290Display.h

@@ -16,6 +16,7 @@ class E290Display : public DisplayDriver {
   RefCountedDigitalPin* _periph_power;
   CRC32 display_crc;
   uint32_t last_display_crc_value = 0;
+  uint16_t _color;
 
 public:
   E290Display(RefCountedDigitalPin* periph_power = NULL) : DisplayDriver(296, 128), _periph_power(periph_power) {}
@@ -26,9 +27,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal c) override;
   void setCursor(int x, int y) override;
   void print(const char *str) override;
   void fillRect(int x, int y, int w, int h) override;

src/helpers/ui/GxEPDDisplay.cpp

@@ -14,6 +14,18 @@
   SPIClass SPI1 = SPIClass(FSPI);
 #endif
 
+// Color scheme
+ColorVal UIColor::window_bkg = GxEPD_WHITE;
+ColorVal UIColor::title_bkg = GxEPD_BLACK;
+ColorVal UIColor::title_txt = GxEPD_WHITE;
+ColorVal UIColor::primary_txt = GxEPD_BLACK;
+ColorVal UIColor::secondary_txt = GxEPD_BLACK;
+ColorVal UIColor::warning_txt = GxEPD_BLACK;
+ColorVal UIColor::popup_bkg = GxEPD_BLACK;
+ColorVal UIColor::popup_txt = GxEPD_WHITE;
+ColorVal UIColor::corp_blue = GxEPD_BLACK;
+
+
 bool GxEPDDisplay::begin() {
   display.epd2.selectSPI(SPI1, SPISettings(4000000, MSBFIRST, SPI_MODE0));
 #ifdef ESP32
@@ -61,9 +73,9 @@ void GxEPDDisplay::clear() {
   display_crc.reset();
 }
 
-void GxEPDDisplay::startFrame(Color bkg) {
-  display.fillScreen(GxEPD_WHITE);
-  display.setTextColor(_curr_color = GxEPD_BLACK);
+void GxEPDDisplay::startFrame(ColorVal bkg) {
+  display.fillScreen(bkg);
+  display.setTextColor(_curr_color = UIColor::primary_txt);
   display_crc.reset();
 }
 
@@ -85,14 +97,9 @@ void GxEPDDisplay::setTextSize(int sz) {
   }
 }
 
-void GxEPDDisplay::setColor(Color c) {
-  display_crc.update<Color> (c);
-  // colours need to be inverted for epaper displays
-  if (c == DARK) {
-    display.setTextColor(_curr_color = GxEPD_WHITE);
-  } else {
-    display.setTextColor(_curr_color = GxEPD_BLACK);
-  }
+void GxEPDDisplay::setColor(ColorVal c) {
+  display_crc.update<ColorVal> (c);
+  display.setTextColor(_curr_color = c);
 }
 
 void GxEPDDisplay::setCursor(int x, int y) {

src/helpers/ui/GxEPDDisplay.h

@@ -51,9 +51,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal c) override;
   void setCursor(int x, int y) override;
   void print(const char* str) override;
   void fillRect(int x, int y, int w, int h) override;

src/helpers/ui/LGFXDisplay.cpp

@@ -1,5 +1,16 @@
 #include "LGFXDisplay.h"
 
+// Color scheme
+ColorVal UIColor::window_bkg = 0xFFFF;
+ColorVal UIColor::title_bkg = 0x001F;
+ColorVal UIColor::title_txt = 0xFFFF;
+ColorVal UIColor::primary_txt = 0x0000;
+ColorVal UIColor::secondary_txt = (18 << 11) | (36 << 5) | 18;  // mid-gray
+ColorVal UIColor::warning_txt = 0xFD20;
+ColorVal UIColor::popup_bkg =  0x07FF;  // CYAN
+ColorVal UIColor::popup_txt = 0x0000;
+ColorVal UIColor::corp_blue = 0x001A;
+
 bool LGFXDisplay::begin() {
   turnOn();
   display->init();
@@ -35,45 +46,20 @@ void LGFXDisplay::clear() {
   buffer.clearDisplay();
 }
 
-void LGFXDisplay::startFrame(Color bkg) {
+void LGFXDisplay::startFrame(ColorVal bkg) {
 //  display->startWrite();
 //  display->getScanLine();
-  buffer.clearDisplay();
-  buffer.setTextColor(TFT_WHITE);
+  _color = bkg;
+  buffer.fillScreen(_color);
+  buffer.setTextColor(_color = UIColor::primary_txt);
 }
 
 void LGFXDisplay::setTextSize(int sz) {
   buffer.setTextSize(sz);
 }
 
-void LGFXDisplay::setColor(Color c) {
-  // _color = (c != 0) ? ILI9342_WHITE : ILI9342_BLACK;
-  switch (c) {
-    case DARK:
-      _color = TFT_BLACK;
-      break;
-    case LIGHT:
-      _color = TFT_WHITE;
-      break;
-    case RED:
-      _color = TFT_RED;
-      break;
-    case GREEN:
-      _color = TFT_GREEN;
-      break;
-    case BLUE:
-      _color = TFT_BLUE;
-      break;
-    case YELLOW:
-      _color = TFT_YELLOW;
-      break;
-    case ORANGE:
-      _color = TFT_ORANGE;
-      break;
-    default:
-      _color = TFT_WHITE;
-  }
-  buffer.setTextColor(_color);
+void LGFXDisplay::setColor(ColorVal c) {
+  buffer.setTextColor(_color = c);
 }
 
 void LGFXDisplay::setCursor(int x, int y) {

src/helpers/ui/LGFXDisplay.h

@@ -25,9 +25,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal c) override;
   void setCursor(int x, int y) override;
   void print(const char* str) override;
   void fillRect(int x, int y, int w, int h) override;

src/helpers/ui/NV3001BDisplay.cpp

@@ -96,18 +96,16 @@
   #define NV3001B_TEXT_SIZE2_SCALE_Y 3
 #endif
 
-static uint16_t mapColor(DisplayDriver::Color c) {
-  switch (c) {
-    case DisplayDriver::DARK: return 0x0000;
-    case DisplayDriver::LIGHT: return 0xffff;
-    case DisplayDriver::RED: return 0xf800;
-    case DisplayDriver::GREEN: return 0x07e0;
-    case DisplayDriver::BLUE: return 0x001f;
-    case DisplayDriver::YELLOW: return 0xffe0;
-    case DisplayDriver::ORANGE: return 0xfd20;
-    default: return 0xffff;
-  }
-}
+// Color scheme
+ColorVal UIColor::window_bkg = 0xFFFF;
+ColorVal UIColor::title_bkg = 0x001F;
+ColorVal UIColor::title_txt = 0xFFFF;
+ColorVal UIColor::primary_txt = 0x0000;
+ColorVal UIColor::secondary_txt = (18 << 11) | (36 << 5) | 18;  // mid-gray
+ColorVal UIColor::warning_txt = 0xFD20;
+ColorVal UIColor::popup_bkg =  0x07FF;  // CYAN
+ColorVal UIColor::popup_txt = 0x0000;
+ColorVal UIColor::corp_blue = 0x001A;
 
 static int scaleX(int x) {
   return (int)(x * DISPLAY_SCALE_X);
@@ -465,15 +463,15 @@ void NV3001BDisplay::turnOff() {
 
 void NV3001BDisplay::clear() {
   uint16_t saved = color;
-  color = 0x0000;
+  color = UIColor::window_bkg;
   fillPhysicalRect(0, 0, NV3001B_SCREEN_WIDTH, NV3001B_SCREEN_HEIGHT);
   color = saved;
 }
 
-void NV3001BDisplay::startFrame(Color bkg) {
-  color = mapColor(bkg);
+void NV3001BDisplay::startFrame(ColorVal bkg) {
+  color = bkg;
   fillPhysicalRect(0, 0, NV3001B_SCREEN_WIDTH, NV3001B_SCREEN_HEIGHT);
-  color = 0xffff;
+  color = UIColor::primary_txt;
   text_size = 1;
   cursor_x = 0;
   cursor_y = 0;
@@ -483,8 +481,8 @@ void NV3001BDisplay::setTextSize(int sz) {
   text_size = sz < 1 ? 1 : sz;
 }
 
-void NV3001BDisplay::setColor(Color c) {
-  color = mapColor(c);
+void NV3001BDisplay::setColor(ColorVal c) {
+  color = c;
 }
 
 void NV3001BDisplay::setCursor(int x, int y) {

src/helpers/ui/NV3001BDisplay.h

@@ -55,9 +55,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal c) override;
   void setCursor(int x, int y) override;
   void print(const char* str) override;
   void fillRect(int x, int y, int w, int h) override;

src/helpers/ui/NullDisplayDriver.h

@@ -11,9 +11,9 @@ public:
   void turnOn() override { }
   void turnOff() override { }
   void clear() override { }
-  void startFrame(Color bkg = DARK) override { }
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override { }
   void setTextSize(int sz) override { }
-  void setColor(Color c) override { }
+  void setColor(ColorVal c) override { }
   void setCursor(int x, int y) override { }
   void print(const char* str) override { }
   void fillRect(int x, int y, int w, int h) override { }

src/helpers/ui/SH1106Display.cpp

@@ -9,6 +9,17 @@ bool SH1106Display::i2c_probe(TwoWire &wire, uint8_t addr)
   return (error == 0);
 }
 
+// Color scheme
+ColorVal UIColor::window_bkg = SH110X_BLACK;
+ColorVal UIColor::title_bkg = SH110X_WHITE;
+ColorVal UIColor::title_txt = SH110X_BLACK;
+ColorVal UIColor::primary_txt = SH110X_WHITE;
+ColorVal UIColor::secondary_txt = SH110X_WHITE;
+ColorVal UIColor::warning_txt = SH110X_WHITE;
+ColorVal UIColor::popup_bkg = SH110X_WHITE;
+ColorVal UIColor::popup_txt = SH110X_BLACK;
+ColorVal UIColor::corp_blue = SH110X_WHITE;
+
 bool SH1106Display::begin()
 {
   // Wire must already be initialised by board.begin() before this is called.
@@ -35,7 +46,7 @@ void SH1106Display::clear()
   display.display();
 }
 
-void SH1106Display::startFrame(Color bkg)
+void SH1106Display::startFrame(ColorVal bkg)
 {
   display.clearDisplay(); // TODO: apply 'bkg'
   _color = SH110X_WHITE;
@@ -49,9 +60,9 @@ void SH1106Display::setTextSize(int sz)
   display.setTextSize(sz);
 }
 
-void SH1106Display::setColor(Color c)
+void SH1106Display::setColor(ColorVal c)
 {
-  _color = (c != 0) ? SH110X_WHITE : SH110X_BLACK;
+  _color = c;
   display.setTextColor(_color);
 }
 
@@ -77,7 +88,7 @@ void SH1106Display::drawRect(int x, int y, int w, int h)
 
 void SH1106Display::drawXbm(int x, int y, const uint8_t *bits, int w, int h)
 {
-  display.drawBitmap(x, y, bits, w, h, SH110X_WHITE);
+  display.drawBitmap(x, y, bits, w, h, _color);
 }
 
 uint16_t SH1106Display::getTextWidth(const char *str)

src/helpers/ui/SH1106Display.h

@@ -30,9 +30,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal c) override;
   void setCursor(int x, int y) override;
   void print(const char *str) override;
   void fillRect(int x, int y, int w, int h) override;

src/helpers/ui/SSD1306Display.cpp

@@ -6,6 +6,17 @@ bool SSD1306Display::i2c_probe(TwoWire& wire, uint8_t addr) {
   return (error == 0);
 }
 
+// Color scheme
+ColorVal UIColor::window_bkg = SSD1306_BLACK;
+ColorVal UIColor::title_bkg = SSD1306_WHITE;
+ColorVal UIColor::title_txt = SSD1306_BLACK;
+ColorVal UIColor::primary_txt = SSD1306_WHITE;
+ColorVal UIColor::secondary_txt = SSD1306_WHITE;
+ColorVal UIColor::warning_txt = SSD1306_WHITE;
+ColorVal UIColor::popup_bkg = SSD1306_WHITE;
+ColorVal UIColor::popup_txt = SSD1306_BLACK;
+ColorVal UIColor::corp_blue = SSD1306_WHITE;
+
 bool SSD1306Display::begin() {
   if (!_isOn) {
     if (_peripher_power) _peripher_power->claim();
@@ -44,7 +55,7 @@ void SSD1306Display::clear() {
   display.display();
 }
 
-void SSD1306Display::startFrame(Color bkg) {
+void SSD1306Display::startFrame(ColorVal bkg) {
   display.clearDisplay();  // TODO: apply 'bkg'
   _color = SSD1306_WHITE;
   display.setTextColor(_color);
@@ -56,8 +67,8 @@ void SSD1306Display::setTextSize(int sz) {
   display.setTextSize(sz);
 }
 
-void SSD1306Display::setColor(Color c) {
-  _color = (c != 0) ? SSD1306_WHITE : SSD1306_BLACK;
+void SSD1306Display::setColor(ColorVal c) {
+  _color = c;
   display.setTextColor(_color);
 }
 
@@ -78,7 +89,7 @@ void SSD1306Display::drawRect(int x, int y, int w, int h) {
 }
 
 void SSD1306Display::drawXbm(int x, int y, const uint8_t* bits, int w, int h) {
-  display.drawBitmap(x, y, bits, w, h, SSD1306_WHITE);
+  display.drawBitmap(x, y, bits, w, h, _color);
 }
 
 uint16_t SSD1306Display::getTextWidth(const char* str) {

src/helpers/ui/SSD1306Display.h

@@ -35,9 +35,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal c) override;
   void setCursor(int x, int y) override;
   void print(const char* str) override;
   void fillRect(int x, int y, int w, int h) override;

src/helpers/ui/ST7735Display.cpp

@@ -417,6 +417,17 @@ bool ST7735Display::i2c_probe(TwoWire& wire, uint8_t addr) {
   #define PIN_TFT_LEDA_CTL_ACTIVE  HIGH
 #endif
 
+// Color scheme
+ColorVal UIColor::window_bkg = ST77XX_WHITE;
+ColorVal UIColor::title_bkg = ST77XX_BLUE;
+ColorVal UIColor::title_txt = ST77XX_WHITE;
+ColorVal UIColor::primary_txt = ST77XX_BLACK;
+ColorVal UIColor::secondary_txt = (18 << 11) | (36 << 5) | 18;  // mid-gray
+ColorVal UIColor::warning_txt = ST77XX_ORANGE;
+ColorVal UIColor::popup_bkg = ST77XX_CYAN;
+ColorVal UIColor::popup_txt = ST77XX_BLACK;
+ColorVal UIColor::corp_blue = 0x001A;
+
 bool ST7735Display::begin() {
   if (!sprite) {
     // alloc offscreen canvas
@@ -527,9 +538,9 @@ void ST7735Display::clear() {
   sprite->fillScreen(ST77XX_BLACK);
 }
 
-void ST7735Display::startFrame(Color bkg) {
-  sprite->fillScreen(ST77XX_BLACK);
-  sprite->setTextColor(curr_color = ST77XX_WHITE);
+void ST7735Display::startFrame(ColorVal bkg) {
+  sprite->fillScreen(bkg);
+  sprite->setTextColor(curr_color = UIColor::primary_txt);
   sprite->setFreeFont();
   sprite->setTextSize(1);      // This one affects size of Please wait... message
   //sprite->cp437(true);         // Use full 256 char 'Code Page 437' font
@@ -539,33 +550,8 @@ void ST7735Display::setTextSize(int sz) {
   sprite->setTextSize(sz);
 }
 
-void ST7735Display::setColor(Color c) {
-  switch (c) {
-    case DisplayDriver::DARK :
-      curr_color = ST77XX_BLACK;
-      break;
-    case DisplayDriver::LIGHT : 
-      curr_color = ST77XX_WHITE;
-      break;
-    case DisplayDriver::RED : 
-      curr_color = ST77XX_RED;
-      break;
-    case DisplayDriver::GREEN : 
-      curr_color = ST77XX_GREEN;
-      break;
-    case DisplayDriver::BLUE : 
-      curr_color = ST77XX_BLUE;
-      break;
-    case DisplayDriver::YELLOW : 
-      curr_color = ST77XX_YELLOW;
-      break;
-    case DisplayDriver::ORANGE : 
-      curr_color = ST77XX_ORANGE;
-      break;
-    default:
-      curr_color = ST77XX_WHITE;
-      break;
-  }
+void ST7735Display::setColor(ColorVal c) {
+  curr_color = c;
   sprite->setTextColor(curr_color);
 }
 

src/helpers/ui/ST7735Display.h

@@ -33,9 +33,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal c) override;
   void setCursor(int x, int y) override;
   void print(const char* str) override;
   void fillRect(int x, int y, int w, int h) override;

src/helpers/ui/ST7789Display.cpp

@@ -26,6 +26,17 @@
   #define SCALE_Y DISPLAY_SCALE_Y
 #endif
 
+// Color scheme
+ColorVal UIColor::window_bkg = ST77XX_WHITE;
+ColorVal UIColor::title_bkg = ST77XX_BLUE;
+ColorVal UIColor::title_txt = ST77XX_WHITE;
+ColorVal UIColor::primary_txt = ST77XX_BLACK;
+ColorVal UIColor::secondary_txt = (18 << 11) | (36 << 5) | 18;  // mid-gray
+ColorVal UIColor::warning_txt = ST77XX_ORANGE;
+ColorVal UIColor::popup_bkg = ST77XX_CYAN;
+ColorVal UIColor::popup_txt = ST77XX_BLACK;
+ColorVal UIColor::corp_blue = 0x001A;
+
 bool ST7789Display::begin() {
   if(!_isOn) {
     pinMode(PIN_TFT_VDD_CTL, OUTPUT);
@@ -90,9 +101,9 @@ void ST7789Display::clear() {
   display.clear();
 }
 
-void ST7789Display::startFrame(Color bkg) {
-  display.clear();
-  _color = ST77XX_WHITE;
+void ST7789Display::startFrame(ColorVal bkg) {
+  display.fillRect(0, 0, display.width(), display.height());
+  _color = UIColor::primary_txt;
   display.setRGB(_color);
   display.setFont(ArialMT_Plain_16);
 }
@@ -110,38 +121,8 @@ void ST7789Display::setTextSize(int sz) {
   }
 }
 
-void ST7789Display::setColor(Color c) {
-  switch (c) {
-    case DisplayDriver::DARK :
-      _color = ST77XX_BLACK;
-      display.setColor(OLEDDISPLAY_COLOR::BLACK);
-      break;
-#if 0
-    case DisplayDriver::LIGHT : 
-      _color = ST77XX_WHITE;
-      break;
-    case DisplayDriver::RED : 
-      _color = ST77XX_RED;
-      break;
-    case DisplayDriver::GREEN : 
-      _color = ST77XX_GREEN;
-      break;
-    case DisplayDriver::BLUE : 
-      _color = ST77XX_BLUE;
-      break;
-    case DisplayDriver::YELLOW : 
-      _color = ST77XX_YELLOW;
-      break;
-    case DisplayDriver::ORANGE : 
-      _color = ST77XX_ORANGE;
-      break;
-#endif
-    default:
-      _color = ST77XX_WHITE;
-      display.setColor(OLEDDISPLAY_COLOR::WHITE);
-      break;
-  }
-  display.setRGB(_color);
+void ST7789Display::setColor(ColorVal c) {
+  display.setRGB(_color = c);
 }
 
 void ST7789Display::setCursor(int x, int y) {

src/helpers/ui/ST7789Display.h

@@ -27,9 +27,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal c) override;
   void setCursor(int x, int y) override;
   void print(const char* str) override;
   void printWordWrap(const char* str, int max_width) override;

src/helpers/ui/ST7789LCDDisplay.cpp

@@ -23,6 +23,17 @@ bool ST7789LCDDisplay::i2c_probe(TwoWire& wire, uint8_t addr) {
   return true;
 }
 
+// Color scheme
+ColorVal UIColor::window_bkg = ST77XX_WHITE;
+ColorVal UIColor::title_bkg = ST77XX_BLUE;
+ColorVal UIColor::title_txt = ST77XX_WHITE;
+ColorVal UIColor::primary_txt = ST77XX_BLACK;
+ColorVal UIColor::secondary_txt = (18 << 11) | (36 << 5) | 18;  // mid-gray
+ColorVal UIColor::warning_txt = ST77XX_ORANGE;
+ColorVal UIColor::popup_bkg = ST77XX_CYAN;
+ColorVal UIColor::popup_txt = ST77XX_BLACK;
+ColorVal UIColor::corp_blue = 0x001A;
+
 bool ST7789LCDDisplay::begin() {
   if (!_isOn) {
     if (_peripher_power) _peripher_power->claim();
@@ -78,9 +89,9 @@ void ST7789LCDDisplay::clear() {
   display.fillScreen(ST77XX_BLACK);
 }
 
-void ST7789LCDDisplay::startFrame(Color bkg) {
-  display.fillScreen(ST77XX_BLACK);
-  display.setTextColor(ST77XX_WHITE);
+void ST7789LCDDisplay::startFrame(ColorVal bkg) {
+  display.fillScreen(bkg);
+  display.setTextColor(_color = UIColor::primary_txt);
   display.setTextSize(1 * DISPLAY_SCALE_X); // This one affects size of Please wait... message
   display.cp437(true); // Use full 256 char 'Code Page 437' font
 }
@@ -89,34 +100,8 @@ void ST7789LCDDisplay::setTextSize(int sz) {
   display.setTextSize(sz * DISPLAY_SCALE_X);
 }
 
-void ST7789LCDDisplay::setColor(Color c) {
-  switch (c) {
-    case DisplayDriver::DARK :
-      _color = ST77XX_BLACK;
-      break;
-    case DisplayDriver::LIGHT : 
-      _color = ST77XX_WHITE;
-      break;
-    case DisplayDriver::RED : 
-      _color = ST77XX_RED;
-      break;
-    case DisplayDriver::GREEN : 
-      _color = ST77XX_GREEN;
-      break;
-    case DisplayDriver::BLUE : 
-      _color = ST77XX_BLUE;
-      break;
-    case DisplayDriver::YELLOW : 
-      _color = ST77XX_YELLOW;
-      break;
-    case DisplayDriver::ORANGE : 
-      _color = ST77XX_ORANGE;
-      break;
-    default:
-      _color = ST77XX_WHITE;
-      break;
-  }
-  display.setTextColor(_color);
+void ST7789LCDDisplay::setColor(ColorVal c) {
+  display.setTextColor(_color = c);
 }
 
 void ST7789LCDDisplay::setCursor(int x, int y) {

src/helpers/ui/ST7789LCDDisplay.h

@@ -47,9 +47,9 @@ public:
   void turnOn() override;
   void turnOff() override;
   void clear() override;
-  void startFrame(Color bkg = DARK) override;
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override;
   void setTextSize(int sz) override;
-  void setColor(Color c) override;
+  void setColor(ColorVal c) override;
   void setCursor(int x, int y) override;
   void print(const char* str) override;
   void fillRect(int x, int y, int w, int h) override;

src/helpers/ui/U8g2Display.cpp

@@ -0,0 +1,12 @@
+#include "U8g2Display.h"
+
+// Color scheme
+ColorVal UIColor::window_bkg = 0;
+ColorVal UIColor::title_bkg = 1;
+ColorVal UIColor::title_txt = 0;
+ColorVal UIColor::primary_txt = 1;
+ColorVal UIColor::secondary_txt = 1;
+ColorVal UIColor::warning_txt = 1;
+ColorVal UIColor::popup_bkg = 1;
+ColorVal UIColor::popup_txt = 0;
+ColorVal UIColor::corp_blue = 1;

src/helpers/ui/U8g2Display.h

@@ -72,10 +72,10 @@ public:
     _u8g2.sendBuffer();
   }
 
-  void startFrame(Color bkg = DARK) override {
-    _u8g2.clearBuffer();
-    _drawColor = 1;
-    _u8g2.setDrawColor(1);
+  void startFrame(ColorVal bkg = UIColor::window_bkg) override {
+    _u8g2.clearBuffer();  // TODO: apply 'bkg' color
+    _drawColor = UIColor::primary_txt;
+    _u8g2.setDrawColor(_drawColor);
     applyFont(1);
   }
 
@@ -83,8 +83,8 @@ public:
     applyFont(sz);
   }
 
-  void setColor(Color c) override {
-    _drawColor = (c != DARK) ? 1 : 0;
+  void setColor(ColorVal c) override {
+    _drawColor = c;
     _u8g2.setDrawColor(_drawColor);
   }
 
@@ -94,22 +94,18 @@ public:
   }
 
   void print(const char* str) override {
-    _u8g2.setDrawColor(_drawColor);
     _u8g2.drawStr(_cursorX, _cursorY, str);
   }
 
   void fillRect(int x, int y, int w, int h) override {
-    _u8g2.setDrawColor(_drawColor);
     _u8g2.drawBox(x, y, w, h);
   }
 
   void drawRect(int x, int y, int w, int h) override {
-    _u8g2.setDrawColor(_drawColor);
     _u8g2.drawFrame(x, y, w, h);
   }
 
   void drawXbm(int x, int y, const uint8_t* bits, int w, int h) override {
-    _u8g2.setDrawColor(1);
     _u8g2.drawXBM(x, y, w, h, bits);
   }