Fix ukrainian fonts (meshtastic#5468)

* FIX: rollback to !4624 * UPDATE: new 16 and 24 UA Fonts and fixes
nebman · Dec 14, 2024 · 6c6b323 · 6c6b323
1 parent 6d14c1a
commit 6c6b323
Show file tree

Hide file tree

Showing 6 changed files with 1,645 additions and 135 deletions.
diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 #include "Screen.h"
-#include "../userPrefs.h"
 #include "PowerMon.h"
 #include "Throttle.h"
 #include "configuration.h"
@@ -2757,4 +2756,4 @@ int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg)
 } // namespace graphics
 #else
 graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
-#endif // HAS_SCREEN
+#endif // HAS_SCREEN
diff --git a/src/graphics/Screen.h b/src/graphics/Screen.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "../userPrefs.h"
 #include "configuration.h"
 
 #include "detect/ScanI2C.h"

diff --git a/src/graphics/ScreenFonts.h b/src/graphics/ScreenFonts.h
@@ -27,14 +27,22 @@
 #define FONT_SMALL ArialMT_Plain_10_RU
 #else
 #ifdef OLED_UA
-#define FONT_SMALL ArialMT_Plain_10_UA
+#define FONT_SMALL ArialMT_Plain_10_UA // Height: 13
 #else
 #define FONT_SMALL ArialMT_Plain_10 // Height: 13
 #endif
 #endif
 #endif
+#ifdef OLED_UA
+#define FONT_MEDIUM ArialMT_Plain_16_UA // Height: 19
+#else
 #define FONT_MEDIUM ArialMT_Plain_16 // Height: 19
-#define FONT_LARGE ArialMT_Plain_24  // Height: 28
+#endif
+#ifdef OLED_UA
+#define FONT_LARGE ArialMT_Plain_24_UA // Height: 28
+#else
+#define FONT_LARGE ArialMT_Plain_24 // Height: 28
+#endif
 #endif
 
 #define _fontHeight(font) ((font)[1] + 1) // height is position 1