mix work

3 files changed, 50 insertions, 8 deletions

diff --git a/src/displayapp/fonts/neofont.c b/src/displayapp/fonts/neofont.c
index e375906..d883ad2 100644
--- a/src/displayapp/fonts/neofont.c
+++ b/src/displayapp/fonts/neofont.c
@@ -303,6 +303,12 @@ static const uint8_t glyphs[][2] = {
       X, _, _,
       _, _, X   ),
 
+  G(  _, _, _,
+      _, X, _,
+      X, X, X,
+      _, X, _,
+      _, _, _   ),
+
   G(  _, X, _,
       X, X, X,
       _, X, _,
@@ -362,7 +368,7 @@ static const uint8_t * neofont0mono_glyph_bitmap_cb(const lv_font_t * font, uint
     }
 
     if (unicode_letter == ' ') { return spc; }
-    static const char *symbols = "|-/:.,_?!%#";
+    static const char *symbols = "|-/:.,_?!%+#";
     if (unicode_letter < 0x80) {
       char*x = strchr(symbols,((uint8_t)unicode_letter));
       if (x != NULL) {
diff --git a/src/displayapp/screens/Symbols.h b/src/displayapp/screens/Symbols.h
index ad27511..ba5b46e 100644
--- a/src/displayapp/screens/Symbols.h
+++ b/src/displayapp/screens/Symbols.h
@@ -116,12 +116,48 @@ namespace Pinetime {
         static constexpr const char* volumDown = "\xEF\x80\xA7";
         static constexpr const char* stepForward = "\xEF\x81\x91";
         static constexpr const char* stepBackward = "\xEF\x81\x88";
-        static constexpr const char* play = "\xEF\x81\x8B";
-        static constexpr const char* pause = "\xEF\x81\x8C";
-        static constexpr const char* stop = "\xEF\x81\x8D";
-        static constexpr const char* stopWatch = "\xEF\x8B\xB2";
-        static constexpr const char* hourGlass = "\xEF\x89\x92";
-        static constexpr const char* lapsFlag = "\xEF\x80\xA4";
+        static constexpr const char play[] =
+          // "\xEF\x81\x8B";
+          G(X, _, _,
+            X, X, _,
+            X, X, X,
+            X, X, _,
+            X, _, _);
+        static constexpr const char pause[] =
+          // "\xEF\x81\x8C";
+          G(_, _, _,
+            X, _, X,
+            X, _, X,
+            X, _, X,
+            _, _, _);
+        static constexpr const char stop[] =
+          // "\xEF\x81\x8D";
+          G(_, _, _,
+            X, X, X,
+            X, X, X,
+            X, X, X,
+            _, _, _);
+        static constexpr const char stopWatch[] =
+          // "\xEF\x8B\xB2";
+          G(X, _, _,
+            X, X, _,
+            X, X, X,
+            X, X, _,
+            X, _, _);
+        static constexpr const char hourGlass[] =
+          // "\xEF\x89\x92";
+          G(X, X, X,
+            X, X, X,
+            _, X, _,
+            X, X, X,
+            X, X, X);
+        static constexpr const char lapsFlag[] =
+          // "\xEF\x80\xA4";
+          G(_, X, _,
+            X, _, X,
+            X, _, _,
+            X, _, X,
+            _, X, _);
         static constexpr const char* drum = "\xEF\x95\xA9";
         static constexpr const char* chartLine = "\xEF\x88\x81";
         static constexpr const char* eye = "\xEF\x81\xAE";
diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp
index 48fde84..332fcef 100644
--- a/src/displayapp/screens/Timer.cpp
+++ b/src/displayapp/screens/Timer.cpp
@@ -87,7 +87,7 @@ Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController)
 
   lv_label_set_text_fmt(time, "%02lu:%02lu", seconds / 60, seconds % 60);
 
-  lv_obj_align(time, lv_scr_act(), LV_ALIGN_CENTER, 0, -25);
+  lv_obj_align(time, lv_scr_act(), LV_ALIGN_CENTER, 0, -20);
 
   btnPlayPause = lv_btn_create(lv_scr_act(), nullptr);
   btnPlayPause->user_data = this;