From 378fa6b4016b65e2d7b128fdc3ce89c4ca779a4d Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 18 May 2021 15:23:26 +0200
Subject: Reset

---
 src/displayapp/Apps.h                              |   4 +-
 src/displayapp/DisplayApp.cpp                      |  53 ++---
 src/displayapp/DisplayApp.h                        |   2 +-
 src/displayapp/DisplayAppRecovery.cpp              |   7 +-
 src/displayapp/fonts/jetbrains_mono_42.c           | 258 ---------------------
 src/displayapp/screens/ApplicationList.cpp         |   4 +-
 src/displayapp/screens/Clock.cpp                   |  16 +-
 src/displayapp/screens/Clock.h                     |   3 +-
 src/displayapp/screens/FirmwareValidation.cpp      |  11 -
 src/displayapp/screens/FirmwareValidation.h        |   3 -
 src/displayapp/screens/Motion.cpp                  |  19 +-
 src/displayapp/screens/Motion.h                    |   2 +-
 src/displayapp/screens/Notifications.cpp           |  10 -
 src/displayapp/screens/Steps.cpp                   |  72 ------
 src/displayapp/screens/Steps.h                     |  39 ----
 src/displayapp/screens/StopWatch.cpp               |   3 +-
 src/displayapp/screens/SystemInfo.cpp              |   8 +-
 src/displayapp/screens/settings/SettingSteps.cpp   |  98 --------
 src/displayapp/screens/settings/SettingSteps.h     |  32 ---
 .../screens/settings/SettingWatchFace.cpp          |  11 +-
 src/displayapp/screens/settings/SettingWatchFace.h |   2 +-
 src/displayapp/screens/settings/Settings.cpp       |  10 +-
 22 files changed, 76 insertions(+), 591 deletions(-)
 delete mode 100644 src/displayapp/fonts/jetbrains_mono_42.c
 delete mode 100644 src/displayapp/screens/Steps.cpp
 delete mode 100644 src/displayapp/screens/Steps.h
 delete mode 100644 src/displayapp/screens/settings/SettingSteps.cpp
 delete mode 100644 src/displayapp/screens/settings/SettingSteps.h

(limited to 'src/displayapp')

diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index 09a20181..936a3ae8 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -21,14 +21,12 @@ namespace Pinetime {
       Navigation,
       StopWatch,
       Motion,
-      Steps,
       QuickSettings,
       Settings,
       SettingWatchFace,
       SettingTimeFormat,
       SettingDisplay,
-      SettingWakeUp,
-      SettingSteps
+      SettingWakeUp
     };
   }
 }
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index a6c4a3ec..3a20c766 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -25,7 +25,6 @@
 #include "displayapp/screens/Twos.h"
 #include "displayapp/screens/FlashLight.h"
 #include "displayapp/screens/BatteryInfo.h"
-#include "displayapp/screens/Steps.h"
 
 #include "drivers/Cst816s.h"
 #include "drivers/St7789.h"
@@ -38,7 +37,6 @@
 #include "displayapp/screens/settings/SettingTimeFormat.h"
 #include "displayapp/screens/settings/SettingWakeUp.h"
 #include "displayapp/screens/settings/SettingDisplay.h"
-#include "displayapp/screens/settings/SettingSteps.h"
 
 using namespace Pinetime::Applications;
 using namespace Pinetime::Applications::Display;
@@ -67,7 +65,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
     notificationManager {notificationManager},
     heartRateController {heartRateController},
     settingsController {settingsController},
-    motorController {motorController},
+    motorController{motorController},
     motionController {motionController} {
   msgQueue = xQueueCreate(queueSize, itemSize);
   // Start clock when smartwatch boots
@@ -75,9 +73,8 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
 }
 
 void DisplayApp::Start() {
-  if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 800, this, 0, &taskHandle)) {
+  if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 800, this, 0, &taskHandle))
     APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
-  }
 }
 
 void DisplayApp::Process(void* instance) {
@@ -88,7 +85,7 @@ void DisplayApp::Process(void* instance) {
   // Send a dummy notification to unlock the lvgl display driver for the first iteration
   xTaskNotifyGive(xTaskGetCurrentTaskHandle());
 
-  while (true) {
+  while (1) {
     app->Refresh();
   }
 }
@@ -216,7 +213,7 @@ void DisplayApp::StartApp(Apps app, DisplayApp::FullRefreshDirections direction)
   LoadApp(app, direction);
 }
 
-void DisplayApp::ReturnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent) {
+void DisplayApp::returnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent) {
   returnToApp = app;
   returnDirection = direction;
   returnTouchEvent = touchEvent;
@@ -227,12 +224,12 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
   SetFullRefresh(direction);
 
   // default return to launcher
-  ReturnApp(Apps::Launcher, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+  returnApp(Apps::Launcher, FullRefreshDirections::Down, TouchEvents::SwipeDown);
 
   switch (app) {
     case Apps::Launcher:
       currentScreen = std::make_unique<Screens::ApplicationList>(this, settingsController, batteryController, dateTimeController);
-      ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::None:
     case Apps::Clock:
@@ -248,7 +245,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
 
     case Apps::FirmwareValidation:
       currentScreen = std::make_unique<Screens::FirmwareValidation>(this, validator);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::FirmwareUpdate:
       currentScreen = std::make_unique<Screens::FirmwareUpdate>(this, bleController);
@@ -257,58 +254,54 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
     case Apps::Notifications:
       currentScreen = std::make_unique<Screens::Notifications>(
         this, notificationManager, systemTask.nimble().alertService(), Screens::Notifications::Modes::Normal);
-      ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
+      returnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
     case Apps::NotificationsPreview:
       currentScreen = std::make_unique<Screens::Notifications>(
         this, notificationManager, systemTask.nimble().alertService(), Screens::Notifications::Modes::Preview);
-      ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
+      returnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
 
     // Settings
     case Apps::QuickSettings:
-      currentScreen = std::make_unique<Screens::QuickSettings>(
-        this, batteryController, dateTimeController, brightnessController, motorController, settingsController);
-      ReturnApp(Apps::Clock, FullRefreshDirections::LeftAnim, TouchEvents::SwipeLeft);
+      currentScreen =
+        std::make_unique<Screens::QuickSettings>(this, batteryController, dateTimeController, brightnessController, motorController, settingsController);
+      returnApp(Apps::Clock, FullRefreshDirections::LeftAnim, TouchEvents::SwipeLeft);
       break;
     case Apps::Settings:
       currentScreen = std::make_unique<Screens::Settings>(this, settingsController);
-      ReturnApp(Apps::QuickSettings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::QuickSettings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingWatchFace:
       currentScreen = std::make_unique<Screens::SettingWatchFace>(this, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingTimeFormat:
       currentScreen = std::make_unique<Screens::SettingTimeFormat>(this, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingWakeUp:
       currentScreen = std::make_unique<Screens::SettingWakeUp>(this, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingDisplay:
       currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
-      break;
-    case Apps::SettingSteps: 
-      currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::BatteryInfo:
       currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SysInfo:
       currentScreen =
         std::make_unique<Screens::SystemInfo>(this, dateTimeController, batteryController, brightnessController, bleController, watchdog);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
       //
 
     case Apps::FlashLight:
       currentScreen = std::make_unique<Screens::FlashLight>(this, systemTask, brightnessController);
-      ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::None);
+      returnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::None);
       break;
     case Apps::StopWatch:
       currentScreen = std::make_unique<Screens::StopWatch>(this);
@@ -334,9 +327,6 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
     case Apps::Motion:
       currentScreen = std::make_unique<Screens::Motion>(this, motionController);
       break;
-    case Apps::Steps: 
-      currentScreen = std::make_unique<Screens::Steps>(this, motionController, settingsController);
-      break;
   }
   currentApp = app;
 }
@@ -359,9 +349,8 @@ TouchEvents DisplayApp::OnTouchEvent() {
   if (info.isTouch) {
     switch (info.gesture) {
       case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
-        if (touchMode == TouchModes::Gestures) {
+        if (touchMode == TouchModes::Gestures)
           lvgl.SetNewTapEvent(info.x, info.y);
-        }
         return TouchEvents::Tap;
       case Pinetime::Drivers::Cst816S::Gestures::LongPress:
         return TouchEvents::LongTap;
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index ffe27cf1..75e52755 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -103,7 +103,7 @@ namespace Pinetime {
       static void Process(void* instance);
       void InitHw();
       void Refresh();
-      void ReturnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent);
+      void returnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent);
       void LoadApp(Apps app, DisplayApp::FullRefreshDirections direction);
     };
   }
diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp
index a132a47c..6db987fa 100644
--- a/src/displayapp/DisplayAppRecovery.cpp
+++ b/src/displayapp/DisplayAppRecovery.cpp
@@ -37,7 +37,7 @@ void DisplayApp::Process(void* instance) {
   xTaskNotifyGive(xTaskGetCurrentTaskHandle());
 
   app->InitHw();
-  while (true) {
+  while (1) {
     app->Refresh();
   }
 }
@@ -51,11 +51,10 @@ void DisplayApp::Refresh() {
   if (xQueueReceive(msgQueue, &msg, 200)) {
     switch (msg) {
       case Display::Messages::UpdateBleConnection:
-        if (bleController.IsConnected()) {
+        if (bleController.IsConnected())
           DisplayLogo(colorBlue);
-        } else {
+        else
           DisplayLogo(colorWhite);
-        }
         break;
       case Display::Messages::BleFirmwareUpdateStarted:
         DisplayLogo(colorGreen);
diff --git a/src/displayapp/fonts/jetbrains_mono_42.c b/src/displayapp/fonts/jetbrains_mono_42.c
deleted file mode 100644
index 6f25f5ab..00000000
--- a/src/displayapp/fonts/jetbrains_mono_42.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Size: 42 px
- * Bpp: 1
- * Opts: 
- ******************************************************************************/
-
-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-#ifndef JETBRAINS_MONO_42
-#define JETBRAINS_MONO_42 1
-#endif
-
-#if JETBRAINS_MONO_42
-
-/*-----------------
- *    BITMAPS
- *----------------*/
-
-/*Store the image of the glyphs*/
-static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
-    /* U+0025 "%" */
-    0x1f, 0x80, 0x7, 0x3f, 0xc0, 0xe, 0x7f, 0xe0,
-    0x1c, 0xf0, 0xf0, 0x1c, 0xe0, 0x70, 0x38, 0xe0,
-    0x70, 0x70, 0xe0, 0x70, 0x70, 0xe0, 0x70, 0xe0,
-    0xe0, 0x71, 0xc0, 0xe0, 0x71, 0xc0, 0xf0, 0xf3,
-    0x80, 0x7f, 0xe7, 0x0, 0x3f, 0xc7, 0x0, 0x1f,
-    0x8e, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x3c, 0x0,
-    0x0, 0x38, 0x0, 0x0, 0x71, 0xf8, 0x0, 0xe3,
-    0xfc, 0x0, 0xe7, 0xfe, 0x1, 0xcf, 0xf, 0x3,
-    0x8e, 0x7, 0x3, 0x8e, 0x7, 0x7, 0xe, 0x7,
-    0xe, 0xe, 0x7, 0xe, 0xe, 0x7, 0x1c, 0xe,
-    0x7, 0x38, 0xf, 0xf, 0x38, 0x7, 0xfe, 0x70,
-    0x3, 0xfc, 0xe0, 0x1, 0xf8,
-
-    /* U+0030 "0" */
-    0x3, 0xf8, 0x1, 0xff, 0xc0, 0xff, 0xfe, 0x1f,
-    0x7, 0xc7, 0xc0, 0x7c, 0xf0, 0x7, 0xbc, 0x0,
-    0x7f, 0x80, 0xf, 0xf0, 0x1, 0xfe, 0x0, 0x3f,
-    0xc0, 0x7, 0xf8, 0x0, 0xff, 0xe, 0x1f, 0xe3,
-    0xe3, 0xfc, 0x7c, 0x7f, 0x8f, 0x8f, 0xf0, 0xe1,
-    0xfe, 0x0, 0x3f, 0xc0, 0x7, 0xf8, 0x0, 0xff,
-    0x0, 0x1f, 0xe0, 0x3, 0xfc, 0x0, 0x7f, 0x80,
-    0xf, 0xf0, 0x1, 0xef, 0x0, 0x79, 0xf0, 0x1f,
-    0x1f, 0x7, 0xc3, 0xff, 0xf8, 0x1f, 0xfc, 0x0,
-    0xfe, 0x0,
-
-    /* U+0031 "1" */
-    0x3, 0xf0, 0x0, 0xfe, 0x0, 0x3f, 0xc0, 0x1f,
-    0xf8, 0x7, 0xcf, 0x1, 0xf1, 0xe0, 0x3c, 0x3c,
-    0x7, 0x7, 0x80, 0x80, 0xf0, 0x0, 0x1e, 0x0,
-    0x3, 0xc0, 0x0, 0x78, 0x0, 0xf, 0x0, 0x1,
-    0xe0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0xf0,
-    0x0, 0x1e, 0x0, 0x3, 0xc0, 0x0, 0x78, 0x0,
-    0xf, 0x0, 0x1, 0xe0, 0x0, 0x3c, 0x0, 0x7,
-    0x80, 0x0, 0xf0, 0x0, 0x1e, 0x0, 0x3, 0xc0,
-    0x0, 0x78, 0xf, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xf8,
-
-    /* U+0032 "2" */
-    0x3, 0xf8, 0x1, 0xff, 0xc0, 0x7f, 0xfe, 0x1f,
-    0x7, 0xc7, 0xc0, 0x3c, 0xf0, 0x7, 0xbc, 0x0,
-    0x7f, 0x80, 0xf, 0xf0, 0x1, 0xe0, 0x0, 0x3c,
-    0x0, 0x7, 0x80, 0x1, 0xf0, 0x0, 0x3c, 0x0,
-    0xf, 0x80, 0x1, 0xe0, 0x0, 0x7c, 0x0, 0x1f,
-    0x0, 0x7, 0xc0, 0x1, 0xf0, 0x0, 0x7e, 0x0,
-    0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0, 0x3e,
-    0x0, 0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0,
-    0x3e, 0x0, 0x7, 0xff, 0xfe, 0xff, 0xff, 0xdf,
-    0xff, 0xf8,
-
-    /* U+0033 "3" */
-    0x7f, 0xff, 0x8f, 0xff, 0xf1, 0xff, 0xfe, 0x0,
-    0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf,
-    0x0, 0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3e, 0x0,
-    0x7, 0x80, 0x1, 0xfe, 0x0, 0x3f, 0xf0, 0x7,
-    0xff, 0x0, 0x3, 0xf0, 0x0, 0x1e, 0x0, 0x3,
-    0xc0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0xf0,
-    0x0, 0x1e, 0x0, 0x3, 0xfc, 0x0, 0x7f, 0x80,
-    0xf, 0xf0, 0x1, 0xef, 0x0, 0x79, 0xf0, 0x1f,
-    0x1f, 0x7, 0xc3, 0xff, 0xf0, 0x1f, 0xfc, 0x0,
-    0xfe, 0x0,
-
-    /* U+0034 "4" */
-    0x0, 0x1e, 0x0, 0xf, 0x80, 0x3, 0xc0, 0x1,
-    0xe0, 0x0, 0x78, 0x0, 0x3c, 0x0, 0x1f, 0x0,
-    0x7, 0x80, 0x3, 0xc0, 0x1, 0xf0, 0x0, 0x78,
-    0x0, 0x3e, 0x0, 0xf, 0x0, 0x7, 0x80, 0xf3,
-    0xe0, 0x3c, 0xf0, 0xf, 0x7c, 0x3, 0xde, 0x0,
-    0xff, 0x0, 0x3f, 0xc0, 0xf, 0xf0, 0x3, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0, 0x3,
-    0xc0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf, 0x0,
-    0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3c,
-
-    /* U+0035 "5" */
-    0x7f, 0xff, 0x9f, 0xff, 0xe7, 0xff, 0xf9, 0xe0,
-    0x0, 0x78, 0x0, 0x1e, 0x0, 0x7, 0x80, 0x1,
-    0xe0, 0x0, 0x78, 0x0, 0x1e, 0x0, 0x7, 0x8f,
-    0x81, 0xef, 0xf8, 0x7f, 0xff, 0x1f, 0x87, 0xe7,
-    0xc0, 0x79, 0xe0, 0x1f, 0x0, 0x3, 0xc0, 0x0,
-    0xf0, 0x0, 0x3c, 0x0, 0xf, 0x0, 0x3, 0xc0,
-    0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf, 0xf0, 0x3,
-    0xde, 0x1, 0xe7, 0x80, 0x78, 0xf8, 0x7e, 0x3f,
-    0xff, 0x3, 0xff, 0x80, 0x3f, 0x0,
-
-    /* U+0036 "6" */
-    0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0x78, 0x0,
-    0xf, 0x0, 0x1, 0xe0, 0x0, 0x1e, 0x0, 0x3,
-    0xc0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0x70,
-    0x0, 0xf, 0x0, 0x1, 0xe7, 0xc0, 0x1f, 0xff,
-    0x3, 0xff, 0xfc, 0x3f, 0xf, 0xc7, 0xc0, 0x3e,
-    0x78, 0x1, 0xe7, 0x80, 0x1f, 0xf0, 0x0, 0xff,
-    0x0, 0xf, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf0,
-    0x0, 0xff, 0x0, 0xf, 0xf8, 0x1, 0xe7, 0x80,
-    0x1e, 0x7c, 0x3, 0xe3, 0xf0, 0xfc, 0x1f, 0xff,
-    0x80, 0xff, 0xf0, 0x1, 0xf8, 0x0,
-
-    /* U+0037 "7" */
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x0, 0x1e, 0xf0, 0x1, 0xef, 0x0, 0x1e, 0xf0,
-    0x3, 0xcf, 0x0, 0x3c, 0x0, 0x3, 0x80, 0x0,
-    0x78, 0x0, 0x7, 0x80, 0x0, 0xf0, 0x0, 0xf,
-    0x0, 0x0, 0xf0, 0x0, 0x1e, 0x0, 0x1, 0xe0,
-    0x0, 0x3c, 0x0, 0x3, 0xc0, 0x0, 0x3c, 0x0,
-    0x7, 0x80, 0x0, 0x78, 0x0, 0x7, 0x80, 0x0,
-    0xf0, 0x0, 0xf, 0x0, 0x1, 0xe0, 0x0, 0x1e,
-    0x0, 0x1, 0xe0, 0x0, 0x3c, 0x0, 0x3, 0xc0,
-    0x0, 0x7c, 0x0, 0x7, 0x80, 0x0,
-
-    /* U+0038 "8" */
-    0x1, 0xf8, 0x0, 0xff, 0xf0, 0x1f, 0xff, 0x83,
-    0xf0, 0xfc, 0x3c, 0x3, 0xc7, 0xc0, 0x3e, 0x78,
-    0x1, 0xe7, 0x80, 0x1e, 0x78, 0x1, 0xe7, 0x80,
-    0x1e, 0x3c, 0x3, 0xc3, 0xe0, 0x7c, 0x1f, 0xf,
-    0x80, 0xff, 0xf0, 0x3, 0xfc, 0x0, 0x7f, 0xe0,
-    0xf, 0xff, 0x3, 0xe0, 0x7c, 0x3c, 0x3, 0xc7,
-    0x80, 0x1e, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf0,
-    0x0, 0xff, 0x0, 0xf, 0xf0, 0x0, 0xff, 0x80,
-    0x1f, 0x7c, 0x3, 0xe7, 0xe0, 0x7e, 0x3f, 0xff,
-    0xc0, 0xff, 0xf0, 0x3, 0xfc, 0x0,
-
-    /* U+0039 "9" */
-    0x3, 0xf8, 0x0, 0xff, 0xf0, 0x1f, 0xff, 0x83,
-    0xe0, 0xfc, 0x7c, 0x3, 0xe7, 0x80, 0x1e, 0xf8,
-    0x1, 0xff, 0x0, 0xf, 0xf0, 0x0, 0xff, 0x0,
-    0xf, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf8, 0x1,
-    0xf7, 0x80, 0x1e, 0x7c, 0x3, 0xe3, 0xe0, 0x7e,
-    0x3f, 0xff, 0xc1, 0xff, 0xfc, 0x7, 0xe7, 0x80,
-    0x0, 0xf8, 0x0, 0xf, 0x0, 0x1, 0xe0, 0x0,
-    0x1e, 0x0, 0x3, 0xc0, 0x0, 0x3c, 0x0, 0x7,
-    0x80, 0x0, 0xf8, 0x0, 0xf, 0x0, 0x1, 0xe0,
-    0x0, 0x1e, 0x0, 0x3, 0xc0, 0x0,
-
-    /* U+003A ":" */
-    0x7d, 0xff, 0xff, 0xff, 0xef, 0x80, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
-    0xf7, 0xff, 0xff, 0xff, 0xbe
-};
-
-
-/*---------------------
- *  GLYPH DESCRIPTION
- *--------------------*/
-
-static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
-    {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
-    {.bitmap_index = 0, .adv_w = 403, .box_w = 24, .box_h = 31, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 93, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 167, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 4, .ofs_y = 0},
-    {.bitmap_index = 241, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 315, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 389, .adv_w = 403, .box_w = 18, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 459, .adv_w = 403, .box_w = 18, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 529, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 607, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 685, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 763, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 841, .adv_w = 403, .box_w = 7, .box_h = 24, .ofs_x = 9, .ofs_y = 0}
-};
-
-/*---------------------
- *  CHARACTER MAPPING
- *--------------------*/
-
-
-
-/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
-    {
-        .range_start = 37, .range_length = 1, .glyph_id_start = 1,
-        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
-    },
-    {
-        .range_start = 48, .range_length = 11, .glyph_id_start = 2,
-        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
-    }
-};
-
-
-
-/*--------------------
- *  ALL CUSTOM DATA
- *--------------------*/
-
-#if LV_VERSION_CHECK(8, 0, 0)
-/*Store all the custom data of the font*/
-static  lv_font_fmt_txt_glyph_cache_t cache;
-static const lv_font_fmt_txt_dsc_t font_dsc = {
-#else
-static lv_font_fmt_txt_dsc_t font_dsc = {
-#endif
-    .glyph_bitmap = glyph_bitmap,
-    .glyph_dsc = glyph_dsc,
-    .cmaps = cmaps,
-    .kern_dsc = NULL,
-    .kern_scale = 0,
-    .cmap_num = 2,
-    .bpp = 1,
-    .kern_classes = 0,
-    .bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
-    .cache = &cache
-#endif
-};
-
-
-/*-----------------
- *  PUBLIC FONT
- *----------------*/
-
-/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
-const lv_font_t jetbrains_mono_42 = {
-#else
-lv_font_t jetbrains_mono_42 = {
-#endif
-    .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt,    /*Function pointer to get glyph's data*/
-    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
-    .line_height = 31,          /*The maximum line height required by the font*/
-    .base_line = 0,             /*Baseline measured from the bottom of the line*/
-#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
-    .subpx = LV_FONT_SUBPX_NONE,
-#endif
-#if LV_VERSION_CHECK(7, 4, 0)
-    .underline_position = -7,
-    .underline_thickness = 2,
-#endif
-    .dsc = &font_dsc           /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
-};
-
-
-
-#endif /*#if JETBRAINS_MONO_42*/
-
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index 1eb36999..7e38b3f4 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -49,7 +49,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
     {Symbols::stopWatch, Apps::StopWatch},
     {Symbols::music, Apps::Music},
     {Symbols::map, Apps::Navigation},
-    {Symbols::shoe, Apps::Steps},
+    {Symbols::shoe, Apps::Motion},
     {Symbols::heartBeat, Apps::HeartRate},
     {"", Apps::None},
   }};
@@ -62,7 +62,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
     {Symbols::paintbrush, Apps::Paint},
     {Symbols::paddle, Apps::Paddle},
     {"2", Apps::Twos},
-    {"M", Apps::Motion},
+    {"", Apps::None},
     {"", Apps::None},
     {"", Apps::None},
   }};
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 14299840..e0c1f62b 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -14,6 +14,7 @@
 #include "../DisplayApp.h"
 #include "WatchFaceDigital.h"
 #include "WatchFaceAnalog.h"
+#include "PineTimeStyle.h"
 
 using namespace Pinetime::Applications::Screens;
 
@@ -42,6 +43,9 @@ Clock::Clock(DisplayApp* app,
                [this]() -> std::unique_ptr<Screen> {
                  return WatchFaceAnalogScreen();
                },
+               [this]() -> std::unique_ptr<Screen> {
+                 return PineTimeStyleScreen();
+               },
                // Examples for more watch faces
                //[this]() -> std::unique_ptr<Screen> { return WatchFaceMinimalScreen(); },
                //[this]() -> std::unique_ptr<Screen> { return WatchFaceCustomScreen(); }
@@ -80,6 +84,16 @@ std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
     app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
 }
 
+std::unique_ptr<Screen> Clock::PineTimeStyleScreen() {
+  return std::make_unique<Screens::PineTimeStyle>(app,
+                                                     dateTimeController,
+                                                     batteryController,
+                                                     bleController,
+                                                     notificatioManager,
+                                                     settingsController,
+                                                     heartRateController);
+}
+
 /*
 // Examples for more watch faces
 std::unique_ptr<Screen> Clock::WatchFaceMinimalScreen() {
@@ -91,4 +105,4 @@ std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {
   return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager,
 settingsController);
 }
-*/
\ No newline at end of file
+*/
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 9879985f..920d58bb 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -47,9 +47,10 @@ namespace Pinetime {
         Controllers::HeartRateController& heartRateController;
         Controllers::MotionController& motionController;
 
-        ScreenList<2> screens;
+        ScreenList<3> screens;
         std::unique_ptr<Screen> WatchFaceDigitalScreen();
         std::unique_ptr<Screen> WatchFaceAnalogScreen();
+        std::unique_ptr<Screen> PineTimeStyleScreen();
 
         // Examples for more watch faces
         // std::unique_ptr<Screen> WatchFaceMinimalScreen();
diff --git a/src/displayapp/screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp
index ad37a3df..873a22f5 100644
--- a/src/displayapp/screens/FirmwareValidation.cpp
+++ b/src/displayapp/screens/FirmwareValidation.cpp
@@ -27,17 +27,6 @@ FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp* app,
   sprintf(version, "%ld.%ld.%ld", Version::Major(), Version::Minor(), Version::Patch());
   lv_label_set_text(labelVersionValue, version);
 
-  labelShortRefInfo = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_align(labelShortRefInfo, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 25);
-  lv_label_set_text(labelShortRefInfo, "ShortRef : ");
-  lv_label_set_align(labelShortRefInfo, LV_LABEL_ALIGN_LEFT);
-
-  labelShortRefValue = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_align(labelShortRefValue, labelShortRefInfo, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
-  lv_label_set_recolor(labelShortRefValue, true);
-  sprintf(shortref, "%s", Version::GitCommitHash());
-  lv_label_set_text(labelShortRefValue, shortref);
-
   labelIsValidated = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(labelIsValidated, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 50);
   lv_label_set_recolor(labelIsValidated, true);
diff --git a/src/displayapp/screens/FirmwareValidation.h b/src/displayapp/screens/FirmwareValidation.h
index 303c2154..67662fd9 100644
--- a/src/displayapp/screens/FirmwareValidation.h
+++ b/src/displayapp/screens/FirmwareValidation.h
@@ -25,10 +25,7 @@ namespace Pinetime {
 
         lv_obj_t* labelVersionInfo;
         lv_obj_t* labelVersionValue;
-        lv_obj_t* labelShortRefInfo;
-        lv_obj_t* labelShortRefValue;
         char version[9];
-        char shortref[9];
         lv_obj_t* labelIsValidated;
         lv_obj_t* buttonValidate;
         lv_obj_t* labelButtonValidate;
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp
index a8bb3c18..e7196267 100644
--- a/src/displayapp/screens/Motion.cpp
+++ b/src/displayapp/screens/Motion.cpp
@@ -3,6 +3,8 @@
 #include "../DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
+extern lv_font_t jetbrains_mono_extrabold_compressed;
+extern lv_font_t jetbrains_mono_bold_20;
 
 Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionController& motionController)
   : Screen(app), motionController {motionController} {
@@ -27,16 +29,13 @@ Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionContr
   lv_chart_init_points(chart, ser3, 0);
   lv_chart_refresh(chart); /*Required after direct set*/
 
-  label = lv_label_create(lv_scr_act(), NULL);
-  lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", 0, 0, 0);
-  lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
-  lv_label_set_recolor(label, true);
-  
   labelStep = lv_label_create(lv_scr_act(), NULL);
   lv_obj_align(labelStep, chart, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
-  lv_label_set_text(labelStep, "Steps ---");
+  lv_label_set_text(labelStep, "Steps: ");
 
+  labelStepValue = lv_label_create(lv_scr_act(), NULL);
+  lv_obj_align(labelStepValue, labelStep, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
+  lv_label_set_text(labelStepValue, "-");
 }
 
 Motion::~Motion() {
@@ -48,10 +47,8 @@ bool Motion::Refresh() {
   lv_chart_set_next(chart, ser2, motionController.Y());
   lv_chart_set_next(chart, ser3, motionController.Z());
 
-  lv_label_set_text_fmt(labelStep, "Steps %lu", motionController.NbSteps());
-
-  lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", motionController.X() / 0x10, motionController.Y() / 0x10, motionController.Z() / 0x10);
-  lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
+  snprintf(nbStepsBuffer, nbStepsBufferSize, "%lu", motionController.NbSteps());
+  lv_label_set_text(labelStepValue, nbStepsBuffer);
 
   return running;
 }
diff --git a/src/displayapp/screens/Motion.h b/src/displayapp/screens/Motion.h
index 132b20ec..11007866 100644
--- a/src/displayapp/screens/Motion.h
+++ b/src/displayapp/screens/Motion.h
@@ -26,9 +26,9 @@ namespace Pinetime {
         lv_chart_series_t* ser1;
         lv_chart_series_t* ser2;
         lv_chart_series_t* ser3;
-        lv_obj_t* label;
 
         lv_obj_t* labelStep;
+        lv_obj_t* labelStepValue;
         static constexpr uint8_t nbStepsBufferSize = 9;
         char nbStepsBuffer[nbStepsBufferSize + 1];
         bool running = true;
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 1f113750..f0fd2f66 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -176,17 +176,7 @@ Notifications::NotificationItem::NotificationItem(const char* title,
   lv_obj_set_style_local_text_color(alert_type, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x888888));
   if (title == nullptr)
     title = "Notification";
-  char* pchar;
-  pchar = strchr(title, '\n');
-  while (pchar != nullptr) {
-    *pchar = ' ';
-    pchar =
-    pchar = strchr(pchar + 1, '\n');
-  }
   lv_label_set_text(alert_type, title);
-  lv_label_set_long_mode(alert_type, LV_LABEL_LONG_SROLL_CIRC);
-  lv_label_set_anim_speed(alert_type, 3);
-  lv_obj_set_width(alert_type, 180);
   lv_obj_align(alert_type, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 16);
 
   /////////
diff --git a/src/displayapp/screens/Steps.cpp b/src/displayapp/screens/Steps.cpp
deleted file mode 100644
index b485c975..00000000
--- a/src/displayapp/screens/Steps.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "Steps.h"
-#include <lvgl/lvgl.h>
-#include "../DisplayApp.h"
-#include "Symbols.h"
-
-using namespace Pinetime::Applications::Screens;
-
-Steps::Steps(
-    Pinetime::Applications::DisplayApp *app, 
-    Controllers::MotionController& motionController,
-    Controllers::Settings &settingsController) 
-      : Screen(app), 
-      motionController{motionController},
-      settingsController{settingsController} {
-
-  stepsArc = lv_arc_create(lv_scr_act(), nullptr);
-
-  lv_obj_set_style_local_bg_opa(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, LV_OPA_0);  
-  lv_obj_set_style_local_border_width(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, 2);  
-  lv_obj_set_style_local_radius(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, 0);  
-  lv_obj_set_style_local_line_color(stepsArc, LV_ARC_PART_INDIC, LV_STATE_DEFAULT, lv_color_hex(0x0000FF));  
-  lv_arc_set_end_angle(stepsArc, 200);
-  lv_obj_set_size(stepsArc, 220, 220);
-  lv_arc_set_range(stepsArc, 0, 500);
-  lv_obj_align(stepsArc, nullptr, LV_ALIGN_CENTER, 0, 0);
-
-  stepsCount = motionController.NbSteps();
-
-  lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
-
-  lSteps = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
-  lv_obj_set_style_local_text_font(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);   
-  lv_label_set_text_fmt(lSteps, "%li", stepsCount); 
-  lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
-
-  lv_obj_t * lstepsL = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(lstepsL, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
-  lv_label_set_text_static(lstepsL, "Steps"); 
-  lv_obj_align(lstepsL, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
-
-  lv_obj_t * lstepsGoal = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(lstepsGoal, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_CYAN);
-  lv_label_set_text_fmt(lstepsGoal,"Goal\n%i", settingsController.GetStepsGoal()); 
-  lv_label_set_align(lstepsGoal, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(lstepsGoal, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 60);
-
-  lv_obj_t * backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
-  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
-  lv_obj_set_size(backgroundLabel, 240, 240);
-  lv_obj_set_pos(backgroundLabel, 0, 0);
-  lv_label_set_text_static(backgroundLabel, "");
-
-}
-
-Steps::~Steps() {
-  lv_obj_clean(lv_scr_act());
-}
-
-bool Steps::Refresh() {
-  
-  stepsCount = motionController.NbSteps();
-
-  lv_label_set_text_fmt(lSteps,"%li", stepsCount);
-  lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
-     
-  lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
-
-  return running;
-}
-
-
diff --git a/src/displayapp/screens/Steps.h b/src/displayapp/screens/Steps.h
deleted file mode 100644
index 9c135e26..00000000
--- a/src/displayapp/screens/Steps.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <lvgl/lvgl.h>
-#include "Screen.h"
-#include <components/motion/MotionController.h>
-
-namespace Pinetime {
-
-  namespace Controllers {
-    class Settings;
-  }
-
-  namespace Applications {
-    namespace Screens {
-
-      class Steps : public Screen {
-        public:
-          Steps(DisplayApp* app, Controllers::MotionController& motionController, Controllers::Settings &settingsController);
-          ~Steps() override;
-
-          bool Refresh() override;
-          
-
-        private:          
-
-          Controllers::MotionController& motionController;
-          Controllers::Settings& settingsController;
-
-          lv_obj_t * lSteps;
-          lv_obj_t * lStepsIcon;
-          lv_obj_t * stepsArc;
-
-          uint32_t stepsCount;
-
-      };
-    }
-  }
-}
diff --git a/src/displayapp/screens/StopWatch.cpp b/src/displayapp/screens/StopWatch.cpp
index d7cd20c3..e06981af 100644
--- a/src/displayapp/screens/StopWatch.cpp
+++ b/src/displayapp/screens/StopWatch.cpp
@@ -115,9 +115,8 @@ bool StopWatch::Refresh() {
     // Init state when an user first opens the app
     // and when a stop/reset button is pressed
     case States::Init: {
-      if (btnStopLap != nullptr) {
+      if (btnStopLap) {
         lv_obj_del(btnStopLap);
-        btnStopLap = nullptr;
       }
       // The initial default value
       lv_label_set_text(time, "00:00");
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index e4ef6911..f6e8d61a 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -69,14 +69,12 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen1() {
   lv_label_set_text_fmt(label,
                         "#FFFF00 InfiniTime#\n\n"
                         "#444444 Version# %ld.%ld.%ld\n\n"
-                        "#444444 Short Ref# %s\n\n"
                         "#444444 Build date#\n"
-                        "%s\n"
-                        "%s\n",
+                        "\t%s\n"
+                        "\t%s\n",
                         Version::Major(),
                         Version::Minor(),
                         Version::Patch(),
-                        Version::GitCommitHash(),
                         __DATE__,
                         __TIME__);
   lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
@@ -244,4 +242,4 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen5() {
   lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
   lv_obj_align(label, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
   return std::unique_ptr<Screen>(new Screens::Label(4, 5, app, label));
-}
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingSteps.cpp b/src/displayapp/screens/settings/SettingSteps.cpp
deleted file mode 100644
index b7c024f1..00000000
--- a/src/displayapp/screens/settings/SettingSteps.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "SettingSteps.h"
-#include <lvgl/lvgl.h>
-#include "displayapp/DisplayApp.h"
-#include "displayapp/screens/Symbols.h"
-
-using namespace Pinetime::Applications::Screens;
-
-namespace {
-  static void event_handler(lv_obj_t * obj, lv_event_t event) {
-    SettingSteps* screen = static_cast<SettingSteps *>(obj->user_data);
-    screen->UpdateSelected(obj, event);
-  }
-}
-
-SettingSteps::SettingSteps(
-  Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
-  Screen(app),
-  settingsController{settingsController}
-{
-
-  lv_obj_t * container1 = lv_cont_create(lv_scr_act(), nullptr);
-
-  //lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
-  lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
-  lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
-  lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
-  lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
-  lv_obj_set_pos(container1, 30, 60);
-  lv_obj_set_width(container1, LV_HOR_RES - 50);
-  lv_obj_set_height(container1, LV_VER_RES - 60);
-  lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
-
-  lv_obj_t * title = lv_label_create(lv_scr_act(), NULL);  
-  lv_label_set_text_static(title,"Daily steps goal");
-  lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15);
-
-  lv_obj_t * icon = lv_label_create(lv_scr_act(), NULL);
-  lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
-  
-  lv_label_set_text_static(icon, Symbols::shoe);
-  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
-
-
-  stepValue = lv_label_create(lv_scr_act(), NULL);
-  lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
-  lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
-  lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
-
-  btnPlus = lv_btn_create(lv_scr_act(), NULL);
-  btnPlus->user_data = this;
-  lv_obj_set_size(btnPlus, 80, 50);
-  lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
-  lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
-  lv_obj_set_event_cb(btnPlus, event_handler);
-
-  btnMinus = lv_btn_create(lv_scr_act(), NULL);
-  btnMinus->user_data = this;
-  lv_obj_set_size(btnMinus, 80, 50);
-  lv_obj_set_event_cb(btnMinus, event_handler);
-  lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
-  lv_obj_set_style_local_value_str(btnMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
-
-}
-
-SettingSteps::~SettingSteps() {
-  lv_obj_clean(lv_scr_act());
-  settingsController.SaveSettings();
-}
-
-bool SettingSteps::Refresh() {
-  return running;
-}
-
-
-void SettingSteps::UpdateSelected(lv_obj_t *object, lv_event_t event) {
-  uint32_t value = settingsController.GetStepsGoal();
-  if(object == btnPlus && (event == LV_EVENT_PRESSED)) {
-    value += 1000;
-    if ( value <= 500000 ) {
-      settingsController.SetStepsGoal(value);
-      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
-      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
-    }
-  }
-
-  if(object == btnMinus && (event == LV_EVENT_PRESSED)) {
-    value -= 1000;
-    if ( value >= 1000 ) {
-      settingsController.SetStepsGoal(value);
-      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
-      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingSteps.h b/src/displayapp/screens/settings/SettingSteps.h
deleted file mode 100644
index 0a4c2056..00000000
--- a/src/displayapp/screens/settings/SettingSteps.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <lvgl/lvgl.h>
-#include "components/settings/Settings.h"
-#include "displayapp/screens/Screen.h"
-
-namespace Pinetime {
-
-  namespace Applications {
-    namespace Screens {
-
-      class SettingSteps : public Screen{
-        public:
-          SettingSteps(DisplayApp* app, Pinetime::Controllers::Settings &settingsController);
-          ~SettingSteps() override;
-
-          bool Refresh() override;
-          void UpdateSelected(lv_obj_t *object, lv_event_t event);
-         
-        private:          
-
-          Controllers::Settings& settingsController;
-
-          lv_obj_t * stepValue;
-          lv_obj_t * btnPlus;
-          lv_obj_t * btnMinus;
-          
-      };
-    }
-  }
-}
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index 457cebf6..3914a048 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -58,6 +58,15 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pine
     lv_checkbox_set_checked(cbOption[optionsTotal], true);
   }
 
+  optionsTotal++;
+    cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
+  lv_checkbox_set_text_static(cbOption[optionsTotal], " PineTimeStyle");
+  cbOption[optionsTotal]->user_data = this;
+  lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
+  if (settingsController.GetClockFace() == 2) {
+    lv_checkbox_set_checked(cbOption[optionsTotal], true);
+  }
+
   optionsTotal++;
 }
 
@@ -81,4 +90,4 @@ void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/settings/SettingWatchFace.h b/src/displayapp/screens/settings/SettingWatchFace.h
index 1930a228..6f65d692 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.h
+++ b/src/displayapp/screens/settings/SettingWatchFace.h
@@ -21,7 +21,7 @@ namespace Pinetime {
       private:
         Controllers::Settings& settingsController;
         uint8_t optionsTotal;
-        lv_obj_t* cbOption[2];
+        lv_obj_t* cbOption[3];
       };
     }
   }
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index 2c72c832..e24be3d7 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -44,7 +44,9 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
     {Symbols::clock, "Wake Up", Apps::SettingWakeUp},
     {Symbols::clock, "Time format", Apps::SettingTimeFormat},
     {Symbols::clock, "Watch face", Apps::SettingWatchFace},
-  }};
+  }
+
+  };
 
   return std::unique_ptr<Screen>(new Screens::List(0, 2, app, settingsController, applications));
 }
@@ -52,11 +54,13 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
 std::unique_ptr<Screen> Settings::CreateScreen2() {
 
   std::array<Screens::List::Applications, 4> applications {{
-    {Symbols::shoe, "Steps", Apps::SettingSteps},
     {Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
     {Symbols::check, "Firmware", Apps::FirmwareValidation},
     {Symbols::list, "About", Apps::SysInfo},
-  }};
+    {"", "", Apps::None},
+  }
+
+  };
 
   return std::unique_ptr<Screen>(new Screens::List(1, 2, app, settingsController, applications));
 }
-- 
cgit v1.2.3-70-g09d2


From a4968b502990f4a9e848c5240be2ee73348dd38e Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 18 May 2021 15:25:38 +0200
Subject: PineTimeStyle

---
 src/displayapp/fonts/open_sans_light.c   | 1261 ++++++++++++++++++++++++++++++
 src/displayapp/screens/PineTimeStyle.cpp |  294 +++++++
 src/displayapp/screens/PineTimeStyle.h   |   83 ++
 3 files changed, 1638 insertions(+)
 create mode 100644 src/displayapp/fonts/open_sans_light.c
 create mode 100644 src/displayapp/screens/PineTimeStyle.cpp
 create mode 100644 src/displayapp/screens/PineTimeStyle.h

(limited to 'src/displayapp')

diff --git a/src/displayapp/fonts/open_sans_light.c b/src/displayapp/fonts/open_sans_light.c
new file mode 100644
index 00000000..15f0ddf6
--- /dev/null
+++ b/src/displayapp/fonts/open_sans_light.c
@@ -0,0 +1,1261 @@
+/*******************************************************************************
+ * Size: 150 px
+ * Bpp: 1
+ * Opts: 
+ ******************************************************************************/
+
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
+
+#ifndef OPEN_SANS_LIGHT
+#define OPEN_SANS_LIGHT 1
+#endif
+
+#if OPEN_SANS_LIGHT
+
+/*-----------------
+ *    BITMAPS
+ *----------------*/
+
+/*Store the image of the glyphs*/
+static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
+    /* U+0030 "0" */
+    0x0, 0x0, 0x0, 0xf, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xff, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xff, 0xff,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0xff,
+    0xff, 0xf8, 0x0, 0x0, 0x0, 0xf, 0xff, 0xe0,
+    0x3, 0xff, 0xf0, 0x0, 0x0, 0x0, 0xff, 0xf8,
+    0x0, 0x3, 0xff, 0xc0, 0x0, 0x0, 0xf, 0xfe,
+    0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0, 0xff,
+    0xe0, 0x0, 0x0, 0xf, 0xfc, 0x0, 0x0, 0x7,
+    0xfe, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0,
+    0x7f, 0xc0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0,
+    0x7, 0xfc, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0,
+    0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0, 0xf, 0xf8,
+    0x0, 0x3, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xc0, 0x0, 0x3f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x0, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xfc, 0x0, 0x1f, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xe0, 0x0, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x80, 0xf, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x0, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xe0, 0x3, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x3f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0xf,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc,
+    0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x81, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xfc, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xe0, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x87, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x3f, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x1f, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xf8, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xe7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x3f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf9,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xcf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xfe, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xbf, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfd, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xff, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xff, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xff, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xff, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xff, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfe, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xe7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf9, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xcf, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xfe, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xf3, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x9f, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x7f,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xe3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x87, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xfc, 0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xe0, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xfe, 0x7, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xf0, 0x3f, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x80, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xfc, 0x7, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xc0, 0x3f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0, 0x7,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0,
+    0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0x80, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xe0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfe, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xf0, 0x0, 0x1f, 0xf0, 0x0, 0x0,
+    0x0, 0x1, 0xff, 0x0, 0x0, 0x7f, 0xc0, 0x0,
+    0x0, 0x0, 0x1f, 0xf0, 0x0, 0x1, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0xf, 0xf8,
+    0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x3f,
+    0xf0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x0,
+    0xff, 0xc0, 0x0, 0x0, 0x1f, 0xf8, 0x0, 0x0,
+    0x3, 0xff, 0x80, 0x0, 0x3, 0xff, 0x80, 0x0,
+    0x0, 0xf, 0xff, 0x0, 0x0, 0x7f, 0xf8, 0x0,
+    0x0, 0x0, 0x3f, 0xff, 0x0, 0x1f, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff, 0xf8,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xff, 0xff,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xff,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff,
+    0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0xc0, 0x0, 0x0, 0x0,
+
+    /* U+0031 "1" */
+    0x0, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x0,
+    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfe, 0x0, 0x0,
+    0xf, 0xff, 0xc0, 0x0, 0x3, 0xff, 0xf8, 0x0,
+    0x0, 0xff, 0xbf, 0x0, 0x0, 0x7f, 0xe7, 0xe0,
+    0x0, 0x1f, 0xf8, 0xfc, 0x0, 0x7, 0xfe, 0x1f,
+    0x80, 0x3, 0xff, 0x83, 0xf0, 0x0, 0xff, 0xc0,
+    0xfe, 0x0, 0x3f, 0xf0, 0x1f, 0xc0, 0x1f, 0xfc,
+    0x3, 0xf8, 0x7, 0xff, 0x0, 0x7f, 0x1, 0xff,
+    0x80, 0xf, 0xe0, 0xff, 0xe0, 0x1, 0xfc, 0x3f,
+    0xf8, 0x0, 0x3f, 0x8f, 0xfc, 0x0, 0x7, 0xf7,
+    0xff, 0x0, 0x0, 0xff, 0xff, 0xc0, 0x0, 0x1f,
+    0xff, 0xf0, 0x0, 0x3, 0xfb, 0xf8, 0x0, 0x0,
+    0x7f, 0x3e, 0x0, 0x0, 0xf, 0xe3, 0x80, 0x0,
+    0x1, 0xfc, 0x20, 0x0, 0x0, 0x3f, 0x80, 0x0,
+    0x0, 0x7, 0xf0, 0x0, 0x0, 0x0, 0xfe, 0x0,
+    0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x3, 0xf8,
+    0x0, 0x0, 0x0, 0x7f, 0x0, 0x0, 0x0, 0xf,
+    0xe0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0,
+    0x3f, 0x80, 0x0, 0x0, 0x7, 0xf0, 0x0, 0x0,
+    0x0, 0xfe, 0x0, 0x0, 0x0, 0x1f, 0xc0, 0x0,
+    0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x7f, 0x0,
+    0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x1, 0xfc,
+    0x0, 0x0, 0x0, 0x3f, 0x80, 0x0, 0x0, 0x7,
+    0xf0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x0, 0x0,
+    0x1f, 0xc0, 0x0, 0x0, 0x3, 0xf8, 0x0, 0x0,
+    0x0, 0x7f, 0x0, 0x0, 0x0, 0xf, 0xe0, 0x0,
+    0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x3f, 0x80,
+    0x0, 0x0, 0x7, 0xf0, 0x0, 0x0, 0x0, 0xfe,
+    0x0, 0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x3,
+    0xf8, 0x0, 0x0, 0x0, 0x7f, 0x0, 0x0, 0x0,
+    0xf, 0xe0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x0,
+    0x0, 0x3f, 0x80, 0x0, 0x0, 0x7, 0xf0, 0x0,
+    0x0, 0x0, 0xfe, 0x0, 0x0, 0x0, 0x1f, 0xc0,
+    0x0, 0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x7f,
+    0x0, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x1,
+    0xfc, 0x0, 0x0, 0x0, 0x3f, 0x80, 0x0, 0x0,
+    0x7, 0xf0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x0,
+    0x0, 0x1f, 0xc0, 0x0, 0x0, 0x3, 0xf8, 0x0,
+    0x0, 0x0, 0x7f, 0x0, 0x0, 0x0, 0xf, 0xe0,
+    0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x3f,
+    0x80, 0x0, 0x0, 0x7, 0xf0, 0x0, 0x0, 0x0,
+    0xfe, 0x0, 0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0,
+    0x3, 0xf8, 0x0, 0x0, 0x0, 0x7f, 0x0, 0x0,
+    0x0, 0xf, 0xe0, 0x0, 0x0, 0x1, 0xfc, 0x0,
+    0x0, 0x0, 0x3f, 0x80, 0x0, 0x0, 0x7, 0xf0,
+    0x0, 0x0, 0x0, 0xfe, 0x0, 0x0, 0x0, 0x1f,
+    0xc0, 0x0, 0x0, 0x3, 0xf8, 0x0, 0x0, 0x0,
+    0x7f, 0x0, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0,
+    0x1, 0xfc, 0x0, 0x0, 0x0, 0x3f, 0x80, 0x0,
+    0x0, 0x7, 0xf0, 0x0, 0x0, 0x0, 0xfe, 0x0,
+    0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x3, 0xf8,
+    0x0, 0x0, 0x0, 0x7f, 0x0, 0x0, 0x0, 0xf,
+    0xe0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0,
+    0x3f, 0x80, 0x0, 0x0, 0x7, 0xf0, 0x0, 0x0,
+    0x0, 0xfe, 0x0, 0x0, 0x0, 0x1f, 0xc0, 0x0,
+    0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x7f, 0x0,
+    0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x1, 0xfc,
+    0x0, 0x0, 0x0, 0x3f, 0x80,
+
+    /* U+0032 "2" */
+    0x0, 0x0, 0x0, 0x7f, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0xff, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0xf0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff, 0xfc,
+    0x0, 0x0, 0x0, 0x7f, 0xff, 0xff, 0xff, 0xff,
+    0xe0, 0x0, 0x0, 0x1f, 0xff, 0xf0, 0x1, 0xff,
+    0xfe, 0x0, 0x0, 0xf, 0xff, 0xc0, 0x0, 0x3,
+    0xff, 0xe0, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x0,
+    0x1f, 0xfe, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0,
+    0x0, 0xff, 0xe0, 0x0, 0x7f, 0xf0, 0x0, 0x0,
+    0x0, 0xf, 0xfe, 0x0, 0xf, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0xc0, 0x0, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xfc, 0x0, 0xf, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xc0, 0x1, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x10, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xf0,
+
+    /* U+0033 "3" */
+    0x0, 0x0, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xff, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x1f, 0xff, 0xff, 0xff, 0xff,
+    0x0, 0x0, 0x0, 0xf, 0xff, 0xff, 0xff, 0xff,
+    0xf8, 0x0, 0x0, 0x3, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xe0, 0x0, 0x0, 0xff, 0xff, 0xe0, 0x0,
+    0xff, 0xff, 0x0, 0x0, 0x3f, 0xff, 0xc0, 0x0,
+    0x0, 0xff, 0xf8, 0x0, 0x7, 0xff, 0xe0, 0x0,
+    0x0, 0x3, 0xff, 0xc0, 0x1, 0xff, 0xf0, 0x0,
+    0x0, 0x0, 0xf, 0xfe, 0x0, 0x3f, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x7, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x3f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xfc, 0x1, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xc0, 0xe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfe, 0x0,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xff, 0xff, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xff, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff,
+    0xff, 0xc0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xff,
+    0xff, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xff, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xff, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfe,
+    0x8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xc0, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xf8, 0xf, 0x80, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xff, 0xe0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xfc, 0x0, 0xff, 0xfe, 0x0, 0x0, 0x0,
+    0x7f, 0xff, 0x80, 0xf, 0xff, 0xff, 0x80, 0x0,
+    0xff, 0xff, 0xe0, 0x0, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xfc, 0x0, 0x1, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0x0, 0x0, 0x7, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xc0, 0x0, 0x0, 0xf, 0xff,
+    0xff, 0xff, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0xff, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0xff, 0x80, 0x0, 0x0, 0x0,
+
+    /* U+0034 "4" */
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfb, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfd, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfc,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfc, 0x7e, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xfe, 0x3f, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x1f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe,
+    0xf, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0x7, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x3, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x1, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0x80, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0x80, 0x7e, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x3f, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xc0, 0x1f,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xc0, 0xf, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xc0, 0x7, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe0, 0x3, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x1,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xe0, 0x0, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x7e, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xf0, 0x0, 0x3f, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf0, 0x0,
+    0x1f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xf8, 0x0, 0xf, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xf8, 0x0, 0x7, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xf8, 0x0, 0x3, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xf8, 0x0,
+    0x1, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfc, 0x0, 0x0, 0x7e, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x3f,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0,
+    0x0, 0x1f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xfe, 0x0, 0x0, 0xf, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xfe, 0x0, 0x0, 0x7, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x3,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0,
+    0x0, 0x1, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x0, 0x0, 0x0, 0x7e, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0,
+    0x3f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x1f, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0x80, 0x0, 0x0, 0xf, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x7, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0,
+    0x3, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xc0,
+    0x0, 0x0, 0x1, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x7e,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x3f, 0x0, 0x0, 0x0, 0x0, 0xf, 0xe0,
+    0x0, 0x0, 0x0, 0x1f, 0x80, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0xf, 0xc0, 0x0,
+    0x0, 0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x7,
+    0xe0, 0x0, 0x0, 0x0, 0x7, 0xf0, 0x0, 0x0,
+    0x0, 0x3, 0xf0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x1, 0xf8, 0x0, 0x0, 0x0,
+    0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0,
+    0x0, 0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x7e, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0x0, 0x0, 0x0, 0x3, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0x80, 0x0, 0x0,
+    0x3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xf, 0xc0,
+    0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xe0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xf0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xf8, 0x0, 0x0,
+    0x0, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfc,
+    0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7e, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0x0, 0x0, 0x0, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x80, 0x0,
+    0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xc0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xe0, 0x0, 0x0, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xf0, 0x0, 0x0, 0x3f,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x1, 0xf8, 0x0,
+    0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xfc, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7e, 0x0, 0x0, 0x1f, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0x80, 0x0, 0x0,
+
+    /* U+0035 "5" */
+    0x1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0,
+    0x0, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8,
+    0x0, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+    0x0, 0x7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x80, 0x1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xe0, 0x0, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xf8, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xfe, 0x0, 0x7f, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x3f, 0x8f, 0xff, 0xff, 0xff,
+    0x0, 0x0, 0x0, 0x1f, 0xff, 0xff, 0xff, 0xff,
+    0xfc, 0x0, 0x0, 0x7, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xc0, 0x0, 0x1, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xfc, 0x0, 0x0, 0x7f, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xc0, 0x0, 0xf, 0xff, 0xf0, 0x0,
+    0x3f, 0xff, 0xfc, 0x0, 0x1, 0xfe, 0x0, 0x0,
+    0x0, 0x7f, 0xff, 0x80, 0x0, 0x18, 0x0, 0x0,
+    0x0, 0x3, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xff, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0x3,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0,
+    0x3f, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xe0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf0,
+    0x3, 0xff, 0x80, 0x0, 0x0, 0x1, 0xff, 0xf8,
+    0x0, 0xff, 0xfc, 0x0, 0x0, 0x3, 0xff, 0xfc,
+    0x0, 0x3f, 0xff, 0xfc, 0x0, 0xf, 0xff, 0xfc,
+    0x0, 0xf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+    0x0, 0x0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+    0x0, 0x0, 0x7, 0xff, 0xff, 0xff, 0xff, 0xfe,
+    0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xff, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xc0,
+    0x0, 0x0, 0x0,
+
+    /* U+0036 "6" */
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0xff,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xff,
+    0xff, 0xe0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xff,
+    0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xff,
+    0xff, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x7, 0xff,
+    0xfc, 0x0, 0xf, 0xc0, 0x0, 0x0, 0x0, 0xff,
+    0xfe, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0xf,
+    0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0x0, 0x0, 0x3, 0xff,
+    0xe0, 0x0, 0x0, 0x3, 0xf8, 0x0, 0x1, 0xff,
+    0xff, 0xf0, 0x0, 0x0, 0x1f, 0xc0, 0x0, 0x7f,
+    0xff, 0xff, 0xf0, 0x0, 0x0, 0xfe, 0x0, 0xf,
+    0xff, 0xff, 0xff, 0xf0, 0x0, 0xf, 0xf0, 0x1,
+    0xff, 0xff, 0xff, 0xff, 0xc0, 0x0, 0x7f, 0x0,
+    0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x3, 0xf8,
+    0x3, 0xff, 0xf0, 0x1, 0xff, 0xfe, 0x0, 0x1f,
+    0xc0, 0x7f, 0xf8, 0x0, 0x0, 0xff, 0xf8, 0x0,
+    0xfe, 0x7, 0xfe, 0x0, 0x0, 0x1, 0xff, 0xe0,
+    0x7, 0xf0, 0x7f, 0xc0, 0x0, 0x0, 0x3, 0xff,
+    0x80, 0x3f, 0x87, 0xf8, 0x0, 0x0, 0x0, 0x7,
+    0xfe, 0x1, 0xfc, 0x7f, 0x80, 0x0, 0x0, 0x0,
+    0x1f, 0xf8, 0xf, 0xe7, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xe0, 0x7f, 0x7f, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xff, 0x3, 0xff, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xfc, 0x1f, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xf0, 0xff, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x8f, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x7f, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xf3, 0xff,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x9f,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc,
+    0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xf3, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x9f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3, 0xfc, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xe7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0xbf, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfd, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xef, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xfb, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xdf, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf7,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0x9f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe7, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xf8, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xc7, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x3f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x7, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xf8, 0x3f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xc1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x7,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0,
+    0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xf0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0x80, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xfc, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xc0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0xfe, 0x0, 0x1f, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xe0, 0x0, 0x7f, 0xc0, 0x0,
+    0x0, 0x0, 0x3, 0xfe, 0x0, 0x1, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0, 0x7, 0xfc,
+    0x0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x0, 0x3f,
+    0xf8, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0,
+    0xff, 0xe0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x0,
+    0x3, 0xff, 0xc0, 0x0, 0x0, 0x7f, 0xf0, 0x0,
+    0x0, 0xf, 0xff, 0x80, 0x0, 0x1f, 0xff, 0x0,
+    0x0, 0x0, 0x1f, 0xff, 0xc0, 0xf, 0xff, 0xf0,
+    0x0, 0x0, 0x0, 0x7f, 0xff, 0xff, 0xff, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff,
+    0xe0, 0x0, 0x0, 0x0, 0x3, 0xff, 0xff, 0xff,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xff,
+    0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff,
+    0xff, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xff, 0xe0, 0x0, 0x0, 0x0,
+
+    /* U+0037 "7" */
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0,
+
+    /* U+0038 "8" */
+    0x0, 0x0, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xff, 0xff, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xff, 0xff, 0xff, 0xfc,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0xff,
+    0xf0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xff,
+    0xff, 0xc0, 0x0, 0x0, 0xf, 0xff, 0xf0, 0x1,
+    0xff, 0xfe, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0,
+    0x1, 0xff, 0xf0, 0x0, 0x0, 0x3f, 0xf8, 0x0,
+    0x0, 0x3, 0xff, 0x80, 0x0, 0x7, 0xfe, 0x0,
+    0x0, 0x0, 0xf, 0xfc, 0x0, 0x0, 0xff, 0xc0,
+    0x0, 0x0, 0x0, 0x7f, 0xe0, 0x0, 0x1f, 0xf8,
+    0x0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x1, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0, 0x3f,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x7,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x7, 0xfc, 0x0,
+    0x7f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xc0,
+    0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x3, 0xfc,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xe0, 0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xfe, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x1f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x1, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xf0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0x1, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xf0, 0x1f, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x1, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x1f, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x1f,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xe0,
+    0xf, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xe0, 0x7, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xc0, 0x7, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xf8, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x80, 0x1, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xf0, 0x0, 0x1f, 0xf8, 0x0, 0x0,
+    0x0, 0x3, 0xfe, 0x0, 0x0, 0xff, 0xe0, 0x0,
+    0x0, 0x0, 0x7f, 0xc0, 0x0, 0x7, 0xff, 0x0,
+    0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x3f, 0xf8,
+    0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x1, 0xff,
+    0xe0, 0x0, 0x0, 0x7f, 0xe0, 0x0, 0x0, 0xf,
+    0xff, 0x80, 0x0, 0x1f, 0xfc, 0x0, 0x0, 0x0,
+    0x7f, 0xfe, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0,
+    0x1, 0xff, 0xf8, 0x0, 0xff, 0xe0, 0x0, 0x0,
+    0x0, 0xf, 0xff, 0xe0, 0x3f, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xff, 0x9f, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xff, 0xff, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xf, 0xff, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xff, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xff,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff, 0xe7,
+    0xff, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf8,
+    0xf, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x3f, 0xfe,
+    0x0, 0x3f, 0xff, 0xc0, 0x0, 0x0, 0x7, 0xff,
+    0x80, 0x0, 0xff, 0xfe, 0x0, 0x0, 0x1, 0xff,
+    0xe0, 0x0, 0x3, 0xff, 0xf8, 0x0, 0x0, 0x3f,
+    0xf8, 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0, 0x7,
+    0xfe, 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0,
+    0xff, 0xc0, 0x0, 0x0, 0x0, 0xff, 0xf0, 0x0,
+    0x1f, 0xf8, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80,
+    0x3, 0xff, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc,
+    0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xe0, 0xf, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xff, 0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xf0, 0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x81, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf8, 0x3f, 0xe0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0xc3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x7f, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xe7, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xfe, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xe7, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xff,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xff, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1, 0xfe, 0x7f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xe7, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x1, 0xfe, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xe7, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x3f, 0xc0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xc3, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8, 0x1f,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x81,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0,
+    0xf, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
+    0x0, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xe0, 0x7, 0xfe, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xfc, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0, 0x1,
+    0xff, 0x80, 0x3, 0xff, 0xc0, 0x0, 0x0, 0x0,
+    0x7f, 0xf0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0,
+    0x1f, 0xfe, 0x0, 0x0, 0x7f, 0xfe, 0x0, 0x0,
+    0xf, 0xff, 0xc0, 0x0, 0x3, 0xff, 0xfe, 0x0,
+    0xf, 0xff, 0xf8, 0x0, 0x0, 0x1f, 0xff, 0xff,
+    0xff, 0xff, 0xfe, 0x0, 0x0, 0x0, 0x7f, 0xff,
+    0xff, 0xff, 0xff, 0xc0, 0x0, 0x0, 0x1, 0xff,
+    0xff, 0xff, 0xff, 0xf0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0xff, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xff, 0xff, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7, 0xff, 0xf8, 0x0, 0x0, 0x0,
+
+    /* U+0039 "9" */
+    0x0, 0x0, 0x0, 0x1f, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xff, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xff, 0xff, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xff, 0xff, 0xff, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xff,
+    0xfe, 0x0, 0x0, 0x0, 0x7, 0xff, 0xf0, 0x3,
+    0xff, 0xf8, 0x0, 0x0, 0x0, 0xff, 0xf0, 0x0,
+    0x3, 0xff, 0xc0, 0x0, 0x0, 0x1f, 0xfc, 0x0,
+    0x0, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff, 0x0,
+    0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x7f, 0xc0,
+    0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0xf, 0xf8,
+    0x0, 0x0, 0x0, 0x7, 0xfc, 0x0, 0x1, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x3f,
+    0xe0, 0x0, 0x0, 0x0, 0x1, 0xfe, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x7f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x80,
+    0xf, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xc0, 0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xfc, 0x1, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1f, 0xe0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xfe, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0x3, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0xf0, 0x7f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0x87, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xf8, 0x7f, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0x87, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xfc, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xcf, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfc, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xcf,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xef, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xfe, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0xf, 0xef, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xfe, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xef, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xfe, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xff, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xf, 0xff, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xf7, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x7f, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xf7, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x7f,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7, 0xff,
+    0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xf3, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xff, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xff, 0xf1, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xff, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xf7, 0xf0, 0xff, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0xfe, 0x7f, 0x7, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xc7, 0xf0, 0x7f, 0xe0, 0x0, 0x0,
+    0x0, 0x3, 0xf8, 0x7f, 0x3, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0xff, 0xf, 0xf0, 0x1f, 0xfc, 0x0,
+    0x0, 0x0, 0x1f, 0xe0, 0xff, 0x0, 0xff, 0xf0,
+    0x0, 0x0, 0x7, 0xfc, 0xf, 0xf0, 0x7, 0xff,
+    0xc0, 0x0, 0x3, 0xff, 0x80, 0xfe, 0x0, 0x3f,
+    0xff, 0xc0, 0x3, 0xff, 0xf0, 0xf, 0xe0, 0x1,
+    0xff, 0xff, 0xff, 0xff, 0xfc, 0x0, 0xfe, 0x0,
+    0x7, 0xff, 0xff, 0xff, 0xff, 0x0, 0xf, 0xe0,
+    0x0, 0x1f, 0xff, 0xff, 0xff, 0xe0, 0x0, 0xfe,
+    0x0, 0x0, 0x7f, 0xff, 0xff, 0xf0, 0x0, 0xf,
+    0xe0, 0x0, 0x0, 0xff, 0xff, 0xf8, 0x0, 0x1,
+    0xfe, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0,
+    0x1f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x1, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xe0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xf0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x3, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x7, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xe0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0xff,
+    0xf8, 0x0, 0x0, 0x1, 0x80, 0x0, 0x0, 0xff,
+    0xff, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0xff,
+    0xff, 0xc0, 0x0, 0x0, 0x1, 0xff, 0xff, 0xff,
+    0xff, 0xf0, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xff,
+    0xff, 0xfc, 0x0, 0x0, 0x0, 0x1, 0xff, 0xff,
+    0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff,
+    0xff, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xff, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xff, 0x80, 0x0, 0x0, 0x0, 0x0
+};
+
+
+/*---------------------
+ *  GLYPH DESCRIPTION
+ *--------------------*/
+
+static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
+    {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
+    {.bitmap_index = 0, .adv_w = 1370, .box_w = 69, .box_h = 110, .ofs_x = 8, .ofs_y = -1},
+    {.bitmap_index = 949, .adv_w = 1370, .box_w = 35, .box_h = 107, .ofs_x = 15, .ofs_y = 0},
+    {.bitmap_index = 1418, .adv_w = 1370, .box_w = 67, .box_h = 108, .ofs_x = 8, .ofs_y = 0},
+    {.bitmap_index = 2323, .adv_w = 1370, .box_w = 68, .box_h = 110, .ofs_x = 7, .ofs_y = -1},
+    {.bitmap_index = 3258, .adv_w = 1370, .box_w = 81, .box_h = 108, .ofs_x = 3, .ofs_y = -1},
+    {.bitmap_index = 4352, .adv_w = 1370, .box_w = 66, .box_h = 108, .ofs_x = 10, .ofs_y = -1},
+    {.bitmap_index = 5243, .adv_w = 1370, .box_w = 69, .box_h = 110, .ofs_x = 9, .ofs_y = -1},
+    {.bitmap_index = 6192, .adv_w = 1370, .box_w = 69, .box_h = 106, .ofs_x = 8, .ofs_y = 0},
+    {.bitmap_index = 7107, .adv_w = 1370, .box_w = 68, .box_h = 110, .ofs_x = 9, .ofs_y = -1},
+    {.bitmap_index = 8042, .adv_w = 1370, .box_w = 68, .box_h = 110, .ofs_x = 8, .ofs_y = -1}
+};
+
+/*---------------------
+ *  CHARACTER MAPPING
+ *--------------------*/
+
+
+
+/*Collect the unicode lists and glyph_id offsets*/
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
+    {
+        .range_start = 48, .range_length = 10, .glyph_id_start = 1,
+        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
+    }
+};
+
+
+
+/*--------------------
+ *  ALL CUSTOM DATA
+ *--------------------*/
+
+#if LV_VERSION_CHECK(8, 0, 0)
+/*Store all the custom data of the font*/
+static  lv_font_fmt_txt_glyph_cache_t cache;
+static const lv_font_fmt_txt_dsc_t font_dsc = {
+#else
+static lv_font_fmt_txt_dsc_t font_dsc = {
+#endif
+    .glyph_bitmap = glyph_bitmap,
+    .glyph_dsc = glyph_dsc,
+    .cmaps = cmaps,
+    .kern_dsc = NULL,
+    .kern_scale = 0,
+    .cmap_num = 1,
+    .bpp = 1,
+    .kern_classes = 0,
+    .bitmap_format = 0,
+#if LV_VERSION_CHECK(8, 0, 0)
+    .cache = &cache
+#endif
+};
+
+
+/*-----------------
+ *  PUBLIC FONT
+ *----------------*/
+
+/*Initialize a public general font descriptor*/
+#if LV_VERSION_CHECK(8, 0, 0)
+const lv_font_t open_sans_light = {
+#else
+lv_font_t open_sans_light = {
+#endif
+    .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt,    /*Function pointer to get glyph's data*/
+    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
+    .line_height = 110,          /*The maximum line height required by the font*/
+    .base_line = 1,             /*Baseline measured from the bottom of the line*/
+#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
+    .subpx = LV_FONT_SUBPX_NONE,
+#endif
+#if LV_VERSION_CHECK(7, 4, 0)
+    .underline_position = -11,
+    .underline_thickness = 7,
+#endif
+    .dsc = &font_dsc           /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+};
+
+
+
+#endif /*#if OPEN_SANS_LIGHT*/
+
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
new file mode 100644
index 00000000..b249416a
--- /dev/null
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -0,0 +1,294 @@
+#include "PineTimeStyle.h"
+
+#include <date/date.h>
+#include <lvgl/lvgl.h>
+#include <cstdio>
+#include "BatteryIcon.h"
+#include "BleIcon.h"
+#include "NotificationIcon.h"
+#include "Symbols.h"
+#include "components/battery/BatteryController.h"
+#include "components/ble/BleController.h"
+#include "components/ble/NotificationManager.h"
+#include "components/heartrate/HeartRateController.h"
+#include "components/settings/Settings.h"
+#include "../DisplayApp.h"
+
+/*
+ * PineTimeStyle watchface for Infinitime created by Kieran Cawthray
+ * Based on WatchFaceDigital
+ * Style/layout copied from TimeStyle for Pebble by Dan Tilden (github.com/tilden)
+ */
+
+using namespace Pinetime::Applications::Screens;
+
+PineTimeStyle::PineTimeStyle(DisplayApp* app,
+                             Controllers::DateTime& dateTimeController,
+                             Controllers::Battery& batteryController,
+                             Controllers::Ble& bleController,
+                             Controllers::NotificationManager& notificatioManager,
+                             Controllers::Settings& settingsController,
+                             Controllers::HeartRateController& heartRateController)
+  : Screen(app),
+    currentDateTime {{}},
+    dateTimeController {dateTimeController},
+    batteryController {batteryController},
+    bleController {bleController},
+    notificatioManager {notificatioManager},
+    settingsController {settingsController},
+    heartRateController {heartRateController} {
+
+  /* This sets the watchface number to return to after leaving the menu*/
+  settingsController.SetClockFace(2);
+
+  displayedChar[0] = 0;
+  displayedChar[1] = 0;
+  displayedChar[2] = 0;
+  displayedChar[3] = 0;
+  displayedChar[4] = 0;
+
+  /*Create a 200px wide background rectangle*/
+
+  timebar = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(timebar, 200, 240);
+  lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
+
+  /*Display the time*/
+
+  timeDD1 = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_label_set_text(timeDD1, "12");
+  lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
+
+  timeDD2 = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_label_set_text(timeDD2, "34");
+  lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
+
+  /*Create a 40px wide bar down the right side of the screen*/
+
+  sidebar = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(sidebar, 40, 240);
+  lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
+
+  /*Display icons*/
+
+  batteryIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(batteryIcon, Symbols::batteryFull);
+  lv_obj_align(batteryIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 2);
+
+  batteryPlug = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(batteryPlug, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  //lv_label_set_text(batteryPlug, Symbols::plug);
+  lv_obj_align(batteryPlug, sidebar, LV_ALIGN_IN_TOP_MID, 0, 2);
+
+  bleIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  //lv_label_set_text(bleIcon, BleIcon::GetIcon(false));
+  lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
+
+  notificationIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  //lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
+  lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 40);
+
+  /* Calendar icon */
+
+  calendarOuter = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarOuter, 34, 34);
+  lv_obj_align(calendarOuter, sidebar, LV_ALIGN_CENTER, 0, 0);
+
+  calendarInner = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarInner, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xffffff));
+  lv_obj_set_style_local_radius(calendarInner, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarInner, 27, 27);
+  lv_obj_align(calendarInner, calendarOuter, LV_ALIGN_CENTER, 0, 0);
+
+  calendarBar1 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarBar1, 3, 12);
+  lv_obj_align(calendarBar1, calendarOuter, LV_ALIGN_IN_TOP_MID, -6, -3);
+
+  calendarBar2 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarBar2, 3, 12);
+  lv_obj_align(calendarBar2, calendarOuter, LV_ALIGN_IN_TOP_MID, 6, -3);
+
+  calendarCrossBar1 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarCrossBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarCrossBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarCrossBar1, 8, 3);
+  lv_obj_align(calendarCrossBar1, calendarBar1, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+
+  calendarCrossBar2 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarCrossBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarCrossBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarCrossBar2, 8, 3);
+  lv_obj_align(calendarCrossBar2, calendarBar2, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+
+  /*Display date*/
+
+  dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateDayOfWeek, "THU");
+  lv_obj_align(dateDayOfWeek, sidebar, LV_ALIGN_CENTER, 0, -34);
+
+  dateDay = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateDay, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateDay, "25");
+  lv_obj_align(dateDay, sidebar, LV_ALIGN_CENTER, 0, 3);
+
+  dateMonth = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateMonth, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateMonth, "MAR");
+  lv_obj_align(dateMonth, sidebar, LV_ALIGN_CENTER, 0, 32);
+
+  /*Display heartrate info*/
+
+  heartbeatIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(heartbeatIcon, Symbols::heartBeat);
+  lv_obj_align(heartbeatIcon, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, -30);
+
+  heartbeatValue = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(heartbeatValue, "---");
+  lv_obj_align(heartbeatValue, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, -10);
+
+  backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_click(backgroundLabel, true);
+  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+  lv_obj_set_size(backgroundLabel, 240, 240);
+  lv_obj_set_pos(backgroundLabel, 0, 0);
+  lv_label_set_text(backgroundLabel, "");
+}
+
+PineTimeStyle::~PineTimeStyle() {
+  lv_obj_clean(lv_scr_act());
+}
+
+bool PineTimeStyle::Refresh() {
+  batteryPercentRemaining = batteryController.PercentRemaining();
+  if (batteryPercentRemaining.IsUpdated()) {
+    auto batteryPercent = batteryPercentRemaining.Get();
+    if (batteryController.IsCharging()) {
+      auto isCharging = batteryController.IsCharging() || batteryController.IsPowerPresent();
+      lv_label_set_text(batteryPlug, BatteryIcon::GetPlugIcon(isCharging));
+      lv_obj_realign(batteryPlug);
+      lv_label_set_text(batteryIcon, "");
+    } else {
+      lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent));
+      lv_label_set_text(batteryPlug, "");
+    }
+  }
+
+  bleState = bleController.IsConnected();
+  if (bleState.IsUpdated()) {
+    if (bleState.Get() == true) {
+      lv_label_set_text(bleIcon, BleIcon::GetIcon(true));
+      lv_obj_realign(bleIcon);
+    } else {
+      lv_label_set_text(bleIcon, BleIcon::GetIcon(false));
+    }
+  }
+
+  notificationState = notificatioManager.AreNewNotificationsAvailable();
+  if (notificationState.IsUpdated()) {
+    if (notificationState.Get() == true) {
+      lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(true));
+      lv_obj_realign(notificationIcon);
+      //lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, -8, 25);
+    } else {
+      lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
+      //lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
+    }
+  }
+
+  currentDateTime = dateTimeController.CurrentDateTime();
+
+  if (currentDateTime.IsUpdated()) {
+    auto newDateTime = currentDateTime.Get();
+
+    auto dp = date::floor<date::days>(newDateTime);
+    auto time = date::make_time(newDateTime - dp);
+    auto yearMonthDay = date::year_month_day(dp);
+
+    auto year = (int) yearMonthDay.year();
+    auto month = static_cast<Pinetime::Controllers::DateTime::Months>((unsigned) yearMonthDay.month());
+    auto day = (unsigned) yearMonthDay.day();
+    auto dayOfWeek = static_cast<Pinetime::Controllers::DateTime::Days>(date::weekday(yearMonthDay).iso_encoding());
+
+    int hour = time.hours().count();
+    auto minute = time.minutes().count();
+
+    char minutesChar[3];
+    sprintf(minutesChar, "%02d", static_cast<int>(minute));
+
+    char hoursChar[3];
+    sprintf(hoursChar, "%02d", hour);
+
+    if (hoursChar[0] != displayedChar[0] || hoursChar[1] != displayedChar[1] || minutesChar[0] != displayedChar[2] ||
+        minutesChar[1] != displayedChar[3]) {
+      displayedChar[0] = hoursChar[0];
+      displayedChar[1] = hoursChar[1];
+      displayedChar[2] = minutesChar[0];
+      displayedChar[3] = minutesChar[1];
+
+      char hourStr[3];
+      char minStr[3];
+
+      /*Display the time as 2 pairs of digits*/
+      sprintf(hourStr, "%c%c", hoursChar[0], hoursChar[1]);
+      lv_label_set_text(timeDD1, hourStr);
+
+      sprintf(minStr, "%c%c", minutesChar[0], minutesChar[1]);
+      lv_label_set_text(timeDD2, minStr);
+    }
+
+    if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
+      char dayOfWeekStr[4];
+      char dayStr[3];
+      char monthStr[4];
+
+      sprintf(dayOfWeekStr, "%s", dateTimeController.DayOfWeekShortToString());
+      sprintf(dayStr, "%d", day);
+      sprintf(monthStr, "%s", dateTimeController.MonthShortToString());
+
+      lv_label_set_text(dateDayOfWeek, dayOfWeekStr);
+      lv_label_set_text(dateDay, dayStr);
+      lv_obj_realign(dateDay);
+      lv_label_set_text(dateMonth, monthStr);
+
+      currentYear = year;
+      currentMonth = month;
+      currentDayOfWeek = dayOfWeek;
+      currentDay = day;
+    }
+  }
+
+  heartbeat = heartRateController.HeartRate();
+  heartbeatRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
+  if (heartbeat.IsUpdated() || heartbeatRunning.IsUpdated()) {
+    char heartbeatBuffer[4];
+    if (heartbeatRunning.Get())
+      sprintf(heartbeatBuffer, "%d", heartbeat.Get());
+    else
+      sprintf(heartbeatBuffer, "---");
+
+    lv_label_set_text(heartbeatValue, heartbeatBuffer);
+    lv_obj_realign(heartbeatValue);
+  }
+
+  return running;
+}
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
new file mode 100644
index 00000000..55752412
--- /dev/null
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -0,0 +1,83 @@
+#pragma once
+
+#include <lvgl/src/lv_core/lv_obj.h>
+#include <chrono>
+#include <cstdint>
+#include <memory>
+#include "Screen.h"
+#include "ScreenList.h"
+#include "components/datetime/DateTimeController.h"
+
+namespace Pinetime {
+  namespace Controllers {
+    class Settings;
+    class Battery;
+    class Ble;
+    class NotificationManager;
+    class HeartRateController;
+  }
+
+  namespace Applications {
+    namespace Screens {
+      class PineTimeStyle : public Screen {
+      public:
+        PineTimeStyle(DisplayApp* app,
+                      Controllers::DateTime& dateTimeController,
+                      Controllers::Battery& batteryController,
+                      Controllers::Ble& bleController,
+                      Controllers::NotificationManager& notificatioManager,
+                      Controllers::Settings& settingsController,
+                      Controllers::HeartRateController& heartRateController);
+        ~PineTimeStyle() override;
+
+        bool Refresh() override;
+
+        void OnObjectEvent(lv_obj_t* pObj, lv_event_t i);
+
+      private:
+        char displayedChar[5];
+
+        uint16_t currentYear = 1970;
+        Pinetime::Controllers::DateTime::Months currentMonth = Pinetime::Controllers::DateTime::Months::Unknown;
+        Pinetime::Controllers::DateTime::Days currentDayOfWeek = Pinetime::Controllers::DateTime::Days::Unknown;
+        uint8_t currentDay = 0;
+
+        DirtyValue<int> batteryPercentRemaining {};
+        DirtyValue<bool> bleState {};
+        DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
+        DirtyValue<uint8_t> heartbeat {};
+        DirtyValue<bool> heartbeatRunning {};
+        DirtyValue<bool> notificationState {};
+
+        lv_obj_t* timebar;
+        lv_obj_t* sidebar;
+        lv_obj_t* timeDD1;
+        lv_obj_t* timeDD2;
+        lv_obj_t* dateDayOfWeek;
+        lv_obj_t* dateDay;
+        lv_obj_t* dateMonth;
+        lv_obj_t* backgroundLabel;
+        lv_obj_t* batteryIcon;
+        lv_obj_t* bleIcon;
+        lv_obj_t* batteryPlug;
+        lv_obj_t* calendarOuter;
+        lv_obj_t* calendarInner;
+        lv_obj_t* calendarBar1;
+        lv_obj_t* calendarBar2;
+        lv_obj_t* calendarCrossBar1;
+        lv_obj_t* calendarCrossBar2;
+        lv_obj_t* heartbeatIcon;
+        lv_obj_t* heartbeatValue;
+        lv_obj_t* heartbeatBpm;
+        lv_obj_t* notificationIcon;
+
+        Controllers::DateTime& dateTimeController;
+        Controllers::Battery& batteryController;
+        Controllers::Ble& bleController;
+        Controllers::NotificationManager& notificatioManager;
+        Controllers::Settings& settingsController;
+        Controllers::HeartRateController& heartRateController;
+      };
+    }
+  }
+}
-- 
cgit v1.2.3-70-g09d2


From 6a925292722be365f4efc288c64b023639f0c201 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 18 May 2021 17:45:16 +0200
Subject: Revert "Reset"

This reverts commit 378fa6b4016b65e2d7b128fdc3ce89c4ca779a4d.
---
 .clang-tidy                                        |   6 +-
 CMakeLists.txt                                     |  12 +
 README.md                                          |   3 +-
 doc/buildAndProgram.md                             |   3 +-
 doc/contribute.md                                  |  24 +-
 doc/gettingStarted/appmenu-071.jpg                 | Bin 0 -> 109376 bytes
 doc/gettingStarted/appmenu.jpg                     | Bin 0 -> 120674 bytes
 doc/gettingStarted/bootloader-1.0.jpg              | Bin 0 -> 160275 bytes
 doc/gettingStarted/gettingStarted-1.0.md           | 112 +++++++++
 doc/gettingStarted/oldbootloaderlogo.jpg           | Bin 0 -> 116236 bytes
 doc/gettingStarted/ota-gadgetbridge-nrfconnect.md  | 101 ++++++++
 doc/gettingStarted/quickactions.jpg                | Bin 0 -> 114900 bytes
 doc/gettingStarted/settings.jpg                    | Bin 0 -> 130022 bytes
 doc/gettingStarted/version-071.jpg                 | Bin 0 -> 111556 bytes
 doc/gettingStarted/version-1.0.jpg                 | Bin 0 -> 116881 bytes
 docker/.gitpod.Dockerfile                          |   3 +
 docker/Dockerfile                                  |   3 +
 src/CMakeLists.txt                                 |   5 +-
 src/Version.h.in                                   |   2 +
 src/components/motion/MotionController.h           |   6 +-
 src/components/settings/Settings.h                 |  10 +-
 src/displayapp/Apps.h                              |   4 +-
 src/displayapp/DisplayApp.cpp                      |  53 +++--
 src/displayapp/DisplayApp.h                        |   2 +-
 src/displayapp/DisplayAppRecovery.cpp              |   7 +-
 src/displayapp/fonts/jetbrains_mono_42.c           | 258 +++++++++++++++++++++
 src/displayapp/screens/ApplicationList.cpp         |   4 +-
 src/displayapp/screens/Clock.cpp                   |  16 +-
 src/displayapp/screens/Clock.h                     |   3 +-
 src/displayapp/screens/FirmwareValidation.cpp      |  11 +
 src/displayapp/screens/FirmwareValidation.h        |   3 +
 src/displayapp/screens/Motion.cpp                  |  19 +-
 src/displayapp/screens/Motion.h                    |   2 +-
 src/displayapp/screens/Notifications.cpp           |  10 +
 src/displayapp/screens/Steps.cpp                   |  72 ++++++
 src/displayapp/screens/Steps.h                     |  39 ++++
 src/displayapp/screens/StopWatch.cpp               |   3 +-
 src/displayapp/screens/SystemInfo.cpp              |   8 +-
 src/displayapp/screens/settings/SettingSteps.cpp   |  98 ++++++++
 src/displayapp/screens/settings/SettingSteps.h     |  32 +++
 .../screens/settings/SettingWatchFace.cpp          |  11 +-
 src/displayapp/screens/settings/SettingWatchFace.h |   2 +-
 src/displayapp/screens/settings/Settings.cpp       |  10 +-
 src/libs/lv_conf.h                                 |   4 +-
 src/logging/NrfLogger.cpp                          |   5 +-
 45 files changed, 865 insertions(+), 101 deletions(-)
 create mode 100644 doc/gettingStarted/appmenu-071.jpg
 create mode 100644 doc/gettingStarted/appmenu.jpg
 create mode 100644 doc/gettingStarted/bootloader-1.0.jpg
 create mode 100644 doc/gettingStarted/gettingStarted-1.0.md
 create mode 100644 doc/gettingStarted/oldbootloaderlogo.jpg
 create mode 100644 doc/gettingStarted/ota-gadgetbridge-nrfconnect.md
 create mode 100644 doc/gettingStarted/quickactions.jpg
 create mode 100644 doc/gettingStarted/settings.jpg
 create mode 100644 doc/gettingStarted/version-071.jpg
 create mode 100644 doc/gettingStarted/version-1.0.jpg
 create mode 100644 src/displayapp/fonts/jetbrains_mono_42.c
 create mode 100644 src/displayapp/screens/Steps.cpp
 create mode 100644 src/displayapp/screens/Steps.h
 create mode 100644 src/displayapp/screens/settings/SettingSteps.cpp
 create mode 100644 src/displayapp/screens/settings/SettingSteps.h

(limited to 'src/displayapp')

diff --git a/.clang-tidy b/.clang-tidy
index d6036802..8a7d38f0 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -22,5 +22,9 @@ Checks: '*,
   -hicpp-no-assembler,
   -hicpp-avoid-c-arrays,
   -hicpp-uppercase-literal-suffix,
+  -hicpp-no-array-decay,
   -cert-err58-cpp,
-  -cert-err60-cpp'
\ No newline at end of file
+  -cert-err60-cpp'
+CheckOptions:
+  - key: readability-function-cognitive-complexity.Threshold
+    value: 100
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7770136..6c529f39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,10 +55,22 @@ if(BUILD_DFU)
   set(BUILD_DFU true)
 endif()
 
+set(PROJECT_GIT_COMMIT_HASH "")
+
+execute_process(COMMAND git rev-parse --short HEAD
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                OUTPUT_VARIABLE PROJECT_GIT_COMMIT_HASH
+                RESULT_VARIABLE PROJECT_GIT_COMMIT_HASH_SUCCESS)
+
+string(STRIP ${PROJECT_GIT_COMMIT_HASH} PROJECT_GIT_COMMIT_HASH)
+
+message("PROJECT_GIT_COMMIT_HASH_SUCCESS? " ${PROJECT_GIT_COMMIT_HASH_SUCCESS})
+
 message("BUILD CONFIGURATION")
 message("-------------------")
 message("    * Version : " ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 message("    * Toolchain : " ${ARM_NONE_EABI_TOOLCHAIN_PATH})
+message("    * GitRef(S) : " ${PROJECT_GIT_COMMIT_HASH})
 message("    * NRF52 SDK : " ${NRF5_SDK_PATH})
 set(PROGRAMMER "???")
 if(USE_JLINK)
diff --git a/README.md b/README.md
index 34f6e841..396d7462 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,8 @@ As of now, here is the list of achievements of this project:
 ## Documentation
 
 ### Getting started
- - [Flash, upgrade (OTA), time synchronization,...](doc/gettingStarted/gettingStarted.md)
+ - [Getting started with InfiniTime 1.0 (quick user guide, update bootloader and InfiniTime,...)](doc/gettingStarted/gettingStarted-1.0.md)
+ - [Flash, upgrade (OTA), time synchronization,...](doc/gettingStarted/ota-gadgetbridge-nrfconnect.md)
 
 ### Develop
  - [Generate the fonts and symbols](src/displayapp/fonts/README.md)
diff --git a/doc/buildAndProgram.md b/doc/buildAndProgram.md
index b70bdfc0..afd526e0 100644
--- a/doc/buildAndProgram.md
+++ b/doc/buildAndProgram.md
@@ -3,6 +3,7 @@
 To build this project, you'll need:
  - A cross-compiler : [ARM-GCC (9-2020-q2-update)](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads/9-2020-q2-update)
  - The NRF52 SDK 15.3.0 : [nRF-SDK v15.3.0](https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip)
+ - The `cbor` and `intelhex` modules for Python 3
  - A reasonably recent version of CMake (I use 3.16.5)
 
 ## Build steps 
@@ -221,4 +222,4 @@ Loading section .sec6, size 0x10000 lma 0x30000
 Loading section .sec7, size 0xdf08 lma 0x40000
 Start address 0x0, load size 314200
 Transfer rate: 45 KB/sec, 969 bytes/write.
-```
\ No newline at end of file
+```
diff --git a/doc/contribute.md b/doc/contribute.md
index 7958eea1..09d20774 100644
--- a/doc/contribute.md
+++ b/doc/contribute.md
@@ -2,13 +2,13 @@
 ## Report bugs
 You use your Pinetime and find a bug in the firmware? [Create an issue on Github](https://github.com/JF002/InfiniTime/issues) explaining the bug, how to reproduce it, the version of the firmware you use...
 ## Write and improve documentation
-Documentation might be incomplete, or not clear enough, and it is always possible to improve it with better wording, pictures, photo, video,... 
+Documentation might be incomplete, or not clear enough, and it is always possible to improve it with better wording, pictures, photo, video,...
 
 As the documentation is part of the source code, you can submit your improvements to the documentation by submitting a pull request (see below).
 ## Fix bugs, add functionalities and improve the code
 You want to fix a bug, add a cool new functionality or improve the code? See *How to submit a pull request below*.
 ## Spread the word
-Pinetime is a cool open source project that deserves to be know. Talk about it around you, on social networks, on your blog,... and let people know that we are working on an open-source firmware for a smartwatch!
+The Pinetime is a cool open source project that deserves to be known. Talk about it around you, on social networks, on your blog,... and let people know that we are working on an open-source firmware for a smartwatch!
 
 # How to submit a pull request ?
 
@@ -21,28 +21,28 @@ Pinetime is a cool open source project that deserves to be know. Talk about it a
  - Write documentation related to your new feature is applicable;
  - Create the pull-request and write a great description about it : what does your PR do, why, how,... Add pictures and video if possible;
  - Wait for someone to review your PR and take part in the review process;
- - You PR will eventually be merged :)
+ - Your PR will eventually be merged :)
 
-Your contribution is more than welcome! 
+Your contribution is more than welcome!
 
 If you want to fix a bug, add a functionality or improve the code, you'll first need to create a branch from the **develop** branch (see [this page about the branching model](./branches.md)). This branch is called a feature branch, and you should choose a name that explains what you are working on (ex: "add-doc-about-contributions"). In this branch, **focus on only one topic, bug or feature**. For example, if you created this branch to work on the UI of a specific application, do not commit modifications about the SPI driver. If you want to work on multiple topics, create one branch per topic.
 
 When your feature branch is ready, **make sure it actually works** and **do not forget to write documentation** about it if it's relevant.
 
-I **strongly discourage to create a PR containing modifications that haven't been tested**. If, for any reason, you cannot test your modifications but want to publish them anyway, **please mention it in the description**. This way, other contributors might be willing to test it and provide feedbacks about your code.
+I **strongly discourage to create a PR containing modifications that haven't been tested**. If, for any reason, you cannot test your modifications but want to publish them anyway, **please mention it in the description**. This way, other contributors might be willing to test it and provide feedback about your code.
 
 Also, before submitting your PR, check the coding style of your code against the **coding conventions** detailed below. This project also provides [clang-format](../.clang-format) and [clang-tidy](../.clang-tidy) configuration files. You can use them to ensure correct formatting of your code.
 
 Do not forget to check the files you are going to commit and remove those who are not necessary (config files from your IDE, for example). Remove old comments, commented code,...
 
-Then, you can submit a pull-request for review. Try to **describe your pull request as much as possible**: what did you do in this branch, how does it work, how is it designed, are there any limitations,... This will help the contributors to understand and review your code easily. You can add pictures and video to the description so that contributors will have a quick overview of you work.
+Then, you can submit a pull-request for review. Try to **describe your pull request as much as possible**: what did you do in this branch, how does it work, how is it designed, are there any limitations,... This will help the contributors to understand and review your code easily. You can add pictures and video to the description so that contributors will have a quick overview of your work.
 
-Other contributors can post comments about the pull request, maybe ask for more info or adjustements in the code.
+Other contributors can post comments about the pull request, maybe ask for more info or adjustments in the code.
 
-Once the pull request is reviewed an accepted, it'll be merge in **develop** and will be released in the next release version of the firmware.
+Once the pull request is reviewed and accepted, it'll be merge in **develop** and will be released in the next release version of the firmware.
 
 ## Why  all these rules?
-Reviewing pull-requests is a **very time consuming task** for the creator of this project ([JF002](https://github.com/JF002)) and for other contributors who take the time to review them. Every little thing you do to make their lifes easier will **increase the chances your PR will be merge quickly**.
+Reviewing pull-requests is a **very time consuming task** for the creator of this project ([JF002](https://github.com/JF002)) and for other contributors who take the time to review them. Every little thing you do to make their lives easier will **increase the chances your PR will be merge quickly**.
 
 When reviewing PR, the author and contributors will first look at the **description**. If it's easy to understand what the PR does, why the modification is needed or interesting and how it's done, a good part of the work is already done : we understand the PR and its context.
 
@@ -58,12 +58,12 @@ It's totally normal for a PR to need some more work even after it was created, t
 ## Language
 The language of this project is **C++**, and all new code must be written in C++. (Modern) C++ provides a lot of useful tools and functionalities that are beneficial for embedded software development like `constexpr`, `template` and anything that provides zero-cost abstraction.  
 
-It's OK to include C code if this code comes from another library like FreeRTOS, NimBLE, LVGL or the NRF-SDK. 
+It's OK to include C code if this code comes from another library like FreeRTOS, NimBLE, LVGL or the NRF-SDK.
 
 ## Coding style
-The most important rule to follow is to try to keep the code as easy to read and maintain as possible. 
+The most important rule to follow is to try to keep the code as easy to read and maintain as possible.
 
- - **Identation** : 2 spaces, no tabulation
+ - **Indentation** : 2 spaces, no tabulation
  - **Opening brace** at the end of the line
  - **Naming** : Choose self-describing variable name
     - **class** : PascalCase
diff --git a/doc/gettingStarted/appmenu-071.jpg b/doc/gettingStarted/appmenu-071.jpg
new file mode 100644
index 00000000..dee7c8f6
Binary files /dev/null and b/doc/gettingStarted/appmenu-071.jpg differ
diff --git a/doc/gettingStarted/appmenu.jpg b/doc/gettingStarted/appmenu.jpg
new file mode 100644
index 00000000..1e52fe78
Binary files /dev/null and b/doc/gettingStarted/appmenu.jpg differ
diff --git a/doc/gettingStarted/bootloader-1.0.jpg b/doc/gettingStarted/bootloader-1.0.jpg
new file mode 100644
index 00000000..7b639184
Binary files /dev/null and b/doc/gettingStarted/bootloader-1.0.jpg differ
diff --git a/doc/gettingStarted/gettingStarted-1.0.md b/doc/gettingStarted/gettingStarted-1.0.md
new file mode 100644
index 00000000..2ac22b97
--- /dev/null
+++ b/doc/gettingStarted/gettingStarted-1.0.md
@@ -0,0 +1,112 @@
+# Getting started with InfiniTime 1.0
+On April 22 2021, InfiniTime and Pine64 [announced the release of InfiniTime 1.0](https://www.pine64.org/2021/04/22/its-time-infinitime-1-0/) and the availability of PineTime smartwatches as *enthusiast grade end-user product*. This page aims to guide you with your first step with your new PineTime.
+
+## Firmware, InfiniTime, Bootloader, Recovery firmware, OTA, DFU... What is it?
+You might have already seen these words by reading the announcement, release notes, or [the wiki guide](https://wiki.pine64.org/wiki/Upgrade_PineTime_to_InfiniTime_1.0.0) and, you may find them misleading if you're not familiar with the project.
+
+Basically, a **firmware** is just a software running on the embedded hardware of a device, the PineTime in this case.
+**InfiniTime** is based on 3 distinct **firmwares**:
+ - **[InfiniTime](https://github.com/JF002/InfiniTime)** itself, this is the *application firmware* running on the PineTime. This is the main firmware which provides most of the functionalities you'll use on a daily basis : bluetooth low-energy (BLE) connectivity, applications, watchfaces,...
+ - **[The bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader)** is responsible for safely applying **updates** of the *application firmware*, reverting them in case of issues and load the recovery firmware when requested.
+ - **The recovery firmware** is a specific *application firmware* than can be loaded by the bootloader on user request. This firmware can be useful in case of serious issue, when the main application firmware cannot perform an OTA update correctly. Currently, this  recovery firmware is based on [InfiniTime 0.14.1](https://github.com/JF002/InfiniTime/releases/tag/0.14.1).
+
+**OTA** and **DFU** refer to the update of the firmware over BLE (**B**luetooth **L**ow **E**nergy). **OTA** means **O**ver **T**he **A**ir, this is a functionality that allows the user to update the firmware how their device using a wireless communication like BLE. When we talk about **DFU** (**D**igital **F**irmware **U**pdate), we refer to the file format and protocol used to send the update of the firmware to the watch over-the-air. InfiniTime implement the (legacy) DFU protocol from Nordic Semiconductor (NRF).
+
+## How to check the version of InfiniTime and the bootloader?
+Since September 2020, all PineTimes (devkits or sealed) are flashed using the **[first iteration of the bootloader](https://github.com/lupyuen/pinetime-rust-mynewt/releases/tag/v4.1.7)** and **[InfiniTime 0.7.1](https://github.com/JF002/InfiniTime/releases/tag/0.7.1)**. There was no recovery firmware at that time.
+
+The bootloader only runs when the watch starts (from an empty battery, for example) or after a reset (after a succesful OTA or a manual reset - long push on the button). 
+
+You can recognize this first iteration of the bootloader with it greenish **PINETIME** logo.
+
+![Old bootloader logo](oldbootloaderlogo.jpg)
+
+You can check the version of InfiniTime by opening the app *SystemInfo*. For version < 1.0:
+
+![InfiniTime 0.7.1 Application menu](appmenu-071.jpg)
+![InfiniTime 0.7.1 version](version-071.jpg)
+
+And for version >= 1.0 :
+
+![InfiniTime 1.0 version](version-1.0.jpg)
+
+
+PineTime shipped from June 2020 (to be confirmed) will be flashed with the [new version of the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/tag/1.0.0), the [recovery firmware](https://github.com/JF002/InfiniTime/releases/tag/0.14.1) and [InfiniTime 1.0](https://github.com/JF002/InfiniTime/releases/tag/1.0.0).
+
+The bootloader is easily recognizable with it white pine cone that is progressively drawn in green. It also displays its own version on the bottom (1.0.0 as of now).
+
+![Bootloader 1.0](bootloader-1.0.jpg)
+
+## How to update your PineTime?
+To update your PineTime, you can use one of the compatible companion applications. Here are the main ones:
+
+ - **[Amazfish](https://github.com/piggz/harbour-amazfish)** (Desktop Linux, mobile Linux, SailfishOS, runs on the PinebookPro and the Pinephone)
+ - **[Gadgetbridge](https://www.gadgetbridge.org/)** (Android)
+ - **[Siglo](https://github.com/alexr4535/siglo)** (Linux, GTK based)
+ - **NRFConnect** (closed source, Android & iOS).
+
+See [this page](ota-gadgetbridge-nrfconnect.md) for more info about the OTA procedure using Gadgetbrige and NRFCOnnect.
+
+### From InfiniTime 0.7.1 / old bootloader
+If your PineTime is currently running InfiniTime 0.7.1 and the old bootloader, we strongly recommend you update them to more recent version (Bootloader 1.0.0 and InfiniTime 1.0.0 as of now). We also recommend you install the recovery firmware once the bootloader is up-do-date.
+
+Using the companion app of your choice, you'll need to apply the OTA procedure for these 3 firmwares in this sequence (failing to follow this specific order might temporarily or permanently brick your device):
+ 
+ 1. Flash the latest version of InfiniTime. The file to upload is named **pinetime-mcuboot-app-dfu-x.y.z.zip**. Here is the link to [InfiniTime 1.0](https://github.com/JF002/InfiniTime/releases/download/1.0.0/pinetime-mcuboot-app-dfu-1.0.0.zip).
+ 2. Update the bootloader by applying the OTA procedure with the file named [**reloader-mcuboot.zip** from the repo of the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/download/1.0.0/reloader-mcuboot.zip). 
+ 3. Install the recovery firmware by applying the OTA procedure with the file named [**pinetime-mcuboot-recovery-loader-dfu-0.14.1.zip** from the version 0.14.1 of InfiniTime](https://github.com/JF002/InfiniTime/releases/download/0.14.1/pinetime-mcuboot-recovery-loader-dfu-0.14.1.zip).
+
+You'll find more info about this process in [this wiki page](https://wiki.pine64.org/wiki/Upgrade_PineTime_to_InfiniTime_1.0.0). You can also see the procedure in video [here](https://video.codingfield.com/videos/watch/831077c5-16f3-47b4-9b2b-c4bbfecc6529) and [here (from Amazfish)](https://video.codingfield.com/videos/watch/f7bffb3d-a6a1-43c4-8f01-f4aeff4adf9e)
+
+### From version > 1.0
+If you are already running the new "1.0.0" bootloader, all you have to do is update your version of InfiniTime when it'll be available. We'll write specific instructions when (if) we release a new version of the bootloader.
+
+### Firmware validation
+The bootloader requires a (manual) validation of the firmware. If the watch reset with an updated firmware that was not validated, the bootloader will consider it as non-functionning and will revert to the previous version of the firmware. This is a safety feature to prevent bricking your device with a faulty firmware.
+
+You can validate your updated firmware on InfiniTime >= 1.0 by following this simple procedure:
+ 
+ - From the watchface, swipe **right** to display the *Quick Actions menu*
+ - Open the **Settings** app by tapping the *gear* icon on the bottom right
+ - Swipe down and tap on the entry named **Firmware**
+ - This app shows the version that is currently running. If it's not validated yet, it displays 2 buttons:
+    - **Validate** to validate your firmware
+    - **Reset** to reset the watch and revert to the previously running version of the firmware
+    
+## InfiniTime 1.0 quick user guide
+### Setting the time
+By default, InfiniTime starts on the digital watchface. It'll probably display the epoch time (1 Jan 1970, 00:00). The time will be automatically synchronized once you connect on of the companion app to your PineTime using BLE connectivity. InfiniTime does not provide any way to manually set the time for now.
+
+### Navigation in the menu
+
+![Quick actions](quickactions.jpg)
+![Settings](settings.jpg)
+![Application menu](appmenu.jpg)
+
+ - Swipe **down** to display the notification panel. Notification sent by your companion app will be displayed in this panel.
+ - Swipe **up** to display the application menus. Apps (stopwatch, music, step, games,...) can be started from this menu.
+ - Swipe **right** to display the Quick Actions menu. This menu allows you to
+    - Set the brightness of the display
+    - Start the **flashlight** app
+    - Enable/disable vibrations on notifications (Do Not Disturb mode)
+    - Enter the **settings** menu
+ - Settings 
+    - Display timeout
+    - Wake up event (Tap, wrist rotation)
+    - Time format (12/24H)
+    - Default watchface (digital / analog)
+    - Battery info
+    - Firmware validation
+    - About (system info, firmware version,...)
+
+### Bootloader
+
+Most of the time, the bootloader just runs without your intervention (update and load the firmware).
+
+However, you can enable 2 functionalities using the push button:
+ 
+ - Push the button until the pine cone is drawn in **blue** to force the rollback of the previous version of the firmware, even if you've already validated the updated one
+ - Push the button until the pine cone is drawn in **red** to load the recovery firmware. This recovery firmware only provides BLE connectivity and OTA functionality.
+
+More info about the bootloader in [its project page](https://github.com/JF002/pinetime-mcuboot-bootloader/blob/master/README.md).
+
diff --git a/doc/gettingStarted/oldbootloaderlogo.jpg b/doc/gettingStarted/oldbootloaderlogo.jpg
new file mode 100644
index 00000000..b4d0cdfb
Binary files /dev/null and b/doc/gettingStarted/oldbootloaderlogo.jpg differ
diff --git a/doc/gettingStarted/ota-gadgetbridge-nrfconnect.md b/doc/gettingStarted/ota-gadgetbridge-nrfconnect.md
new file mode 100644
index 00000000..1187a9b7
--- /dev/null
+++ b/doc/gettingStarted/ota-gadgetbridge-nrfconnect.md
@@ -0,0 +1,101 @@
+# Flash and upgrade InfiniTime
+If you just want to flash or upgrade InfiniTime on your PineTime, this page is for you!
+
+- [InfiniTime releases and versions](#infinitime-releases-and-versions)
+- [How to upgrade Over-The-Air (OTA)](#how-to-upgrade-over-the-air-ota)
+    - [Using Gadgetbridge](#using-gadgetbridge)
+    - [Using NRFConnect](#Using-nrfconnect)
+- [How to flash InfiniTime using the SWD interface](#how-to-flash-infinitime-using-the-swd-interface)
+
+## InfiniTime releases and versions
+All releases of InfiniTime are available on the [release page of the GitHub repo](https://github.com/JF002/InfiniTime/releases).
+
+Versions that are tagged as **RELEASE CANDIDATE** are pre-release versions, that are available for testing before actually releasing a new stable version. If you want to help us debug the project and provide stable versions to other user, you can use them. If you want stable and tested version, you should not flash these release candidate version.
+
+Release files are available under the *Assets* button.
+
+## How to upgrade Over-The-Air (OTA)
+OTA is the easiest method to upgrade InfiniTime. Note that it's only possible is your PineTime is already running InfiniTime (>= 0.7.1).
+
+2 companion apps provide support for OTA : 
+ - [Gadgetbridge](https://gadgetbridge.org/) (open source, runs on Android, [available on F-Droid](https://f-droid.org/packages/nodomain.freeyourgadget.gadgetbridge/)). 
+ - [NRFConnect](https://www.nordicsemi.com/Software-and-tools/Development-Tools/nRF-Connect-for-mobile) (close source, runs on Android and iOS).
+ 
+Both applications need you to download the **DFU file** of InfiniTime. This file contains the new version of InfiniTime that will be flashed into your device. It's called **dfu-x.y.z.zip** (ex: dfu-0.9.0.zip) in the release note.
+![Dfu file](dfuFile.png )
+
+### Using Gadgetbridge
+Launch Gadgetbridge and tap on the **"+"** button on the bottom right to add a new device:
+
+![Gadgetbridge 0](gadgetbridge0.jpg)
+
+Wait for the scan to complete, your PineTime should be detected:
+
+![Gadgetbridge 1](gadgetbridge1.jpg)
+
+Tap on it. Gadgdetbridge will pair and connect to your device:
+
+![Gadgetbridge 2](gadgetbridge2.jpg)
+
+Now that Gadgetbridge is connected to your PineTime, use a file browser application (I'm using Seafile to browse my NAS) and browse to the DFU file (image-xxx.zip) you downloaded previously. Tap on it and open it using the Gadgetbridge application/firmware installer:
+
+![Gadgetbridge 3](gadgetbridge3.jpg)
+
+Read carefully the warning and tap **Install**:
+
+![Gadgetbridge 4](gadgetbridge4.jpg)
+
+Wait for the transfer to finish. Your PineTime should reset and reboot with the new version of InfiniTime!
+
+![Gadgetbridge 5](gadgetbridge5.jpg)
+
+### Using NRFConnect
+Open NRFConnect. Swipe down in the *Scanner* tab and wait for your device to appear:
+
+![NRFConnect 0](nrfconnect0.jpg)
+
+Tap on the *Connect* button on the right of your device. NRFConnect will connect to your PineTime and discover its characteristics. Tap on the **DFU** button on the top right:
+
+![NRFConnect 1](nrfconnect1.jpg)
+
+Select **Distribution packet (ZIP)**:
+
+![NRFConnect 2](nrfconnect2.jpg)
+
+Browse to the DFU file you downloaded previously, the DFU transfer will start automatically. When the transfer is finished, your PineTime will reset and restart on the new version of InfiniTime!
+
+![NRFConnect 3](nrfconnect3.jpg)
+
+## How to flash InfiniTime using the SWD interface
+Download the files **bootloader.bin**, **image-x.y.z.bin** and **pinetime-graphics-x.y.z.bin** from the release page:
+
+![Image file](imageFile.png )
+
+The bootloader reads a boot logo from the external SPI flash memory. The first step consists in flashing a tool in the MCU that will flash the boot logo into this SPI flash memory. This first step is optional but recommanded (the bootloader will display garbage on screen for a few second if you don't do it).
+Using your SWD tool, flash **pinetime-graphics-x.y.z.bin** at offset **0x0000**. Reset the MCU and wait for a few second, until the logo is completely drawn on the display.
+
+Then, using your SWD tool, flash those file at specific offset:
+
+ - bootloader.bin : **0x0000**
+ - image-x.y.z.bin : **0x8000**
+
+Reset and voilà, you're running InfiniTime on your PineTime!
+ 
+If you are using OpenOCD with a STLinkV2, you can find more info [on this page](../openOCD.md).
+
+## How to synchronize the time
+
+### Using Gadgetbridge
+Good news! Gadgetbridge **automatically** synchronizes the time when connecting to your PineTime!
+
+### Using NRFConnect
+You must enable the **CTS** *GATT server* into NRFConnect so that InfiniTime can synchronize the time with your smartphone.
+
+Launch NRFConnect, tap the sandwich button on the top left and select *Configure GATT server*:
+
+![NRFConnect CTS 0](nrfconnectcts0.jpg)
+
+
+Tap *Add service* and select the server configuration *Current Time service*. Tap OK and connect to your PineTime, it should automcatically sync the time once the connection is established!
+
+![NRFConnect CTS 1](nrfconnectcts1.jpg)
diff --git a/doc/gettingStarted/quickactions.jpg b/doc/gettingStarted/quickactions.jpg
new file mode 100644
index 00000000..0d92b134
Binary files /dev/null and b/doc/gettingStarted/quickactions.jpg differ
diff --git a/doc/gettingStarted/settings.jpg b/doc/gettingStarted/settings.jpg
new file mode 100644
index 00000000..510b29eb
Binary files /dev/null and b/doc/gettingStarted/settings.jpg differ
diff --git a/doc/gettingStarted/version-071.jpg b/doc/gettingStarted/version-071.jpg
new file mode 100644
index 00000000..bc9bc5b5
Binary files /dev/null and b/doc/gettingStarted/version-071.jpg differ
diff --git a/doc/gettingStarted/version-1.0.jpg b/doc/gettingStarted/version-1.0.jpg
new file mode 100644
index 00000000..bcfc8c63
Binary files /dev/null and b/doc/gettingStarted/version-1.0.jpg differ
diff --git a/docker/.gitpod.Dockerfile b/docker/.gitpod.Dockerfile
index 2f7099a5..4fbc7be0 100644
--- a/docker/.gitpod.Dockerfile
+++ b/docker/.gitpod.Dockerfile
@@ -19,8 +19,11 @@ RUN apt-get update -qq \
       libffi-dev \
       libssl-dev \
       python3-dev \
+      git \
     && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
 
+# Git needed for PROJECT_GIT_COMMIT_HASH variable setting
+
 # Needs to be installed as root
 RUN pip3 install adafruit-nrfutil
 RUN pip3 install -Iv cryptography==3.3
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a6caa24e..0a4f69f0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -19,8 +19,11 @@ RUN apt-get update -qq \
       libssl-dev \
       python3-dev \
       python \
+      git \
     && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
 
+# Git needed for PROJECT_GIT_COMMIT_HASH variable setting
+
 RUN pip3 install adafruit-nrfutil
 RUN pip3 install -Iv cryptography==3.3
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5c6af93b..acbfba18 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -406,6 +406,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/FlashLight.cpp
         displayapp/screens/List.cpp
         displayapp/screens/BatteryInfo.cpp
+        displayapp/screens/Steps.cpp
 
         ## Settings
         displayapp/screens/settings/QuickSettings.cpp
@@ -414,12 +415,12 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingTimeFormat.cpp
         displayapp/screens/settings/SettingWakeUp.cpp
         displayapp/screens/settings/SettingDisplay.cpp
+        displayapp/screens/settings/SettingSteps.cpp
 
         ## Watch faces
         displayapp/icons/bg_clock.c
         displayapp/screens/WatchFaceAnalog.cpp
         displayapp/screens/WatchFaceDigital.cpp
-        displayapp/screens/PineTimeStyle.cpp
 
         ##
 
@@ -467,7 +468,7 @@ list(APPEND SOURCE_FILES
         displayapp/fonts/jetbrains_mono_extrabold_compressed.c
         displayapp/fonts/jetbrains_mono_bold_20.c
         displayapp/fonts/jetbrains_mono_76.c
-        displayapp/fonts/open_sans_light.c
+        displayapp/fonts/jetbrains_mono_42.c
         displayapp/fonts/lv_font_sys_48.c
         displayapp/lv_pinetime_theme.c
 
diff --git a/src/Version.h.in b/src/Version.h.in
index 6ff5938e..8cd39c96 100644
--- a/src/Version.h.in
+++ b/src/Version.h.in
@@ -8,11 +8,13 @@ namespace Pinetime {
       static constexpr uint32_t Major() {return major;}
       static constexpr uint32_t Minor() {return minor;}
       static constexpr uint32_t Patch() {return patch;}
+      static constexpr const char* GitCommitHash() {return commitHash;}
       static constexpr const char* VersionString() {return versionString;}
     private:
       static constexpr uint32_t major = @PROJECT_VERSION_MAJOR@;
       static constexpr uint32_t minor = @PROJECT_VERSION_MINOR@;
       static constexpr uint32_t patch = @PROJECT_VERSION_PATCH@;
+      static constexpr const char* commitHash = "@PROJECT_GIT_COMMIT_HASH@";
       static constexpr const char* versionString = "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@";
   };
 }
\ No newline at end of file
diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h
index bf644812..3a238262 100644
--- a/src/components/motion/MotionController.h
+++ b/src/components/motion/MotionController.h
@@ -8,13 +8,13 @@ namespace Pinetime {
     public:
       void Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps);
 
-      uint16_t X() const {
+      int16_t X() const {
         return x;
       }
-      uint16_t Y() const {
+      int16_t Y() const {
         return y;
       }
-      uint16_t Z() const {
+      int16_t Z() const {
         return z;
       }
       uint32_t NbSteps() const {
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 18c87fd4..4409425b 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -86,6 +86,14 @@ namespace Pinetime {
         return settings.brightLevel;
       };
 
+      void SetStepsGoal( uint32_t goal ) { 
+        if ( goal != settings.stepsGoal ) 
+          settingsChanged = true;
+        settings.stepsGoal = goal; 
+      };
+      
+      uint32_t GetStepsGoal() const { return settings.stepsGoal; };
+
     private:
       Pinetime::Drivers::SpiNorFlash& spiNorFlash;
       struct SettingsData {
@@ -95,7 +103,7 @@ namespace Pinetime {
 
         uint8_t clockFace = 0;
 
-        uint32_t stepsGoal = 1000;
+        uint32_t stepsGoal = 10000;
         uint32_t screenTimeOut = 15000;
 
         WakeUpMode wakeUpMode = WakeUpMode::None;
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index 936a3ae8..09a20181 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -21,12 +21,14 @@ namespace Pinetime {
       Navigation,
       StopWatch,
       Motion,
+      Steps,
       QuickSettings,
       Settings,
       SettingWatchFace,
       SettingTimeFormat,
       SettingDisplay,
-      SettingWakeUp
+      SettingWakeUp,
+      SettingSteps
     };
   }
 }
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 3a20c766..a6c4a3ec 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -25,6 +25,7 @@
 #include "displayapp/screens/Twos.h"
 #include "displayapp/screens/FlashLight.h"
 #include "displayapp/screens/BatteryInfo.h"
+#include "displayapp/screens/Steps.h"
 
 #include "drivers/Cst816s.h"
 #include "drivers/St7789.h"
@@ -37,6 +38,7 @@
 #include "displayapp/screens/settings/SettingTimeFormat.h"
 #include "displayapp/screens/settings/SettingWakeUp.h"
 #include "displayapp/screens/settings/SettingDisplay.h"
+#include "displayapp/screens/settings/SettingSteps.h"
 
 using namespace Pinetime::Applications;
 using namespace Pinetime::Applications::Display;
@@ -65,7 +67,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
     notificationManager {notificationManager},
     heartRateController {heartRateController},
     settingsController {settingsController},
-    motorController{motorController},
+    motorController {motorController},
     motionController {motionController} {
   msgQueue = xQueueCreate(queueSize, itemSize);
   // Start clock when smartwatch boots
@@ -73,8 +75,9 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
 }
 
 void DisplayApp::Start() {
-  if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 800, this, 0, &taskHandle))
+  if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 800, this, 0, &taskHandle)) {
     APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
+  }
 }
 
 void DisplayApp::Process(void* instance) {
@@ -85,7 +88,7 @@ void DisplayApp::Process(void* instance) {
   // Send a dummy notification to unlock the lvgl display driver for the first iteration
   xTaskNotifyGive(xTaskGetCurrentTaskHandle());
 
-  while (1) {
+  while (true) {
     app->Refresh();
   }
 }
@@ -213,7 +216,7 @@ void DisplayApp::StartApp(Apps app, DisplayApp::FullRefreshDirections direction)
   LoadApp(app, direction);
 }
 
-void DisplayApp::returnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent) {
+void DisplayApp::ReturnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent) {
   returnToApp = app;
   returnDirection = direction;
   returnTouchEvent = touchEvent;
@@ -224,12 +227,12 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
   SetFullRefresh(direction);
 
   // default return to launcher
-  returnApp(Apps::Launcher, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+  ReturnApp(Apps::Launcher, FullRefreshDirections::Down, TouchEvents::SwipeDown);
 
   switch (app) {
     case Apps::Launcher:
       currentScreen = std::make_unique<Screens::ApplicationList>(this, settingsController, batteryController, dateTimeController);
-      returnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::None:
     case Apps::Clock:
@@ -245,7 +248,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
 
     case Apps::FirmwareValidation:
       currentScreen = std::make_unique<Screens::FirmwareValidation>(this, validator);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::FirmwareUpdate:
       currentScreen = std::make_unique<Screens::FirmwareUpdate>(this, bleController);
@@ -254,54 +257,58 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
     case Apps::Notifications:
       currentScreen = std::make_unique<Screens::Notifications>(
         this, notificationManager, systemTask.nimble().alertService(), Screens::Notifications::Modes::Normal);
-      returnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
+      ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
     case Apps::NotificationsPreview:
       currentScreen = std::make_unique<Screens::Notifications>(
         this, notificationManager, systemTask.nimble().alertService(), Screens::Notifications::Modes::Preview);
-      returnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
+      ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp);
       break;
 
     // Settings
     case Apps::QuickSettings:
-      currentScreen =
-        std::make_unique<Screens::QuickSettings>(this, batteryController, dateTimeController, brightnessController, motorController, settingsController);
-      returnApp(Apps::Clock, FullRefreshDirections::LeftAnim, TouchEvents::SwipeLeft);
+      currentScreen = std::make_unique<Screens::QuickSettings>(
+        this, batteryController, dateTimeController, brightnessController, motorController, settingsController);
+      ReturnApp(Apps::Clock, FullRefreshDirections::LeftAnim, TouchEvents::SwipeLeft);
       break;
     case Apps::Settings:
       currentScreen = std::make_unique<Screens::Settings>(this, settingsController);
-      returnApp(Apps::QuickSettings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::QuickSettings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingWatchFace:
       currentScreen = std::make_unique<Screens::SettingWatchFace>(this, settingsController);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingTimeFormat:
       currentScreen = std::make_unique<Screens::SettingTimeFormat>(this, settingsController);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingWakeUp:
       currentScreen = std::make_unique<Screens::SettingWakeUp>(this, settingsController);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingDisplay:
       currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      break;
+    case Apps::SettingSteps: 
+      currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::BatteryInfo:
       currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SysInfo:
       currentScreen =
         std::make_unique<Screens::SystemInfo>(this, dateTimeController, batteryController, brightnessController, bleController, watchdog);
-      returnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
       //
 
     case Apps::FlashLight:
       currentScreen = std::make_unique<Screens::FlashLight>(this, systemTask, brightnessController);
-      returnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::None);
+      ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::None);
       break;
     case Apps::StopWatch:
       currentScreen = std::make_unique<Screens::StopWatch>(this);
@@ -327,6 +334,9 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
     case Apps::Motion:
       currentScreen = std::make_unique<Screens::Motion>(this, motionController);
       break;
+    case Apps::Steps: 
+      currentScreen = std::make_unique<Screens::Steps>(this, motionController, settingsController);
+      break;
   }
   currentApp = app;
 }
@@ -349,8 +359,9 @@ TouchEvents DisplayApp::OnTouchEvent() {
   if (info.isTouch) {
     switch (info.gesture) {
       case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
-        if (touchMode == TouchModes::Gestures)
+        if (touchMode == TouchModes::Gestures) {
           lvgl.SetNewTapEvent(info.x, info.y);
+        }
         return TouchEvents::Tap;
       case Pinetime::Drivers::Cst816S::Gestures::LongPress:
         return TouchEvents::LongTap;
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 75e52755..ffe27cf1 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -103,7 +103,7 @@ namespace Pinetime {
       static void Process(void* instance);
       void InitHw();
       void Refresh();
-      void returnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent);
+      void ReturnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent);
       void LoadApp(Apps app, DisplayApp::FullRefreshDirections direction);
     };
   }
diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp
index 6db987fa..a132a47c 100644
--- a/src/displayapp/DisplayAppRecovery.cpp
+++ b/src/displayapp/DisplayAppRecovery.cpp
@@ -37,7 +37,7 @@ void DisplayApp::Process(void* instance) {
   xTaskNotifyGive(xTaskGetCurrentTaskHandle());
 
   app->InitHw();
-  while (1) {
+  while (true) {
     app->Refresh();
   }
 }
@@ -51,10 +51,11 @@ void DisplayApp::Refresh() {
   if (xQueueReceive(msgQueue, &msg, 200)) {
     switch (msg) {
       case Display::Messages::UpdateBleConnection:
-        if (bleController.IsConnected())
+        if (bleController.IsConnected()) {
           DisplayLogo(colorBlue);
-        else
+        } else {
           DisplayLogo(colorWhite);
+        }
         break;
       case Display::Messages::BleFirmwareUpdateStarted:
         DisplayLogo(colorGreen);
diff --git a/src/displayapp/fonts/jetbrains_mono_42.c b/src/displayapp/fonts/jetbrains_mono_42.c
new file mode 100644
index 00000000..6f25f5ab
--- /dev/null
+++ b/src/displayapp/fonts/jetbrains_mono_42.c
@@ -0,0 +1,258 @@
+/*******************************************************************************
+ * Size: 42 px
+ * Bpp: 1
+ * Opts: 
+ ******************************************************************************/
+
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
+
+#ifndef JETBRAINS_MONO_42
+#define JETBRAINS_MONO_42 1
+#endif
+
+#if JETBRAINS_MONO_42
+
+/*-----------------
+ *    BITMAPS
+ *----------------*/
+
+/*Store the image of the glyphs*/
+static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
+    /* U+0025 "%" */
+    0x1f, 0x80, 0x7, 0x3f, 0xc0, 0xe, 0x7f, 0xe0,
+    0x1c, 0xf0, 0xf0, 0x1c, 0xe0, 0x70, 0x38, 0xe0,
+    0x70, 0x70, 0xe0, 0x70, 0x70, 0xe0, 0x70, 0xe0,
+    0xe0, 0x71, 0xc0, 0xe0, 0x71, 0xc0, 0xf0, 0xf3,
+    0x80, 0x7f, 0xe7, 0x0, 0x3f, 0xc7, 0x0, 0x1f,
+    0x8e, 0x0, 0x0, 0x1c, 0x0, 0x0, 0x3c, 0x0,
+    0x0, 0x38, 0x0, 0x0, 0x71, 0xf8, 0x0, 0xe3,
+    0xfc, 0x0, 0xe7, 0xfe, 0x1, 0xcf, 0xf, 0x3,
+    0x8e, 0x7, 0x3, 0x8e, 0x7, 0x7, 0xe, 0x7,
+    0xe, 0xe, 0x7, 0xe, 0xe, 0x7, 0x1c, 0xe,
+    0x7, 0x38, 0xf, 0xf, 0x38, 0x7, 0xfe, 0x70,
+    0x3, 0xfc, 0xe0, 0x1, 0xf8,
+
+    /* U+0030 "0" */
+    0x3, 0xf8, 0x1, 0xff, 0xc0, 0xff, 0xfe, 0x1f,
+    0x7, 0xc7, 0xc0, 0x7c, 0xf0, 0x7, 0xbc, 0x0,
+    0x7f, 0x80, 0xf, 0xf0, 0x1, 0xfe, 0x0, 0x3f,
+    0xc0, 0x7, 0xf8, 0x0, 0xff, 0xe, 0x1f, 0xe3,
+    0xe3, 0xfc, 0x7c, 0x7f, 0x8f, 0x8f, 0xf0, 0xe1,
+    0xfe, 0x0, 0x3f, 0xc0, 0x7, 0xf8, 0x0, 0xff,
+    0x0, 0x1f, 0xe0, 0x3, 0xfc, 0x0, 0x7f, 0x80,
+    0xf, 0xf0, 0x1, 0xef, 0x0, 0x79, 0xf0, 0x1f,
+    0x1f, 0x7, 0xc3, 0xff, 0xf8, 0x1f, 0xfc, 0x0,
+    0xfe, 0x0,
+
+    /* U+0031 "1" */
+    0x3, 0xf0, 0x0, 0xfe, 0x0, 0x3f, 0xc0, 0x1f,
+    0xf8, 0x7, 0xcf, 0x1, 0xf1, 0xe0, 0x3c, 0x3c,
+    0x7, 0x7, 0x80, 0x80, 0xf0, 0x0, 0x1e, 0x0,
+    0x3, 0xc0, 0x0, 0x78, 0x0, 0xf, 0x0, 0x1,
+    0xe0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0xf0,
+    0x0, 0x1e, 0x0, 0x3, 0xc0, 0x0, 0x78, 0x0,
+    0xf, 0x0, 0x1, 0xe0, 0x0, 0x3c, 0x0, 0x7,
+    0x80, 0x0, 0xf0, 0x0, 0x1e, 0x0, 0x3, 0xc0,
+    0x0, 0x78, 0xf, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xf8,
+
+    /* U+0032 "2" */
+    0x3, 0xf8, 0x1, 0xff, 0xc0, 0x7f, 0xfe, 0x1f,
+    0x7, 0xc7, 0xc0, 0x3c, 0xf0, 0x7, 0xbc, 0x0,
+    0x7f, 0x80, 0xf, 0xf0, 0x1, 0xe0, 0x0, 0x3c,
+    0x0, 0x7, 0x80, 0x1, 0xf0, 0x0, 0x3c, 0x0,
+    0xf, 0x80, 0x1, 0xe0, 0x0, 0x7c, 0x0, 0x1f,
+    0x0, 0x7, 0xc0, 0x1, 0xf0, 0x0, 0x7e, 0x0,
+    0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0, 0x3e,
+    0x0, 0xf, 0x80, 0x3, 0xe0, 0x0, 0xf8, 0x0,
+    0x3e, 0x0, 0x7, 0xff, 0xfe, 0xff, 0xff, 0xdf,
+    0xff, 0xf8,
+
+    /* U+0033 "3" */
+    0x7f, 0xff, 0x8f, 0xff, 0xf1, 0xff, 0xfe, 0x0,
+    0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf,
+    0x0, 0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3e, 0x0,
+    0x7, 0x80, 0x1, 0xfe, 0x0, 0x3f, 0xf0, 0x7,
+    0xff, 0x0, 0x3, 0xf0, 0x0, 0x1e, 0x0, 0x3,
+    0xc0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0xf0,
+    0x0, 0x1e, 0x0, 0x3, 0xfc, 0x0, 0x7f, 0x80,
+    0xf, 0xf0, 0x1, 0xef, 0x0, 0x79, 0xf0, 0x1f,
+    0x1f, 0x7, 0xc3, 0xff, 0xf0, 0x1f, 0xfc, 0x0,
+    0xfe, 0x0,
+
+    /* U+0034 "4" */
+    0x0, 0x1e, 0x0, 0xf, 0x80, 0x3, 0xc0, 0x1,
+    0xe0, 0x0, 0x78, 0x0, 0x3c, 0x0, 0x1f, 0x0,
+    0x7, 0x80, 0x3, 0xc0, 0x1, 0xf0, 0x0, 0x78,
+    0x0, 0x3e, 0x0, 0xf, 0x0, 0x7, 0x80, 0xf3,
+    0xe0, 0x3c, 0xf0, 0xf, 0x7c, 0x3, 0xde, 0x0,
+    0xff, 0x0, 0x3f, 0xc0, 0xf, 0xf0, 0x3, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0, 0x3,
+    0xc0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf, 0x0,
+    0x3, 0xc0, 0x0, 0xf0, 0x0, 0x3c,
+
+    /* U+0035 "5" */
+    0x7f, 0xff, 0x9f, 0xff, 0xe7, 0xff, 0xf9, 0xe0,
+    0x0, 0x78, 0x0, 0x1e, 0x0, 0x7, 0x80, 0x1,
+    0xe0, 0x0, 0x78, 0x0, 0x1e, 0x0, 0x7, 0x8f,
+    0x81, 0xef, 0xf8, 0x7f, 0xff, 0x1f, 0x87, 0xe7,
+    0xc0, 0x79, 0xe0, 0x1f, 0x0, 0x3, 0xc0, 0x0,
+    0xf0, 0x0, 0x3c, 0x0, 0xf, 0x0, 0x3, 0xc0,
+    0x0, 0xf0, 0x0, 0x3c, 0x0, 0xf, 0xf0, 0x3,
+    0xde, 0x1, 0xe7, 0x80, 0x78, 0xf8, 0x7e, 0x3f,
+    0xff, 0x3, 0xff, 0x80, 0x3f, 0x0,
+
+    /* U+0036 "6" */
+    0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0x78, 0x0,
+    0xf, 0x0, 0x1, 0xe0, 0x0, 0x1e, 0x0, 0x3,
+    0xc0, 0x0, 0x3c, 0x0, 0x7, 0x80, 0x0, 0x70,
+    0x0, 0xf, 0x0, 0x1, 0xe7, 0xc0, 0x1f, 0xff,
+    0x3, 0xff, 0xfc, 0x3f, 0xf, 0xc7, 0xc0, 0x3e,
+    0x78, 0x1, 0xe7, 0x80, 0x1f, 0xf0, 0x0, 0xff,
+    0x0, 0xf, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf0,
+    0x0, 0xff, 0x0, 0xf, 0xf8, 0x1, 0xe7, 0x80,
+    0x1e, 0x7c, 0x3, 0xe3, 0xf0, 0xfc, 0x1f, 0xff,
+    0x80, 0xff, 0xf0, 0x1, 0xf8, 0x0,
+
+    /* U+0037 "7" */
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x0, 0x1e, 0xf0, 0x1, 0xef, 0x0, 0x1e, 0xf0,
+    0x3, 0xcf, 0x0, 0x3c, 0x0, 0x3, 0x80, 0x0,
+    0x78, 0x0, 0x7, 0x80, 0x0, 0xf0, 0x0, 0xf,
+    0x0, 0x0, 0xf0, 0x0, 0x1e, 0x0, 0x1, 0xe0,
+    0x0, 0x3c, 0x0, 0x3, 0xc0, 0x0, 0x3c, 0x0,
+    0x7, 0x80, 0x0, 0x78, 0x0, 0x7, 0x80, 0x0,
+    0xf0, 0x0, 0xf, 0x0, 0x1, 0xe0, 0x0, 0x1e,
+    0x0, 0x1, 0xe0, 0x0, 0x3c, 0x0, 0x3, 0xc0,
+    0x0, 0x7c, 0x0, 0x7, 0x80, 0x0,
+
+    /* U+0038 "8" */
+    0x1, 0xf8, 0x0, 0xff, 0xf0, 0x1f, 0xff, 0x83,
+    0xf0, 0xfc, 0x3c, 0x3, 0xc7, 0xc0, 0x3e, 0x78,
+    0x1, 0xe7, 0x80, 0x1e, 0x78, 0x1, 0xe7, 0x80,
+    0x1e, 0x3c, 0x3, 0xc3, 0xe0, 0x7c, 0x1f, 0xf,
+    0x80, 0xff, 0xf0, 0x3, 0xfc, 0x0, 0x7f, 0xe0,
+    0xf, 0xff, 0x3, 0xe0, 0x7c, 0x3c, 0x3, 0xc7,
+    0x80, 0x1e, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf0,
+    0x0, 0xff, 0x0, 0xf, 0xf0, 0x0, 0xff, 0x80,
+    0x1f, 0x7c, 0x3, 0xe7, 0xe0, 0x7e, 0x3f, 0xff,
+    0xc0, 0xff, 0xf0, 0x3, 0xfc, 0x0,
+
+    /* U+0039 "9" */
+    0x3, 0xf8, 0x0, 0xff, 0xf0, 0x1f, 0xff, 0x83,
+    0xe0, 0xfc, 0x7c, 0x3, 0xe7, 0x80, 0x1e, 0xf8,
+    0x1, 0xff, 0x0, 0xf, 0xf0, 0x0, 0xff, 0x0,
+    0xf, 0xf0, 0x0, 0xff, 0x0, 0xf, 0xf8, 0x1,
+    0xf7, 0x80, 0x1e, 0x7c, 0x3, 0xe3, 0xe0, 0x7e,
+    0x3f, 0xff, 0xc1, 0xff, 0xfc, 0x7, 0xe7, 0x80,
+    0x0, 0xf8, 0x0, 0xf, 0x0, 0x1, 0xe0, 0x0,
+    0x1e, 0x0, 0x3, 0xc0, 0x0, 0x3c, 0x0, 0x7,
+    0x80, 0x0, 0xf8, 0x0, 0xf, 0x0, 0x1, 0xe0,
+    0x0, 0x1e, 0x0, 0x3, 0xc0, 0x0,
+
+    /* U+003A ":" */
+    0x7d, 0xff, 0xff, 0xff, 0xef, 0x80, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1,
+    0xf7, 0xff, 0xff, 0xff, 0xbe
+};
+
+
+/*---------------------
+ *  GLYPH DESCRIPTION
+ *--------------------*/
+
+static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
+    {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
+    {.bitmap_index = 0, .adv_w = 403, .box_w = 24, .box_h = 31, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 93, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 167, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 4, .ofs_y = 0},
+    {.bitmap_index = 241, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 315, .adv_w = 403, .box_w = 19, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 389, .adv_w = 403, .box_w = 18, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 459, .adv_w = 403, .box_w = 18, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 529, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 607, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 685, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 763, .adv_w = 403, .box_w = 20, .box_h = 31, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 841, .adv_w = 403, .box_w = 7, .box_h = 24, .ofs_x = 9, .ofs_y = 0}
+};
+
+/*---------------------
+ *  CHARACTER MAPPING
+ *--------------------*/
+
+
+
+/*Collect the unicode lists and glyph_id offsets*/
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
+    {
+        .range_start = 37, .range_length = 1, .glyph_id_start = 1,
+        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
+    },
+    {
+        .range_start = 48, .range_length = 11, .glyph_id_start = 2,
+        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
+    }
+};
+
+
+
+/*--------------------
+ *  ALL CUSTOM DATA
+ *--------------------*/
+
+#if LV_VERSION_CHECK(8, 0, 0)
+/*Store all the custom data of the font*/
+static  lv_font_fmt_txt_glyph_cache_t cache;
+static const lv_font_fmt_txt_dsc_t font_dsc = {
+#else
+static lv_font_fmt_txt_dsc_t font_dsc = {
+#endif
+    .glyph_bitmap = glyph_bitmap,
+    .glyph_dsc = glyph_dsc,
+    .cmaps = cmaps,
+    .kern_dsc = NULL,
+    .kern_scale = 0,
+    .cmap_num = 2,
+    .bpp = 1,
+    .kern_classes = 0,
+    .bitmap_format = 0,
+#if LV_VERSION_CHECK(8, 0, 0)
+    .cache = &cache
+#endif
+};
+
+
+/*-----------------
+ *  PUBLIC FONT
+ *----------------*/
+
+/*Initialize a public general font descriptor*/
+#if LV_VERSION_CHECK(8, 0, 0)
+const lv_font_t jetbrains_mono_42 = {
+#else
+lv_font_t jetbrains_mono_42 = {
+#endif
+    .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt,    /*Function pointer to get glyph's data*/
+    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
+    .line_height = 31,          /*The maximum line height required by the font*/
+    .base_line = 0,             /*Baseline measured from the bottom of the line*/
+#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
+    .subpx = LV_FONT_SUBPX_NONE,
+#endif
+#if LV_VERSION_CHECK(7, 4, 0)
+    .underline_position = -7,
+    .underline_thickness = 2,
+#endif
+    .dsc = &font_dsc           /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+};
+
+
+
+#endif /*#if JETBRAINS_MONO_42*/
+
diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp
index 7e38b3f4..1eb36999 100644
--- a/src/displayapp/screens/ApplicationList.cpp
+++ b/src/displayapp/screens/ApplicationList.cpp
@@ -49,7 +49,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen1() {
     {Symbols::stopWatch, Apps::StopWatch},
     {Symbols::music, Apps::Music},
     {Symbols::map, Apps::Navigation},
-    {Symbols::shoe, Apps::Motion},
+    {Symbols::shoe, Apps::Steps},
     {Symbols::heartBeat, Apps::HeartRate},
     {"", Apps::None},
   }};
@@ -62,7 +62,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen2() {
     {Symbols::paintbrush, Apps::Paint},
     {Symbols::paddle, Apps::Paddle},
     {"2", Apps::Twos},
-    {"", Apps::None},
+    {"M", Apps::Motion},
     {"", Apps::None},
     {"", Apps::None},
   }};
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index e0c1f62b..14299840 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -14,7 +14,6 @@
 #include "../DisplayApp.h"
 #include "WatchFaceDigital.h"
 #include "WatchFaceAnalog.h"
-#include "PineTimeStyle.h"
 
 using namespace Pinetime::Applications::Screens;
 
@@ -43,9 +42,6 @@ Clock::Clock(DisplayApp* app,
                [this]() -> std::unique_ptr<Screen> {
                  return WatchFaceAnalogScreen();
                },
-               [this]() -> std::unique_ptr<Screen> {
-                 return PineTimeStyleScreen();
-               },
                // Examples for more watch faces
                //[this]() -> std::unique_ptr<Screen> { return WatchFaceMinimalScreen(); },
                //[this]() -> std::unique_ptr<Screen> { return WatchFaceCustomScreen(); }
@@ -84,16 +80,6 @@ std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
     app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
 }
 
-std::unique_ptr<Screen> Clock::PineTimeStyleScreen() {
-  return std::make_unique<Screens::PineTimeStyle>(app,
-                                                     dateTimeController,
-                                                     batteryController,
-                                                     bleController,
-                                                     notificatioManager,
-                                                     settingsController,
-                                                     heartRateController);
-}
-
 /*
 // Examples for more watch faces
 std::unique_ptr<Screen> Clock::WatchFaceMinimalScreen() {
@@ -105,4 +91,4 @@ std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {
   return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager,
 settingsController);
 }
-*/
+*/
\ No newline at end of file
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 920d58bb..9879985f 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -47,10 +47,9 @@ namespace Pinetime {
         Controllers::HeartRateController& heartRateController;
         Controllers::MotionController& motionController;
 
-        ScreenList<3> screens;
+        ScreenList<2> screens;
         std::unique_ptr<Screen> WatchFaceDigitalScreen();
         std::unique_ptr<Screen> WatchFaceAnalogScreen();
-        std::unique_ptr<Screen> PineTimeStyleScreen();
 
         // Examples for more watch faces
         // std::unique_ptr<Screen> WatchFaceMinimalScreen();
diff --git a/src/displayapp/screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp
index 873a22f5..ad37a3df 100644
--- a/src/displayapp/screens/FirmwareValidation.cpp
+++ b/src/displayapp/screens/FirmwareValidation.cpp
@@ -27,6 +27,17 @@ FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp* app,
   sprintf(version, "%ld.%ld.%ld", Version::Major(), Version::Minor(), Version::Patch());
   lv_label_set_text(labelVersionValue, version);
 
+  labelShortRefInfo = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_align(labelShortRefInfo, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 25);
+  lv_label_set_text(labelShortRefInfo, "ShortRef : ");
+  lv_label_set_align(labelShortRefInfo, LV_LABEL_ALIGN_LEFT);
+
+  labelShortRefValue = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_align(labelShortRefValue, labelShortRefInfo, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
+  lv_label_set_recolor(labelShortRefValue, true);
+  sprintf(shortref, "%s", Version::GitCommitHash());
+  lv_label_set_text(labelShortRefValue, shortref);
+
   labelIsValidated = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(labelIsValidated, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 50);
   lv_label_set_recolor(labelIsValidated, true);
diff --git a/src/displayapp/screens/FirmwareValidation.h b/src/displayapp/screens/FirmwareValidation.h
index 67662fd9..303c2154 100644
--- a/src/displayapp/screens/FirmwareValidation.h
+++ b/src/displayapp/screens/FirmwareValidation.h
@@ -25,7 +25,10 @@ namespace Pinetime {
 
         lv_obj_t* labelVersionInfo;
         lv_obj_t* labelVersionValue;
+        lv_obj_t* labelShortRefInfo;
+        lv_obj_t* labelShortRefValue;
         char version[9];
+        char shortref[9];
         lv_obj_t* labelIsValidated;
         lv_obj_t* buttonValidate;
         lv_obj_t* labelButtonValidate;
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp
index e7196267..a8bb3c18 100644
--- a/src/displayapp/screens/Motion.cpp
+++ b/src/displayapp/screens/Motion.cpp
@@ -3,8 +3,6 @@
 #include "../DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
-extern lv_font_t jetbrains_mono_extrabold_compressed;
-extern lv_font_t jetbrains_mono_bold_20;
 
 Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionController& motionController)
   : Screen(app), motionController {motionController} {
@@ -29,13 +27,16 @@ Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionContr
   lv_chart_init_points(chart, ser3, 0);
   lv_chart_refresh(chart); /*Required after direct set*/
 
+  label = lv_label_create(lv_scr_act(), NULL);
+  lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", 0, 0, 0);
+  lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
+  lv_label_set_recolor(label, true);
+  
   labelStep = lv_label_create(lv_scr_act(), NULL);
   lv_obj_align(labelStep, chart, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
-  lv_label_set_text(labelStep, "Steps: ");
+  lv_label_set_text(labelStep, "Steps ---");
 
-  labelStepValue = lv_label_create(lv_scr_act(), NULL);
-  lv_obj_align(labelStepValue, labelStep, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
-  lv_label_set_text(labelStepValue, "-");
 }
 
 Motion::~Motion() {
@@ -47,8 +48,10 @@ bool Motion::Refresh() {
   lv_chart_set_next(chart, ser2, motionController.Y());
   lv_chart_set_next(chart, ser3, motionController.Z());
 
-  snprintf(nbStepsBuffer, nbStepsBufferSize, "%lu", motionController.NbSteps());
-  lv_label_set_text(labelStepValue, nbStepsBuffer);
+  lv_label_set_text_fmt(labelStep, "Steps %lu", motionController.NbSteps());
+
+  lv_label_set_text_fmt(label, "X #FF0000 %d# Y #008000 %d# Z #FFFF00 %d#", motionController.X() / 0x10, motionController.Y() / 0x10, motionController.Z() / 0x10);
+  lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
 
   return running;
 }
diff --git a/src/displayapp/screens/Motion.h b/src/displayapp/screens/Motion.h
index 11007866..132b20ec 100644
--- a/src/displayapp/screens/Motion.h
+++ b/src/displayapp/screens/Motion.h
@@ -26,9 +26,9 @@ namespace Pinetime {
         lv_chart_series_t* ser1;
         lv_chart_series_t* ser2;
         lv_chart_series_t* ser3;
+        lv_obj_t* label;
 
         lv_obj_t* labelStep;
-        lv_obj_t* labelStepValue;
         static constexpr uint8_t nbStepsBufferSize = 9;
         char nbStepsBuffer[nbStepsBufferSize + 1];
         bool running = true;
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index f0fd2f66..1f113750 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -176,7 +176,17 @@ Notifications::NotificationItem::NotificationItem(const char* title,
   lv_obj_set_style_local_text_color(alert_type, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x888888));
   if (title == nullptr)
     title = "Notification";
+  char* pchar;
+  pchar = strchr(title, '\n');
+  while (pchar != nullptr) {
+    *pchar = ' ';
+    pchar =
+    pchar = strchr(pchar + 1, '\n');
+  }
   lv_label_set_text(alert_type, title);
+  lv_label_set_long_mode(alert_type, LV_LABEL_LONG_SROLL_CIRC);
+  lv_label_set_anim_speed(alert_type, 3);
+  lv_obj_set_width(alert_type, 180);
   lv_obj_align(alert_type, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 16);
 
   /////////
diff --git a/src/displayapp/screens/Steps.cpp b/src/displayapp/screens/Steps.cpp
new file mode 100644
index 00000000..b485c975
--- /dev/null
+++ b/src/displayapp/screens/Steps.cpp
@@ -0,0 +1,72 @@
+#include "Steps.h"
+#include <lvgl/lvgl.h>
+#include "../DisplayApp.h"
+#include "Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+Steps::Steps(
+    Pinetime::Applications::DisplayApp *app, 
+    Controllers::MotionController& motionController,
+    Controllers::Settings &settingsController) 
+      : Screen(app), 
+      motionController{motionController},
+      settingsController{settingsController} {
+
+  stepsArc = lv_arc_create(lv_scr_act(), nullptr);
+
+  lv_obj_set_style_local_bg_opa(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, LV_OPA_0);  
+  lv_obj_set_style_local_border_width(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, 2);  
+  lv_obj_set_style_local_radius(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, 0);  
+  lv_obj_set_style_local_line_color(stepsArc, LV_ARC_PART_INDIC, LV_STATE_DEFAULT, lv_color_hex(0x0000FF));  
+  lv_arc_set_end_angle(stepsArc, 200);
+  lv_obj_set_size(stepsArc, 220, 220);
+  lv_arc_set_range(stepsArc, 0, 500);
+  lv_obj_align(stepsArc, nullptr, LV_ALIGN_CENTER, 0, 0);
+
+  stepsCount = motionController.NbSteps();
+
+  lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
+
+  lSteps = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
+  lv_obj_set_style_local_text_font(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);   
+  lv_label_set_text_fmt(lSteps, "%li", stepsCount); 
+  lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
+
+  lv_obj_t * lstepsL = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(lstepsL, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
+  lv_label_set_text_static(lstepsL, "Steps"); 
+  lv_obj_align(lstepsL, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+
+  lv_obj_t * lstepsGoal = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(lstepsGoal, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_CYAN);
+  lv_label_set_text_fmt(lstepsGoal,"Goal\n%i", settingsController.GetStepsGoal()); 
+  lv_label_set_align(lstepsGoal, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(lstepsGoal, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 60);
+
+  lv_obj_t * backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+  lv_obj_set_size(backgroundLabel, 240, 240);
+  lv_obj_set_pos(backgroundLabel, 0, 0);
+  lv_label_set_text_static(backgroundLabel, "");
+
+}
+
+Steps::~Steps() {
+  lv_obj_clean(lv_scr_act());
+}
+
+bool Steps::Refresh() {
+  
+  stepsCount = motionController.NbSteps();
+
+  lv_label_set_text_fmt(lSteps,"%li", stepsCount);
+  lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -20);
+     
+  lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal()));
+
+  return running;
+}
+
+
diff --git a/src/displayapp/screens/Steps.h b/src/displayapp/screens/Steps.h
new file mode 100644
index 00000000..9c135e26
--- /dev/null
+++ b/src/displayapp/screens/Steps.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "Screen.h"
+#include <components/motion/MotionController.h>
+
+namespace Pinetime {
+
+  namespace Controllers {
+    class Settings;
+  }
+
+  namespace Applications {
+    namespace Screens {
+
+      class Steps : public Screen {
+        public:
+          Steps(DisplayApp* app, Controllers::MotionController& motionController, Controllers::Settings &settingsController);
+          ~Steps() override;
+
+          bool Refresh() override;
+          
+
+        private:          
+
+          Controllers::MotionController& motionController;
+          Controllers::Settings& settingsController;
+
+          lv_obj_t * lSteps;
+          lv_obj_t * lStepsIcon;
+          lv_obj_t * stepsArc;
+
+          uint32_t stepsCount;
+
+      };
+    }
+  }
+}
diff --git a/src/displayapp/screens/StopWatch.cpp b/src/displayapp/screens/StopWatch.cpp
index e06981af..d7cd20c3 100644
--- a/src/displayapp/screens/StopWatch.cpp
+++ b/src/displayapp/screens/StopWatch.cpp
@@ -115,8 +115,9 @@ bool StopWatch::Refresh() {
     // Init state when an user first opens the app
     // and when a stop/reset button is pressed
     case States::Init: {
-      if (btnStopLap) {
+      if (btnStopLap != nullptr) {
         lv_obj_del(btnStopLap);
+        btnStopLap = nullptr;
       }
       // The initial default value
       lv_label_set_text(time, "00:00");
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index f6e8d61a..e4ef6911 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -69,12 +69,14 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen1() {
   lv_label_set_text_fmt(label,
                         "#FFFF00 InfiniTime#\n\n"
                         "#444444 Version# %ld.%ld.%ld\n\n"
+                        "#444444 Short Ref# %s\n\n"
                         "#444444 Build date#\n"
-                        "\t%s\n"
-                        "\t%s\n",
+                        "%s\n"
+                        "%s\n",
                         Version::Major(),
                         Version::Minor(),
                         Version::Patch(),
+                        Version::GitCommitHash(),
                         __DATE__,
                         __TIME__);
   lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
@@ -242,4 +244,4 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen5() {
   lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
   lv_obj_align(label, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
   return std::unique_ptr<Screen>(new Screens::Label(4, 5, app, label));
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/settings/SettingSteps.cpp b/src/displayapp/screens/settings/SettingSteps.cpp
new file mode 100644
index 00000000..b7c024f1
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingSteps.cpp
@@ -0,0 +1,98 @@
+#include "SettingSteps.h"
+#include <lvgl/lvgl.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  static void event_handler(lv_obj_t * obj, lv_event_t event) {
+    SettingSteps* screen = static_cast<SettingSteps *>(obj->user_data);
+    screen->UpdateSelected(obj, event);
+  }
+}
+
+SettingSteps::SettingSteps(
+  Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
+  Screen(app),
+  settingsController{settingsController}
+{
+
+  lv_obj_t * container1 = lv_cont_create(lv_scr_act(), nullptr);
+
+  //lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
+  lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+  lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
+  lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
+  lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_pos(container1, 30, 60);
+  lv_obj_set_width(container1, LV_HOR_RES - 50);
+  lv_obj_set_height(container1, LV_VER_RES - 60);
+  lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
+
+  lv_obj_t * title = lv_label_create(lv_scr_act(), NULL);  
+  lv_label_set_text_static(title,"Daily steps goal");
+  lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15);
+
+  lv_obj_t * icon = lv_label_create(lv_scr_act(), NULL);
+  lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
+  
+  lv_label_set_text_static(icon, Symbols::shoe);
+  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
+
+
+  stepValue = lv_label_create(lv_scr_act(), NULL);
+  lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+  lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
+
+  btnPlus = lv_btn_create(lv_scr_act(), NULL);
+  btnPlus->user_data = this;
+  lv_obj_set_size(btnPlus, 80, 50);
+  lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
+  lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
+  lv_obj_set_event_cb(btnPlus, event_handler);
+
+  btnMinus = lv_btn_create(lv_scr_act(), NULL);
+  btnMinus->user_data = this;
+  lv_obj_set_size(btnMinus, 80, 50);
+  lv_obj_set_event_cb(btnMinus, event_handler);
+  lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
+  lv_obj_set_style_local_value_str(btnMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
+
+}
+
+SettingSteps::~SettingSteps() {
+  lv_obj_clean(lv_scr_act());
+  settingsController.SaveSettings();
+}
+
+bool SettingSteps::Refresh() {
+  return running;
+}
+
+
+void SettingSteps::UpdateSelected(lv_obj_t *object, lv_event_t event) {
+  uint32_t value = settingsController.GetStepsGoal();
+  if(object == btnPlus && (event == LV_EVENT_PRESSED)) {
+    value += 1000;
+    if ( value <= 500000 ) {
+      settingsController.SetStepsGoal(value);
+      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
+    }
+  }
+
+  if(object == btnMinus && (event == LV_EVENT_PRESSED)) {
+    value -= 1000;
+    if ( value >= 1000 ) {
+      settingsController.SetStepsGoal(value);
+      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingSteps.h b/src/displayapp/screens/settings/SettingSteps.h
new file mode 100644
index 00000000..0a4c2056
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingSteps.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "components/settings/Settings.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingSteps : public Screen{
+        public:
+          SettingSteps(DisplayApp* app, Pinetime::Controllers::Settings &settingsController);
+          ~SettingSteps() override;
+
+          bool Refresh() override;
+          void UpdateSelected(lv_obj_t *object, lv_event_t event);
+         
+        private:          
+
+          Controllers::Settings& settingsController;
+
+          lv_obj_t * stepValue;
+          lv_obj_t * btnPlus;
+          lv_obj_t * btnMinus;
+          
+      };
+    }
+  }
+}
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index 3914a048..457cebf6 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -58,15 +58,6 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pine
     lv_checkbox_set_checked(cbOption[optionsTotal], true);
   }
 
-  optionsTotal++;
-    cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
-  lv_checkbox_set_text_static(cbOption[optionsTotal], " PineTimeStyle");
-  cbOption[optionsTotal]->user_data = this;
-  lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
-  if (settingsController.GetClockFace() == 2) {
-    lv_checkbox_set_checked(cbOption[optionsTotal], true);
-  }
-
   optionsTotal++;
 }
 
@@ -90,4 +81,4 @@ void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingWatchFace.h b/src/displayapp/screens/settings/SettingWatchFace.h
index 6f65d692..1930a228 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.h
+++ b/src/displayapp/screens/settings/SettingWatchFace.h
@@ -21,7 +21,7 @@ namespace Pinetime {
       private:
         Controllers::Settings& settingsController;
         uint8_t optionsTotal;
-        lv_obj_t* cbOption[3];
+        lv_obj_t* cbOption[2];
       };
     }
   }
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index e24be3d7..2c72c832 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -44,9 +44,7 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
     {Symbols::clock, "Wake Up", Apps::SettingWakeUp},
     {Symbols::clock, "Time format", Apps::SettingTimeFormat},
     {Symbols::clock, "Watch face", Apps::SettingWatchFace},
-  }
-
-  };
+  }};
 
   return std::unique_ptr<Screen>(new Screens::List(0, 2, app, settingsController, applications));
 }
@@ -54,13 +52,11 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
 std::unique_ptr<Screen> Settings::CreateScreen2() {
 
   std::array<Screens::List::Applications, 4> applications {{
+    {Symbols::shoe, "Steps", Apps::SettingSteps},
     {Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
     {Symbols::check, "Firmware", Apps::FirmwareValidation},
     {Symbols::list, "About", Apps::SysInfo},
-    {"", "", Apps::None},
-  }
-
-  };
+  }};
 
   return std::unique_ptr<Screen>(new Screens::List(1, 2, app, settingsController, applications));
 }
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h
index e774091b..761baba2 100644
--- a/src/libs/lv_conf.h
+++ b/src/libs/lv_conf.h
@@ -415,8 +415,8 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
 
 #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(jetbrains_mono_bold_20) \
                                LV_FONT_DECLARE(jetbrains_mono_extrabold_compressed) \
+                               LV_FONT_DECLARE(jetbrains_mono_42) \
                                LV_FONT_DECLARE(jetbrains_mono_76) \
-                               LV_FONT_DECLARE(open_sans_light) \
                                LV_FONT_DECLARE(lv_font_sys_48)
 
 /* Enable it if you have fonts with a lot of characters.
@@ -758,4 +758,4 @@ typedef void* lv_obj_user_data_t;
 
 /*--END OF LV_CONF_H--*/
 
-#endif /*LV_CONF_H*/
+#endif /*LV_CONF_H*/
\ No newline at end of file
diff --git a/src/logging/NrfLogger.cpp b/src/logging/NrfLogger.cpp
index 70a00e61..1c048f2c 100644
--- a/src/logging/NrfLogger.cpp
+++ b/src/logging/NrfLogger.cpp
@@ -12,8 +12,9 @@ void NrfLogger::Init() {
 
   NRF_LOG_DEFAULT_BACKENDS_INIT();
 
-  if (pdPASS != xTaskCreate(NrfLogger::Process, "LOGGER", 200, this, 0, &m_logger_thread))
+  if (pdPASS != xTaskCreate(NrfLogger::Process, "LOGGER", 200, this, 0, &m_logger_thread)) {
     APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
+  }
 }
 
 void NrfLogger::Process(void*) {
@@ -21,7 +22,7 @@ void NrfLogger::Process(void*) {
 // Suppress endless loop diagnostic
 #pragma clang diagnostic push
 #pragma ide diagnostic ignored "EndlessLoop"
-  while (1) {
+  while (true) {
     NRF_LOG_FLUSH();
     vTaskDelay(100); // Not good for power consumption, it will wake up every 100ms...
   }
-- 
cgit v1.2.3-70-g09d2


From 108bbc3642f9e6ca614ab4b470eb8ae34e739ffe Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 18 May 2021 18:03:26 +0200
Subject: Fix it again..

---
 src/CMakeLists.txt                                   |  2 ++
 src/displayapp/screens/Clock.cpp                     | 16 +++++++++++++++-
 src/displayapp/screens/Clock.h                       |  3 ++-
 src/displayapp/screens/settings/SettingWatchFace.cpp | 11 ++++++++++-
 src/libs/lv_conf.h                                   |  3 ++-
 5 files changed, 31 insertions(+), 4 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index acbfba18..5b83812d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -421,6 +421,7 @@ list(APPEND SOURCE_FILES
         displayapp/icons/bg_clock.c
         displayapp/screens/WatchFaceAnalog.cpp
         displayapp/screens/WatchFaceDigital.cpp
+        displayapp/screens/PineTimeStyle.cpp
 
         ##
 
@@ -470,6 +471,7 @@ list(APPEND SOURCE_FILES
         displayapp/fonts/jetbrains_mono_76.c
         displayapp/fonts/jetbrains_mono_42.c
         displayapp/fonts/lv_font_sys_48.c
+        displayapp/fonts/open_sans_light.c
         displayapp/lv_pinetime_theme.c
 
         systemtask/SystemTask.cpp
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 14299840..e0c1f62b 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -14,6 +14,7 @@
 #include "../DisplayApp.h"
 #include "WatchFaceDigital.h"
 #include "WatchFaceAnalog.h"
+#include "PineTimeStyle.h"
 
 using namespace Pinetime::Applications::Screens;
 
@@ -42,6 +43,9 @@ Clock::Clock(DisplayApp* app,
                [this]() -> std::unique_ptr<Screen> {
                  return WatchFaceAnalogScreen();
                },
+               [this]() -> std::unique_ptr<Screen> {
+                 return PineTimeStyleScreen();
+               },
                // Examples for more watch faces
                //[this]() -> std::unique_ptr<Screen> { return WatchFaceMinimalScreen(); },
                //[this]() -> std::unique_ptr<Screen> { return WatchFaceCustomScreen(); }
@@ -80,6 +84,16 @@ std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
     app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
 }
 
+std::unique_ptr<Screen> Clock::PineTimeStyleScreen() {
+  return std::make_unique<Screens::PineTimeStyle>(app,
+                                                     dateTimeController,
+                                                     batteryController,
+                                                     bleController,
+                                                     notificatioManager,
+                                                     settingsController,
+                                                     heartRateController);
+}
+
 /*
 // Examples for more watch faces
 std::unique_ptr<Screen> Clock::WatchFaceMinimalScreen() {
@@ -91,4 +105,4 @@ std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {
   return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager,
 settingsController);
 }
-*/
\ No newline at end of file
+*/
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 9879985f..920d58bb 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -47,9 +47,10 @@ namespace Pinetime {
         Controllers::HeartRateController& heartRateController;
         Controllers::MotionController& motionController;
 
-        ScreenList<2> screens;
+        ScreenList<3> screens;
         std::unique_ptr<Screen> WatchFaceDigitalScreen();
         std::unique_ptr<Screen> WatchFaceAnalogScreen();
+        std::unique_ptr<Screen> PineTimeStyleScreen();
 
         // Examples for more watch faces
         // std::unique_ptr<Screen> WatchFaceMinimalScreen();
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index 457cebf6..33d41416 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -58,6 +58,15 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pine
     lv_checkbox_set_checked(cbOption[optionsTotal], true);
   }
 
+  optionsTotal++;
+  cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
+  lv_checkbox_set_text_static(cbOption[optionsTotal], " PineTimeStyle");
+  cbOption[optionsTotal]->user_data = this;
+  lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
+  if (settingsController.GetClockFace() == 2) {
+    lv_checkbox_set_checked(cbOption[optionsTotal], true);
+  }
+
   optionsTotal++;
 }
 
@@ -81,4 +90,4 @@ void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h
index 761baba2..cabc1859 100644
--- a/src/libs/lv_conf.h
+++ b/src/libs/lv_conf.h
@@ -417,6 +417,7 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
                                LV_FONT_DECLARE(jetbrains_mono_extrabold_compressed) \
                                LV_FONT_DECLARE(jetbrains_mono_42) \
                                LV_FONT_DECLARE(jetbrains_mono_76) \
+                               LV_FONT_DECLARE(open_sans_light) \
                                LV_FONT_DECLARE(lv_font_sys_48)
 
 /* Enable it if you have fonts with a lot of characters.
@@ -758,4 +759,4 @@ typedef void* lv_obj_user_data_t;
 
 /*--END OF LV_CONF_H--*/
 
-#endif /*LV_CONF_H*/
\ No newline at end of file
+#endif /*LV_CONF_H*/
-- 
cgit v1.2.3-70-g09d2


From 5daaa5cf75b23e80776614af263c23e6433365e3 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Wed, 19 May 2021 11:03:33 +0200
Subject: Tidying/formatting fixes

---
 src/displayapp/screens/PineTimeStyle.cpp | 36 ++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index b249416a..10f2da66 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -15,6 +15,21 @@
 #include "../DisplayApp.h"
 
 /*
+ * This file is part of the Infinitime distribution (https://github.com/JF002/Infinitime).
+ * Copyright (c) 2021 Kieran Cawthray.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
  * PineTimeStyle watchface for Infinitime created by Kieran Cawthray
  * Based on WatchFaceDigital
  * Style/layout copied from TimeStyle for Pebble by Dan Tilden (github.com/tilden)
@@ -38,7 +53,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
     settingsController {settingsController},
     heartRateController {heartRateController} {
 
-  /* This sets the watchface number to return to after leaving the menu*/
+  /* This sets the watchface number to return to after leaving the menu */
   settingsController.SetClockFace(2);
 
   displayedChar[0] = 0;
@@ -47,7 +62,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   displayedChar[3] = 0;
   displayedChar[4] = 0;
 
-  /*Create a 200px wide background rectangle*/
+  /* Create a 200px wide background rectangle */
 
   timebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -55,7 +70,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
 
-  /*Display the time*/
+  /* Display the time */
 
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
@@ -69,7 +84,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
-  /*Create a 40px wide bar down the right side of the screen*/
+  /* Create a 40px wide bar down the right side of the screen */
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
@@ -77,7 +92,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 
-  /*Display icons*/
+  /* Display icons */
 
   batteryIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -86,17 +101,14 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
 
   batteryPlug = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(batteryPlug, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
-  //lv_label_set_text(batteryPlug, Symbols::plug);
   lv_obj_align(batteryPlug, sidebar, LV_ALIGN_IN_TOP_MID, 0, 2);
 
   bleIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
-  //lv_label_set_text(bleIcon, BleIcon::GetIcon(false));
   lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
 
   notificationIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
-  //lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
   lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 40);
 
   /* Calendar icon */
@@ -137,7 +149,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_size(calendarCrossBar2, 8, 3);
   lv_obj_align(calendarCrossBar2, calendarBar2, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
 
-  /*Display date*/
+  /* Display date */
 
   dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -154,7 +166,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_label_set_text(dateMonth, "MAR");
   lv_obj_align(dateMonth, sidebar, LV_ALIGN_CENTER, 0, 32);
 
-  /*Display heartrate info*/
+  /* Display heartrate info */
 
   heartbeatIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -208,10 +220,8 @@ bool PineTimeStyle::Refresh() {
     if (notificationState.Get() == true) {
       lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(true));
       lv_obj_realign(notificationIcon);
-      //lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, -8, 25);
     } else {
       lv_label_set_text(notificationIcon, NotificationIcon::GetIcon(false));
-      //lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
     }
   }
 
@@ -248,7 +258,7 @@ bool PineTimeStyle::Refresh() {
       char hourStr[3];
       char minStr[3];
 
-      /*Display the time as 2 pairs of digits*/
+      /* Display the time as 2 pairs of digits */
       sprintf(hourStr, "%c%c", hoursChar[0], hoursChar[1]);
       lv_label_set_text(timeDD1, hourStr);
 
-- 
cgit v1.2.3-70-g09d2


From 249b6db6f5a5a7ac6cfaf96b1d8e59306ffe1333 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Wed, 19 May 2021 17:05:33 +0200
Subject: Remove newline modifications

---
 src/displayapp/screens/Clock.cpp                     | 2 +-
 src/displayapp/screens/PineTimeStyle.cpp             | 2 +-
 src/displayapp/screens/settings/SettingWatchFace.cpp | 2 +-
 src/libs/lv_conf.h                                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index e0c1f62b..4f0efd92 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -105,4 +105,4 @@ std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {
   return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager,
 settingsController);
 }
-*/
+*/
\ No newline at end of file
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 10f2da66..f6597ca9 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -301,4 +301,4 @@ bool PineTimeStyle::Refresh() {
   }
 
   return running;
-}
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index 33d41416..3e73489d 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -90,4 +90,4 @@ void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h
index cabc1859..a03a4833 100644
--- a/src/libs/lv_conf.h
+++ b/src/libs/lv_conf.h
@@ -759,4 +759,4 @@ typedef void* lv_obj_user_data_t;
 
 /*--END OF LV_CONF_H--*/
 
-#endif /*LV_CONF_H*/
+#endif /*LV_CONF_H*/
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 5c413016a7b9e78040fb8e5b48cd37b7963362df Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Wed, 19 May 2021 17:27:42 +0200
Subject: Move GPL license header

---
 src/displayapp/screens/PineTimeStyle.cpp | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index f6597ca9..787bb40a 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -1,19 +1,3 @@
-#include "PineTimeStyle.h"
-
-#include <date/date.h>
-#include <lvgl/lvgl.h>
-#include <cstdio>
-#include "BatteryIcon.h"
-#include "BleIcon.h"
-#include "NotificationIcon.h"
-#include "Symbols.h"
-#include "components/battery/BatteryController.h"
-#include "components/ble/BleController.h"
-#include "components/ble/NotificationManager.h"
-#include "components/heartrate/HeartRateController.h"
-#include "components/settings/Settings.h"
-#include "../DisplayApp.h"
-
 /*
  * This file is part of the Infinitime distribution (https://github.com/JF002/Infinitime).
  * Copyright (c) 2021 Kieran Cawthray.
@@ -35,6 +19,21 @@
  * Style/layout copied from TimeStyle for Pebble by Dan Tilden (github.com/tilden)
  */
 
+#include "PineTimeStyle.h"
+#include <date/date.h>
+#include <lvgl/lvgl.h>
+#include <cstdio>
+#include "BatteryIcon.h"
+#include "BleIcon.h"
+#include "NotificationIcon.h"
+#include "Symbols.h"
+#include "components/battery/BatteryController.h"
+#include "components/ble/BleController.h"
+#include "components/ble/NotificationManager.h"
+#include "components/heartrate/HeartRateController.h"
+#include "components/settings/Settings.h"
+#include "../DisplayApp.h"
+
 using namespace Pinetime::Applications::Screens;
 
 PineTimeStyle::PineTimeStyle(DisplayApp* app,
-- 
cgit v1.2.3-70-g09d2


From 607af27ba8790f68d06d7cc855ef3058558defd7 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 20 Jun 2021 21:53:09 +0200
Subject: Add step count gauge - replaces heartrate in sidebar

---
 src/CMakeLists.txt                       |  2 ++
 src/displayapp/screens/Clock.cpp         |  2 +-
 src/displayapp/screens/PineTimeStyle.cpp | 56 ++++++++++++++++++--------------
 src/displayapp/screens/PineTimeStyle.h   |  9 ++---
 4 files changed, 39 insertions(+), 30 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 83f24394..aca86543 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -235,6 +235,7 @@ set(LVGL_SRC
         libs/lvgl/src/lv_widgets/lv_cont.h
         libs/lvgl/src/lv_widgets/lv_cpicker.h
         libs/lvgl/src/lv_widgets/lv_dropdown.h
+        libs/lvgl/src/lv_widgets/lv_gauge.h
         libs/lvgl/src/lv_widgets/lv_img.h
         libs/lvgl/src/lv_widgets/lv_imgbtn.h
         libs/lvgl/src/lv_widgets/lv_keyboard.h
@@ -321,6 +322,7 @@ set(LVGL_SRC
         libs/lvgl/src/lv_widgets/lv_cont.c
         libs/lvgl/src/lv_widgets/lv_cpicker.c
         libs/lvgl/src/lv_widgets/lv_dropdown.c
+        libs/lvgl/src/lv_widgets/lv_gauge.c
         libs/lvgl/src/lv_widgets/lv_img.c
         libs/lvgl/src/lv_widgets/lv_imgbtn.c
         libs/lvgl/src/lv_widgets/lv_keyboard.c
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 3b288d94..e0684976 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -87,7 +87,7 @@ std::unique_ptr<Screen> Clock::PineTimeStyleScreen() {
                                                      bleController,
                                                      notificatioManager,
                                                      settingsController,
-                                                     heartRateController);
+                                                     motionController);
 }
 
 /*
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 787bb40a..ab6e2a74 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -30,7 +30,7 @@
 #include "components/battery/BatteryController.h"
 #include "components/ble/BleController.h"
 #include "components/ble/NotificationManager.h"
-#include "components/heartrate/HeartRateController.h"
+#include "components/motion/MotionController.h"
 #include "components/settings/Settings.h"
 #include "../DisplayApp.h"
 
@@ -42,7 +42,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
                              Controllers::Ble& bleController,
                              Controllers::NotificationManager& notificatioManager,
                              Controllers::Settings& settingsController,
-                             Controllers::HeartRateController& heartRateController)
+                             Controllers::MotionController& motionController)
   : Screen(app),
     currentDateTime {{}},
     dateTimeController {dateTimeController},
@@ -50,7 +50,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
     bleController {bleController},
     notificatioManager {notificatioManager},
     settingsController {settingsController},
-    heartRateController {heartRateController} {
+    motionController {motionController} {
 
   /* This sets the watchface number to return to after leaving the menu */
   settingsController.SetClockFace(2);
@@ -165,17 +165,29 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_label_set_text(dateMonth, "MAR");
   lv_obj_align(dateMonth, sidebar, LV_ALIGN_CENTER, 0, 32);
 
-  /* Display heartrate info */
-
-  heartbeatIcon = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
-  lv_label_set_text(heartbeatIcon, Symbols::heartBeat);
-  lv_obj_align(heartbeatIcon, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, -30);
-
-  heartbeatValue = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
-  lv_label_set_text(heartbeatValue, "---");
-  lv_obj_align(heartbeatValue, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, -10);
+  // Step count gauge
+  static lv_color_t needle_colors[1];
+  needle_colors[0] = LV_COLOR_WHITE;
+  stepGauge = lv_gauge_create(lv_scr_act(), nullptr);
+  lv_gauge_set_needle_count(stepGauge, 1, needle_colors);
+  lv_obj_set_size(stepGauge, 40, 40);
+  lv_obj_align(stepGauge, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+  lv_gauge_set_scale(stepGauge, 360, 11, 0);
+  lv_gauge_set_angle_offset(stepGauge, 180);
+  lv_gauge_set_critical_value(stepGauge, (settingsController.GetStepsGoal() / 100));
+  lv_gauge_set_range(stepGauge, 0, (settingsController.GetStepsGoal() / 100));
+  lv_gauge_set_value(stepGauge, 0, 0);
+
+  lv_obj_set_style_local_pad_right(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_pad_left(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_pad_bottom(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_COVER);
+  lv_obj_set_style_local_scale_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+  lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
 
   backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_click(backgroundLabel, true);
@@ -286,17 +298,11 @@ bool PineTimeStyle::Refresh() {
     }
   }
 
-  heartbeat = heartRateController.HeartRate();
-  heartbeatRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
-  if (heartbeat.IsUpdated() || heartbeatRunning.IsUpdated()) {
-    char heartbeatBuffer[4];
-    if (heartbeatRunning.Get())
-      sprintf(heartbeatBuffer, "%d", heartbeat.Get());
-    else
-      sprintf(heartbeatBuffer, "---");
-
-    lv_label_set_text(heartbeatValue, heartbeatBuffer);
-    lv_obj_realign(heartbeatValue);
+  stepCount = motionController.NbSteps();
+  motionSensorOk = motionController.IsSensorOk();
+  if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) {
+      lv_gauge_set_value(stepGauge, 0, (stepCount.Get() / 100));
+      lv_obj_realign(stepGauge);
   }
 
   return running;
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
index 55752412..4530bb5f 100644
--- a/src/displayapp/screens/PineTimeStyle.h
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -27,7 +27,7 @@ namespace Pinetime {
                       Controllers::Ble& bleController,
                       Controllers::NotificationManager& notificatioManager,
                       Controllers::Settings& settingsController,
-                      Controllers::HeartRateController& heartRateController);
+                      Controllers::MotionController& motionController);
         ~PineTimeStyle() override;
 
         bool Refresh() override;
@@ -45,8 +45,8 @@ namespace Pinetime {
         DirtyValue<int> batteryPercentRemaining {};
         DirtyValue<bool> bleState {};
         DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
-        DirtyValue<uint8_t> heartbeat {};
-        DirtyValue<bool> heartbeatRunning {};
+        DirtyValue<bool> motionSensorOk {};
+        DirtyValue<uint32_t> stepCount {};
         DirtyValue<bool> notificationState {};
 
         lv_obj_t* timebar;
@@ -70,13 +70,14 @@ namespace Pinetime {
         lv_obj_t* heartbeatValue;
         lv_obj_t* heartbeatBpm;
         lv_obj_t* notificationIcon;
+        lv_obj_t* stepGauge;
 
         Controllers::DateTime& dateTimeController;
         Controllers::Battery& batteryController;
         Controllers::Ble& bleController;
         Controllers::NotificationManager& notificatioManager;
         Controllers::Settings& settingsController;
-        Controllers::HeartRateController& heartRateController;
+        Controllers::MotionController& motionController;
       };
     }
   }
-- 
cgit v1.2.3-70-g09d2


From 266573deff61b25e924738bc046c03edfeeb0ef8 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 20 Jun 2021 21:57:28 +0200
Subject: Enable 12/24h functionality

---
 src/displayapp/screens/PineTimeStyle.cpp | 30 +++++++++++++++++++++++++++++-
 src/displayapp/screens/PineTimeStyle.h   |  1 +
 2 files changed, 30 insertions(+), 1 deletion(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index ab6e2a74..6f7ec3a0 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -83,6 +83,12 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
+  timeAMPM = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
+  lv_label_set_text(timeAMPM, "");
+  lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
+
   /* Create a 40px wide bar down the right side of the screen */
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
@@ -257,7 +263,25 @@ bool PineTimeStyle::Refresh() {
     sprintf(minutesChar, "%02d", static_cast<int>(minute));
 
     char hoursChar[3];
-    sprintf(hoursChar, "%02d", hour);
+    char ampmChar[5];
+
+      if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
+        sprintf(hoursChar, "%02d", hour);
+      } else {
+        if (hour == 0 && hour != 12) {
+          hour = 12;
+          sprintf(ampmChar, "A\nM");
+        } else if (hour == 12 && hour != 0) {
+          hour = 12;
+          sprintf(ampmChar, "P\nM");
+        } else if (hour < 12 && hour != 0) {
+          sprintf(ampmChar, "A\nM");
+        } else if (hour > 12 && hour != 0) {
+          hour = hour - 12;
+          sprintf(ampmChar, "P\nM");
+        }
+        sprintf(hoursChar, "%02d", hour);
+      }
 
     if (hoursChar[0] != displayedChar[0] || hoursChar[1] != displayedChar[1] || minutesChar[0] != displayedChar[2] ||
         minutesChar[1] != displayedChar[3]) {
@@ -269,6 +293,10 @@ bool PineTimeStyle::Refresh() {
       char hourStr[3];
       char minStr[3];
 
+    if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
+        lv_label_set_text(timeAMPM, ampmChar);
+    }
+
       /* Display the time as 2 pairs of digits */
       sprintf(hourStr, "%c%c", hoursChar[0], hoursChar[1]);
       lv_label_set_text(timeDD1, hourStr);
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
index 4530bb5f..7c99c6a7 100644
--- a/src/displayapp/screens/PineTimeStyle.h
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -53,6 +53,7 @@ namespace Pinetime {
         lv_obj_t* sidebar;
         lv_obj_t* timeDD1;
         lv_obj_t* timeDD2;
+        lv_obj_t* timeAMPM;
         lv_obj_t* dateDayOfWeek;
         lv_obj_t* dateDay;
         lv_obj_t* dateMonth;
-- 
cgit v1.2.3-70-g09d2


From be505fc15fef5d87c311a442f291dd1cbd86fd40 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Mon, 21 Jun 2021 20:06:47 +0200
Subject: Set step gauge outer to be white when step goal is reached

---
 src/displayapp/screens/PineTimeStyle.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 6f7ec3a0..0dc4117c 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -329,8 +329,12 @@ bool PineTimeStyle::Refresh() {
   stepCount = motionController.NbSteps();
   motionSensorOk = motionController.IsSensorOk();
   if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) {
-      lv_gauge_set_value(stepGauge, 0, (stepCount.Get() / 100));
-      lv_obj_realign(stepGauge);
+    lv_gauge_set_value(stepGauge, 0, (stepCount.Get() / 100));
+    lv_obj_realign(stepGauge);
+    if (stepCount.Get() > settingsController.GetStepsGoal()) {
+      lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
+      lv_obj_set_style_local_scale_grad_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
+    }
   }
 
   return running;
-- 
cgit v1.2.3-70-g09d2


From c3f854ba65967631282a719743f68943f4c6c86f Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 22 Jun 2021 21:32:27 +0200
Subject: Add font source file

---
 src/displayapp/fonts/open_sans_light.ttf | Bin 0 -> 222412 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/displayapp/fonts/open_sans_light.ttf

(limited to 'src/displayapp')

diff --git a/src/displayapp/fonts/open_sans_light.ttf b/src/displayapp/fonts/open_sans_light.ttf
new file mode 100644
index 00000000..0d381897
Binary files /dev/null and b/src/displayapp/fonts/open_sans_light.ttf differ
-- 
cgit v1.2.3-70-g09d2


From 14721e8f1ef3fd8ebfe2bf870416c7f343f83936 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Wed, 23 Jun 2021 22:14:34 +0200
Subject: Move static needle_colors array to member variable

---
 src/displayapp/screens/PineTimeStyle.cpp | 1 -
 src/displayapp/screens/PineTimeStyle.h   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 0dc4117c..678099c0 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -172,7 +172,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_align(dateMonth, sidebar, LV_ALIGN_CENTER, 0, 32);
 
   // Step count gauge
-  static lv_color_t needle_colors[1];
   needle_colors[0] = LV_COLOR_WHITE;
   stepGauge = lv_gauge_create(lv_scr_act(), nullptr);
   lv_gauge_set_needle_count(stepGauge, 1, needle_colors);
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
index 7c99c6a7..70794cc5 100644
--- a/src/displayapp/screens/PineTimeStyle.h
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -72,6 +72,7 @@ namespace Pinetime {
         lv_obj_t* heartbeatBpm;
         lv_obj_t* notificationIcon;
         lv_obj_t* stepGauge;
+        lv_color_t needle_colors[1];
 
         Controllers::DateTime& dateTimeController;
         Controllers::Battery& batteryController;
-- 
cgit v1.2.3-70-g09d2


From 38ab0add487183c2f7e0a1e545de49a8ad7b17e1 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Thu, 24 Jun 2021 19:15:23 +0200
Subject: PineTimeStyle color picker initial commit

---
 src/CMakeLists.txt                                 |   1 +
 src/displayapp/Apps.h                              |   3 +-
 src/displayapp/DisplayApp.cpp                      |   5 +
 .../screens/settings/SettingPineTimeStyle.cpp      | 302 +++++++++++++++++++++
 .../screens/settings/SettingPineTimeStyle.h        |  58 ++++
 src/displayapp/screens/settings/Settings.cpp       |  15 +
 src/displayapp/screens/settings/Settings.h         |   3 +-
 7 files changed, 385 insertions(+), 2 deletions(-)
 create mode 100644 src/displayapp/screens/settings/SettingPineTimeStyle.cpp
 create mode 100644 src/displayapp/screens/settings/SettingPineTimeStyle.h

(limited to 'src/displayapp')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aca86543..caf015b0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -420,6 +420,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingWakeUp.cpp
         displayapp/screens/settings/SettingDisplay.cpp
         displayapp/screens/settings/SettingSteps.cpp
+        displayapp/screens/settings/SettingPineTimeStyle.cpp
 
         ## Watch faces
         displayapp/icons/bg_clock.c
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index 684e3a46..dd51fdb4 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -30,7 +30,8 @@ namespace Pinetime {
       SettingTimeFormat,
       SettingDisplay,
       SettingWakeUp,
-      SettingSteps
+      SettingSteps,
+      SettingPineTimeStyle
     };
   }
 }
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index de93428c..48a012a8 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -42,6 +42,7 @@
 #include "displayapp/screens/settings/SettingWakeUp.h"
 #include "displayapp/screens/settings/SettingDisplay.h"
 #include "displayapp/screens/settings/SettingSteps.h"
+#include "displayapp/screens/settings/SettingPineTimeStyle.h"
 
 using namespace Pinetime::Applications;
 using namespace Pinetime::Applications::Display;
@@ -323,6 +324,10 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
+    case Apps::SettingPineTimeStyle:
+      currentScreen = std::make_unique<Screens::SettingPineTimeStyle>(this, settingsController);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      break;
     case Apps::BatteryInfo:
       currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
new file mode 100644
index 00000000..3aceeb71
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -0,0 +1,302 @@
+#include "SettingPineTimeStyle.h"
+#include <lvgl/lvgl.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  static void event_handler(lv_obj_t * obj, lv_event_t event) {
+    SettingPineTimeStyle* screen = static_cast<SettingPineTimeStyle *>(obj->user_data);
+    screen->UpdateSelected(obj, event);
+  }
+}
+
+SettingPineTimeStyle::SettingPineTimeStyle(
+  Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
+  Screen(app),
+  settingsController{settingsController}
+{
+
+  timebar = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(timebar, 200, 240);
+  lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
+
+  /* Display the time */
+
+  timeDD1 = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_label_set_text(timeDD1, "12");
+  lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
+
+  timeDD2 = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_label_set_text(timeDD2, "34");
+  lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
+
+  timeAMPM = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
+  lv_label_set_text(timeAMPM, "A\nM");
+  lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
+
+  /* Create a 40px wide bar down the right side of the screen */
+
+  sidebar = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(sidebar, 40, 240);
+  lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
+
+  /* Display icons */
+
+  batteryIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(batteryIcon, Symbols::batteryFull);
+  lv_obj_align(batteryIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 2);
+
+  bleIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(bleIcon, Symbols::bluetooth);
+  lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
+
+  /* Calendar icon */
+
+  calendarOuter = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarOuter, 34, 34);
+  lv_obj_align(calendarOuter, sidebar, LV_ALIGN_CENTER, 0, 0);
+
+  calendarInner = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarInner, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xffffff));
+  lv_obj_set_style_local_radius(calendarInner, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarInner, 27, 27);
+  lv_obj_align(calendarInner, calendarOuter, LV_ALIGN_CENTER, 0, 0);
+
+  calendarBar1 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarBar1, 3, 12);
+  lv_obj_align(calendarBar1, calendarOuter, LV_ALIGN_IN_TOP_MID, -6, -3);
+
+  calendarBar2 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarBar2, 3, 12);
+  lv_obj_align(calendarBar2, calendarOuter, LV_ALIGN_IN_TOP_MID, 6, -3);
+
+  calendarCrossBar1 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarCrossBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarCrossBar1, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarCrossBar1, 8, 3);
+  lv_obj_align(calendarCrossBar1, calendarBar1, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+
+  calendarCrossBar2 = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(calendarCrossBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_radius(calendarCrossBar2, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_size(calendarCrossBar2, 8, 3);
+  lv_obj_align(calendarCrossBar2, calendarBar2, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+
+  /* Display date */
+
+  dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateDayOfWeek, "THU");
+  lv_obj_align(dateDayOfWeek, sidebar, LV_ALIGN_CENTER, 0, -34);
+
+  dateDay = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateDay, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateDay, "25");
+  lv_obj_align(dateDay, sidebar, LV_ALIGN_CENTER, 0, 3);
+
+  dateMonth = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(dateMonth, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_label_set_text(dateMonth, "MAR");
+  lv_obj_align(dateMonth, sidebar, LV_ALIGN_CENTER, 0, 32);
+
+  // Step count gauge
+  needle_colors[0] = LV_COLOR_WHITE;
+  stepGauge = lv_gauge_create(lv_scr_act(), nullptr);
+  lv_gauge_set_needle_count(stepGauge, 1, needle_colors);
+  lv_obj_set_size(stepGauge, 40, 40);
+  lv_obj_align(stepGauge, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+  lv_gauge_set_scale(stepGauge, 360, 11, 0);
+  lv_gauge_set_angle_offset(stepGauge, 180);
+  lv_gauge_set_critical_value(stepGauge, (100));
+  lv_gauge_set_range(stepGauge, 0, (100));
+  lv_gauge_set_value(stepGauge, 0, 0);
+
+  lv_obj_set_style_local_pad_right(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_pad_left(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_pad_bottom(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 3);
+  lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_COVER);
+  lv_obj_set_style_local_scale_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+  lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
+  
+//   lv_style_copy(&style_button, &lv_style_plain_color);
+//   style_button.body.opa = LV_OPA_50;
+  btnNextTime = lv_btn_create(lv_scr_act(), nullptr);
+  btnNextTime->user_data = this;
+  lv_obj_set_size(btnNextTime, 50, 50);
+  lv_obj_align(btnNextTime, lv_scr_act(), LV_ALIGN_CENTER, 55, -80);
+  lv_obj_set_style_local_value_str(btnNextTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
+  lv_obj_set_event_cb(btnNextTime, event_handler);
+
+  btnPrevTime = lv_btn_create(lv_scr_act(), nullptr);
+  btnPrevTime->user_data = this;
+  lv_obj_set_size(btnPrevTime, 50, 50);
+  lv_obj_align(btnPrevTime, lv_scr_act(), LV_ALIGN_CENTER, -55, -80);
+  lv_obj_set_style_local_value_str(btnPrevTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
+  lv_obj_set_event_cb(btnPrevTime, event_handler);
+
+  btnNextBar = lv_btn_create(lv_scr_act(), nullptr);
+  btnNextBar->user_data = this;
+  lv_obj_set_size(btnNextBar, 50, 50);
+  lv_obj_align(btnNextBar, lv_scr_act(), LV_ALIGN_CENTER, 55, 0);
+  lv_obj_set_style_local_value_str(btnNextBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
+  lv_obj_set_event_cb(btnNextBar, event_handler);
+
+  btnPrevBar = lv_btn_create(lv_scr_act(), nullptr);
+  btnPrevBar->user_data = this;
+  lv_obj_set_size(btnPrevBar, 50, 50);
+  lv_obj_align(btnPrevBar, lv_scr_act(), LV_ALIGN_CENTER, -55, 0);
+  lv_obj_set_style_local_value_str(btnPrevBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
+  lv_obj_set_event_cb(btnPrevBar, event_handler);
+
+  btnNextBG = lv_btn_create(lv_scr_act(), nullptr);
+  btnNextBG->user_data = this;
+  lv_obj_set_size(btnNextBG, 50, 50);
+  lv_obj_align(btnNextBG, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
+  lv_obj_set_style_local_value_str(btnNextBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
+  lv_obj_set_event_cb(btnNextBG, event_handler);
+
+  btnPrevBG = lv_btn_create(lv_scr_act(), nullptr);
+  btnPrevBG->user_data = this;
+  lv_obj_set_size(btnPrevBG, 50, 50);
+  lv_obj_align(btnPrevBG, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
+  lv_obj_set_style_local_value_str(btnPrevBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
+  lv_obj_set_event_cb(btnPrevBG, event_handler);
+
+  backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_click(backgroundLabel, true);
+  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+  lv_obj_set_size(backgroundLabel, 240, 240);
+  lv_obj_set_pos(backgroundLabel, 0, 0);
+  lv_label_set_text(backgroundLabel, "");
+
+  
+/*
+    
+  stepValue = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+  lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
+
+  btnPlus = lv_btn_create(lv_scr_act(), nullptr);
+  btnPlus->user_data = this;
+  lv_obj_set_size(btnPlus, 80, 50);
+  lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
+  lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
+  lv_obj_set_event_cb(btnPlus, event_handler);
+
+  btnMinus = lv_btn_create(lv_scr_act(), nullptr);
+  btnMinus->user_data = this;
+  lv_obj_set_size(btnMinus, 80, 50);
+  lv_obj_set_event_cb(btnMinus, event_handler);
+  lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
+  lv_obj_set_style_local_value_str(btnMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
+*/
+}
+
+SettingPineTimeStyle::~SettingPineTimeStyle() {
+  lv_obj_clean(lv_scr_act());
+  settingsController.SaveSettings();
+}
+
+bool SettingPineTimeStyle::Refresh() {
+  return running;
+}
+
+void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
+  uint8_t value = 0;
+  lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
+                             LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
+                             LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
+                             LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
+                             LV_COLOR_ORANGE};
+    
+  if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
+    if ( value < 16 ) {
+      value += 1;
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+    }
+  }
+  if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
+    if ( value > 0 ) {
+      value -= 1;
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+    }
+  }
+  if((object == btnNextTime) && (event == LV_EVENT_PRESSED)) {
+    if ( value < 16 ) {
+      value += 1;
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+    }
+  }
+  if((object == btnPrevTime) && (event == LV_EVENT_PRESSED)) {
+    if ( value > 0 ) {
+      value -= 1;
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+    }
+  }
+  if((object == btnNextBG) && (event == LV_EVENT_PRESSED)) {
+    if ( value < 16 ) {
+      value += 1;
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);        
+    }
+  }
+
+  if((object == btnPrevBG) && (event == LV_EVENT_PRESSED)) {
+    if ( value > 0 ) {
+      value -= 1;
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+    }
+  }
+    
+    
+    
+/*    
+  uint32_t value = settingsController.GetStepsGoal();
+  if(object == btnPlus && (event == LV_EVENT_PRESSED)) {
+    value += 1000;
+    if ( value <= 500000 ) {
+      settingsController.SetStepsGoal(value);
+      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
+    }
+  }
+
+  if(object == btnMinus && (event == LV_EVENT_PRESSED)) {
+    value -= 1000;
+    if ( value >= 1000 ) {
+      settingsController.SetStepsGoal(value);
+      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
+    }
+  }
+*/
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.h b/src/displayapp/screens/settings/SettingPineTimeStyle.h
new file mode 100644
index 00000000..5b5e61bf
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.h
@@ -0,0 +1,58 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "components/settings/Settings.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingPineTimeStyle : public Screen{
+        public:
+          SettingPineTimeStyle(DisplayApp* app, Pinetime::Controllers::Settings &settingsController);
+          ~SettingPineTimeStyle() override;
+
+          bool Refresh() override;
+          void UpdateSelected(lv_obj_t *object, lv_event_t event);
+         
+        private:          
+
+          Controllers::Settings& settingsController;
+
+          lv_obj_t * btnNextTime;
+          lv_obj_t * btnPrevTime;
+          lv_obj_t * btnNextBar;
+          lv_obj_t * btnPrevBar;
+          lv_obj_t * btnNextBG;
+          lv_obj_t * btnPrevBG;
+          lv_obj_t * timeColor;
+          lv_obj_t * barColor;
+          lv_obj_t * bgColor;
+          lv_obj_t * timebar;
+          lv_obj_t * sidebar;
+          lv_obj_t * timeDD1;
+          lv_obj_t * timeDD2;
+          lv_obj_t * timeAMPM;
+          lv_obj_t * dateDayOfWeek;
+          lv_obj_t * dateDay;
+          lv_obj_t * dateMonth;
+          lv_obj_t * backgroundLabel;
+          lv_obj_t * batteryIcon;
+          lv_obj_t * bleIcon;
+          lv_obj_t * calendarOuter;
+          lv_obj_t * calendarInner;
+          lv_obj_t * calendarBar1;
+          lv_obj_t * calendarBar2;
+          lv_obj_t * calendarCrossBar1;
+          lv_obj_t * calendarCrossBar2;
+          lv_obj_t * stepGauge;
+          lv_color_t needle_colors[1];
+          lv_color_t pts_colors[17];
+          
+      };
+    }
+  }
+}
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index e63a3584..73347804 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -18,6 +18,9 @@ Settings::Settings(Pinetime::Applications::DisplayApp* app, Pinetime::Controller
               },
               [this]() -> std::unique_ptr<Screen> {
                 return CreateScreen2();
+              },
+              [this]() -> std::unique_ptr<Screen> {
+                return CreateScreen3();
               }},
              Screens::ScreenListModes::UpDown} {
 }
@@ -60,3 +63,15 @@ std::unique_ptr<Screen> Settings::CreateScreen2() {
 
   return std::make_unique<Screens::List>(1, 2, app, settingsController, applications);
 }
+
+std::unique_ptr<Screen> Settings::CreateScreen3() {
+
+  std::array<Screens::List::Applications, 4> applications {{
+    {Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle},
+    {Symbols::none, "None", Apps::None},
+    {Symbols::none, "None", Apps::None},
+    {Symbols::none, "None", Apps::None},
+  }};
+
+  return std::make_unique<Screens::List>(2, 2, app, settingsController, applications);
+}
diff --git a/src/displayapp/screens/settings/Settings.h b/src/displayapp/screens/settings/Settings.h
index 711a6be6..12dd0514 100644
--- a/src/displayapp/screens/settings/Settings.h
+++ b/src/displayapp/screens/settings/Settings.h
@@ -21,10 +21,11 @@ namespace Pinetime {
       private:
         Controllers::Settings& settingsController;
 
-        ScreenList<2> screens;
+        ScreenList<3> screens;
 
         std::unique_ptr<Screen> CreateScreen1();
         std::unique_ptr<Screen> CreateScreen2();
+        std::unique_ptr<Screen> CreateScreen3();
       };
     }
   }
-- 
cgit v1.2.3-70-g09d2


From 7edfc534819ba7b9a14523d84df62952852a0fe3 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Thu, 24 Jun 2021 21:49:04 +0200
Subject: PineTimeStyle color picker add settings integration

---
 src/components/settings/Settings.h                 | 31 +++++++
 .../screens/settings/SettingPineTimeStyle.cpp      | 98 ++++++++++++----------
 2 files changed, 84 insertions(+), 45 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 4409425b..69e28e5b 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -27,6 +27,33 @@ namespace Pinetime {
         return settings.clockFace;
       };
 
+      void SetPTSColorTime(uint8_t colorTime) {
+        if (colorTime != settings.PTSColorTime)
+          settingsChanged = true;
+        settings.PTSColorTime = colorTime;
+      };
+      uint8_t GetPTSColorTime() const {
+        return settings.PTSColorTime;
+      };
+
+      void SetPTSColorBar(uint8_t colorBar) {
+        if (colorBar != settings.PTSColorBar)
+          settingsChanged = true;
+        settings.PTSColorBar = colorBar;
+      };
+      uint8_t GetPTSColorBar() const {
+        return settings.PTSColorBar;
+      };
+
+      void SetPTSColorBG(uint8_t colorBG) {
+        if (colorBG != settings.PTSColorBG)
+          settingsChanged = true;
+        settings.PTSColorBG = colorBG;
+      };
+      uint8_t GetPTSColorBG() const {
+        return settings.PTSColorBG;
+      };
+
       void SetAppMenu(uint8_t menu) {
         appMenu = menu;
       };
@@ -103,6 +130,10 @@ namespace Pinetime {
 
         uint8_t clockFace = 0;
 
+        uint8_t PTSColorTime = 11;
+        uint8_t PTSColorBar = 11;
+        uint8_t PTSColorBG = 3;
+
         uint32_t stepsGoal = 10000;
         uint32_t screenTimeOut = 15000;
 
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 3aceeb71..3673e79c 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -12,6 +12,12 @@ namespace {
   }
 }
 
+lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
+                             LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
+                             LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
+                             LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
+                             LV_COLOR_ORANGE};
+
 SettingPineTimeStyle::SettingPineTimeStyle(
   Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
   Screen(app),
@@ -19,7 +25,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
 {
 
   timebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
@@ -28,18 +34,18 @@ SettingPineTimeStyle::SettingPineTimeStyle(
 
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
   lv_label_set_text(timeDD1, "12");
   lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
 
   timeDD2 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
   timeAMPM = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
   lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
   lv_label_set_text(timeAMPM, "A\nM");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
@@ -47,7 +53,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   /* Create a 40px wide bar down the right side of the screen */
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
@@ -142,6 +148,13 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
   lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
   
+  backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_click(backgroundLabel, true);
+  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+  lv_obj_set_size(backgroundLabel, 240, 240);
+  lv_obj_set_pos(backgroundLabel, 0, 0);
+  lv_label_set_text(backgroundLabel, "");
+
 //   lv_style_copy(&style_button, &lv_style_plain_color);
 //   style_button.body.opa = LV_OPA_50;
   btnNextTime = lv_btn_create(lv_scr_act(), nullptr);
@@ -186,14 +199,6 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_style_local_value_str(btnPrevBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
   lv_obj_set_event_cb(btnPrevBG, event_handler);
 
-  backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_click(backgroundLabel, true);
-  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
-  lv_obj_set_size(backgroundLabel, 240, 240);
-  lv_obj_set_pos(backgroundLabel, 0, 0);
-  lv_label_set_text(backgroundLabel, "");
-
-  
 /*
     
   stepValue = lv_label_create(lv_scr_act(), nullptr);
@@ -228,52 +233,55 @@ bool SettingPineTimeStyle::Refresh() {
 }
 
 void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
-  uint8_t value = 0;
-  lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
-                             LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
-                             LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
-                             LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
-                             LV_COLOR_ORANGE};
+  uint8_t valueTime = settingsController.GetPTSColorTime();
+  uint8_t valueBar = settingsController.GetPTSColorBar();
+  uint8_t valueBG = settingsController.GetPTSColorBG();
     
-  if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
-    if ( value < 16 ) {
-      value += 1;
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+  if((object == btnNextTime) && (event == LV_EVENT_PRESSED)) {
+    if ( valueTime < 17 ) {
+      valueTime += 1;
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
   }
-  if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
-    if ( value > 0 ) {
-      value -= 1;
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+  if((object == btnPrevTime) && (event == LV_EVENT_PRESSED)) {
+    if ( valueTime > 0 ) {
+      valueTime -= 1;
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
   }
-  if((object == btnNextTime) && (event == LV_EVENT_PRESSED)) {
-    if ( value < 16 ) {
-      value += 1;
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+  if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
+    if ( valueBar < 17 ) {
+      valueBar += 1;
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
   }
-  if((object == btnPrevTime) && (event == LV_EVENT_PRESSED)) {
-    if ( value > 0 ) {
-      value -= 1;
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+  if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
+    if ( valueBar > 0 ) {
+      valueBar -= 1;
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
   }
   if((object == btnNextBG) && (event == LV_EVENT_PRESSED)) {
-    if ( value < 16 ) {
-      value += 1;
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);        
+    if ( valueBG < 17 ) {
+      valueBG += 1;
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
 
   if((object == btnPrevBG) && (event == LV_EVENT_PRESSED)) {
-    if ( value > 0 ) {
-      value -= 1;
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[value]);
+    if ( valueBG > 0 ) {
+      valueBG -= 1;
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
     
-- 
cgit v1.2.3-70-g09d2


From 8f16574992b1bb0f49b884f95cf9b7f5d709c6b6 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Thu, 24 Jun 2021 21:51:23 +0200
Subject: PineTimeStyle color picker tidying

---
 .../screens/settings/SettingPineTimeStyle.cpp      | 59 ++--------------------
 .../screens/settings/SettingPineTimeStyle.h        |  2 -
 2 files changed, 5 insertions(+), 56 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 3673e79c..dcdd6700 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -30,7 +30,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
 
-  /* Display the time */
+  // Display the time
 
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
@@ -50,7 +50,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_label_set_text(timeAMPM, "A\nM");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
 
-  /* Create a 40px wide bar down the right side of the screen */
+  // Create a 40px wide bar down the right side of the screen
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
@@ -58,7 +58,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 
-  /* Display icons */
+  // Display icons
 
   batteryIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -70,7 +70,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_label_set_text(bleIcon, Symbols::bluetooth);
   lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
 
-  /* Calendar icon */
+  // Calendar icon
 
   calendarOuter = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -108,7 +108,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_size(calendarCrossBar2, 8, 3);
   lv_obj_align(calendarCrossBar2, calendarBar2, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
 
-  /* Display date */
+  // Display date
 
   dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
@@ -155,8 +155,6 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_pos(backgroundLabel, 0, 0);
   lv_label_set_text(backgroundLabel, "");
 
-//   lv_style_copy(&style_button, &lv_style_plain_color);
-//   style_button.body.opa = LV_OPA_50;
   btnNextTime = lv_btn_create(lv_scr_act(), nullptr);
   btnNextTime->user_data = this;
   lv_obj_set_size(btnNextTime, 50, 50);
@@ -198,29 +196,6 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_align(btnPrevBG, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
   lv_obj_set_style_local_value_str(btnPrevBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
   lv_obj_set_event_cb(btnPrevBG, event_handler);
-
-/*
-    
-  stepValue = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
-  lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
-  lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
-
-  btnPlus = lv_btn_create(lv_scr_act(), nullptr);
-  btnPlus->user_data = this;
-  lv_obj_set_size(btnPlus, 80, 50);
-  lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
-  lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
-  lv_obj_set_event_cb(btnPlus, event_handler);
-
-  btnMinus = lv_btn_create(lv_scr_act(), nullptr);
-  btnMinus->user_data = this;
-  lv_obj_set_size(btnMinus, 80, 50);
-  lv_obj_set_event_cb(btnMinus, event_handler);
-  lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
-  lv_obj_set_style_local_value_str(btnMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
-*/
 }
 
 SettingPineTimeStyle::~SettingPineTimeStyle() {
@@ -276,7 +251,6 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
-
   if((object == btnPrevBG) && (event == LV_EVENT_PRESSED)) {
     if ( valueBG > 0 ) {
       valueBG -= 1;
@@ -284,27 +258,4 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
-    
-    
-    
-/*    
-  uint32_t value = settingsController.GetStepsGoal();
-  if(object == btnPlus && (event == LV_EVENT_PRESSED)) {
-    value += 1000;
-    if ( value <= 500000 ) {
-      settingsController.SetStepsGoal(value);
-      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
-      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
-    }
-  }
-
-  if(object == btnMinus && (event == LV_EVENT_PRESSED)) {
-    value -= 1000;
-    if ( value >= 1000 ) {
-      settingsController.SetStepsGoal(value);
-      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
-      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
-    }
-  }
-*/
 }
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.h b/src/displayapp/screens/settings/SettingPineTimeStyle.h
index 5b5e61bf..b8ec9e9e 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.h
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.h
@@ -19,7 +19,6 @@ namespace Pinetime {
           void UpdateSelected(lv_obj_t *object, lv_event_t event);
          
         private:          
-
           Controllers::Settings& settingsController;
 
           lv_obj_t * btnNextTime;
@@ -51,7 +50,6 @@ namespace Pinetime {
           lv_obj_t * stepGauge;
           lv_color_t needle_colors[1];
           lv_color_t pts_colors[17];
-          
       };
     }
   }
-- 
cgit v1.2.3-70-g09d2


From 50b92e5dd6bd879b61e5038d3f064d486db864f6 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Fri, 25 Jun 2021 14:47:56 +0200
Subject: Move array to member variable, retrieve colors from settings for
 display

---
 .../screens/settings/SettingPineTimeStyle.cpp           | 17 +++++------------
 src/displayapp/screens/settings/SettingPineTimeStyle.h  |  6 +++++-
 2 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index dcdd6700..bad0fec2 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -12,20 +12,13 @@ namespace {
   }
 }
 
-lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
-                             LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
-                             LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
-                             LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
-                             LV_COLOR_ORANGE};
-
 SettingPineTimeStyle::SettingPineTimeStyle(
   Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
   Screen(app),
   settingsController{settingsController}
 {
-
   timebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
@@ -34,18 +27,18 @@ SettingPineTimeStyle::SettingPineTimeStyle(
 
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
   lv_label_set_text(timeDD1, "12");
   lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
 
   timeDD2 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
   timeAMPM = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
   lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
   lv_label_set_text(timeAMPM, "A\nM");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
@@ -53,7 +46,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   // Create a 40px wide bar down the right side of the screen
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_TEAL);
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBar()]);
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.h b/src/displayapp/screens/settings/SettingPineTimeStyle.h
index b8ec9e9e..9b20f9fb 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.h
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.h
@@ -49,7 +49,11 @@ namespace Pinetime {
           lv_obj_t * calendarCrossBar2;
           lv_obj_t * stepGauge;
           lv_color_t needle_colors[1];
-          lv_color_t pts_colors[17];
+          lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
+                                       LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
+                                       LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
+                                       LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
+                                       LV_COLOR_ORANGE};
       };
     }
   }
-- 
cgit v1.2.3-70-g09d2


From 878dd1a7767bb4677ea629aef9d6fb98e2b2bc1a Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Fri, 25 Jun 2021 14:58:45 +0200
Subject: Use colors from settings for PineTimeStyle watchface

---
 src/displayapp/screens/PineTimeStyle.cpp | 10 +++++-----
 src/displayapp/screens/PineTimeStyle.h   |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 678099c0..c75931c4 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -64,7 +64,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   /* Create a 200px wide background rectangle */
 
   timebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
+  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
@@ -73,18 +73,18 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
 
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
   lv_label_set_text(timeDD1, "12");
   lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
 
   timeDD2 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
   timeAMPM = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
   lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
   lv_label_set_text(timeAMPM, "");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
@@ -92,7 +92,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   /* Create a 40px wide bar down the right side of the screen */
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
+  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBar()]);
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
index 70794cc5..97b39a01 100644
--- a/src/displayapp/screens/PineTimeStyle.h
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -73,6 +73,11 @@ namespace Pinetime {
         lv_obj_t* notificationIcon;
         lv_obj_t* stepGauge;
         lv_color_t needle_colors[1];
+        lv_color_t pts_colors[17] = {LV_COLOR_WHITE, LV_COLOR_SILVER, LV_COLOR_GRAY, LV_COLOR_BLACK,
+                                     LV_COLOR_RED, LV_COLOR_MAROON, LV_COLOR_YELLOW, LV_COLOR_OLIVE,
+                                     LV_COLOR_LIME, LV_COLOR_GREEN, LV_COLOR_CYAN, LV_COLOR_TEAL,
+                                     LV_COLOR_BLUE, LV_COLOR_NAVY, LV_COLOR_MAGENTA, LV_COLOR_PURPLE,
+                                     LV_COLOR_ORANGE};
 
         Controllers::DateTime& dateTimeController;
         Controllers::Battery& batteryController;
-- 
cgit v1.2.3-70-g09d2


From be22a9b1b8a3ca43cbf9e79d0a4f722d88d87ded Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Fri, 25 Jun 2021 15:09:18 +0200
Subject: Fix off-by-one error, reduce step gauge needle width

---
 src/displayapp/screens/PineTimeStyle.cpp                 | 2 +-
 src/displayapp/screens/settings/SettingPineTimeStyle.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index c75931c4..cbabca6f 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -191,7 +191,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
   lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
   lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
-  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 3);
   lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
 
   backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index bad0fec2..876d2b40 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -138,7 +138,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
   lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
   lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
-  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
+  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 3);
   lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
   
   backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
@@ -206,7 +206,7 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
   uint8_t valueBG = settingsController.GetPTSColorBG();
     
   if((object == btnNextTime) && (event == LV_EVENT_PRESSED)) {
-    if ( valueTime < 17 ) {
+    if ( valueTime < 16 ) {
       valueTime += 1;
       settingsController.SetPTSColorTime(valueTime);
       lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
@@ -224,7 +224,7 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
     }
   }
   if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
-    if ( valueBar < 17 ) {
+    if ( valueBar < 16 ) {
       valueBar += 1;
       settingsController.SetPTSColorBar(valueBar);
       lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
@@ -238,7 +238,7 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
     }
   }
   if((object == btnNextBG) && (event == LV_EVENT_PRESSED)) {
-    if ( valueBG < 17 ) {
+    if ( valueBG < 16 ) {
       valueBG += 1;
       settingsController.SetPTSColorBG(valueBG);
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
-- 
cgit v1.2.3-70-g09d2


From f3b40cb7a62c4927fb9fe921fdaa3b38809163f5 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Fri, 25 Jun 2021 19:04:29 +0200
Subject: Make it loop around when you get to the end of the list of colors

---
 .../screens/settings/SettingPineTimeStyle.cpp      | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 876d2b40..5e1396ad 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -212,6 +212,12 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
       lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
       lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+    } else {
+      valueTime = 0;
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
   }
   if((object == btnPrevTime) && (event == LV_EVENT_PRESSED)) {
@@ -221,6 +227,12 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
       lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
       lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+    }  else {
+      valueTime = 16;
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
   }
   if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
@@ -228,6 +240,10 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       valueBar += 1;
       settingsController.SetPTSColorBar(valueBar);
       lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
+    } else {
+      valueBar = 0;
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
   }
   if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
@@ -235,6 +251,10 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       valueBar -= 1;
       settingsController.SetPTSColorBar(valueBar);
       lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
+    } else {
+      valueBar = 16;
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
   }
   if((object == btnNextBG) && (event == LV_EVENT_PRESSED)) {
@@ -242,6 +262,10 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       valueBG += 1;
       settingsController.SetPTSColorBG(valueBG);
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
+    } else {
+      valueBG = 0;
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
   if((object == btnPrevBG) && (event == LV_EVENT_PRESSED)) {
@@ -249,6 +273,10 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       valueBG -= 1;
       settingsController.SetPTSColorBG(valueBG);
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
+    } else {
+      valueBG = 16;
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 800daecf9038dc495327da71aff5dcf3cee82e40 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Fri, 25 Jun 2021 21:36:55 +0200
Subject: Add a check to set default colors if all colors are white

---
 src/displayapp/screens/PineTimeStyle.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index cbabca6f..ad1d2db0 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -207,6 +207,13 @@ PineTimeStyle::~PineTimeStyle() {
 }
 
 bool PineTimeStyle::Refresh() {
+  //Feels like a hack, but if all the colors are white, this is probably not what the user wants
+  if (settingsController.GetPTSColorTime() + settingsController.GetPTSColorBar() + settingsController.GetPTSColorBG() == 0) {
+      settingsController.SetPTSColorTime(11);
+      settingsController.SetPTSColorBar(11);
+      settingsController.SetPTSColorBG(3);
+  }
+
   batteryPercentRemaining = batteryController.PercentRemaining();
   if (batteryPercentRemaining.IsUpdated()) {
     auto batteryPercent = batteryPercentRemaining.Get();
-- 
cgit v1.2.3-70-g09d2


From 6889cf1ed86f72f85a208961956ef6dff5972210 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Fri, 25 Jun 2021 21:55:51 +0200
Subject: Fix the fix, whoops

---
 src/displayapp/screens/PineTimeStyle.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index ad1d2db0..76db86e3 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -61,6 +61,13 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   displayedChar[3] = 0;
   displayedChar[4] = 0;
 
+  //Feels like a hack, but if all the colors are white, this is probably not what the user wants
+  if (settingsController.GetPTSColorTime() + settingsController.GetPTSColorBar() + settingsController.GetPTSColorBG() == 0) {
+      settingsController.SetPTSColorTime(11);
+      settingsController.SetPTSColorBar(11);
+      settingsController.SetPTSColorBG(3);
+  }
+
   /* Create a 200px wide background rectangle */
 
   timebar = lv_obj_create(lv_scr_act(), nullptr);
@@ -207,13 +214,6 @@ PineTimeStyle::~PineTimeStyle() {
 }
 
 bool PineTimeStyle::Refresh() {
-  //Feels like a hack, but if all the colors are white, this is probably not what the user wants
-  if (settingsController.GetPTSColorTime() + settingsController.GetPTSColorBar() + settingsController.GetPTSColorBG() == 0) {
-      settingsController.SetPTSColorTime(11);
-      settingsController.SetPTSColorBar(11);
-      settingsController.SetPTSColorBG(3);
-  }
-
   batteryPercentRemaining = batteryController.PercentRemaining();
   if (batteryPercentRemaining.IsUpdated()) {
     auto batteryPercent = batteryPercentRemaining.Get();
-- 
cgit v1.2.3-70-g09d2


From 660a8597f6edc66deec94782817613e1a4f84a6d Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 27 Jun 2021 15:24:17 +0200
Subject: Add reset button, reduce button opacity

---
 .../screens/settings/SettingPineTimeStyle.cpp      | 48 ++++++++++++++++------
 .../screens/settings/SettingPineTimeStyle.h        |  1 +
 2 files changed, 37 insertions(+), 12 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 5e1396ad..ae665464 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -150,45 +150,59 @@ SettingPineTimeStyle::SettingPineTimeStyle(
 
   btnNextTime = lv_btn_create(lv_scr_act(), nullptr);
   btnNextTime->user_data = this;
-  lv_obj_set_size(btnNextTime, 50, 50);
-  lv_obj_align(btnNextTime, lv_scr_act(), LV_ALIGN_CENTER, 55, -80);
+  lv_obj_set_size(btnNextTime, 60, 60);
+  lv_obj_align(btnNextTime, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -15, -80);
+  lv_obj_set_style_local_bg_opa(btnNextTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnNextTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
   lv_obj_set_event_cb(btnNextTime, event_handler);
 
   btnPrevTime = lv_btn_create(lv_scr_act(), nullptr);
   btnPrevTime->user_data = this;
-  lv_obj_set_size(btnPrevTime, 50, 50);
-  lv_obj_align(btnPrevTime, lv_scr_act(), LV_ALIGN_CENTER, -55, -80);
+  lv_obj_set_size(btnPrevTime, 60, 60);
+  lv_obj_align(btnPrevTime, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 15, -80);
+  lv_obj_set_style_local_bg_opa(btnPrevTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnPrevTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
   lv_obj_set_event_cb(btnPrevTime, event_handler);
 
   btnNextBar = lv_btn_create(lv_scr_act(), nullptr);
   btnNextBar->user_data = this;
-  lv_obj_set_size(btnNextBar, 50, 50);
-  lv_obj_align(btnNextBar, lv_scr_act(), LV_ALIGN_CENTER, 55, 0);
+  lv_obj_set_size(btnNextBar, 60, 60);
+  lv_obj_align(btnNextBar, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -15, 0);
+  lv_obj_set_style_local_bg_opa(btnNextBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnNextBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
   lv_obj_set_event_cb(btnNextBar, event_handler);
 
   btnPrevBar = lv_btn_create(lv_scr_act(), nullptr);
   btnPrevBar->user_data = this;
-  lv_obj_set_size(btnPrevBar, 50, 50);
-  lv_obj_align(btnPrevBar, lv_scr_act(), LV_ALIGN_CENTER, -55, 0);
+  lv_obj_set_size(btnPrevBar, 60, 60);
+  lv_obj_align(btnPrevBar, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 15, 0);
+  lv_obj_set_style_local_bg_opa(btnPrevBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnPrevBar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
   lv_obj_set_event_cb(btnPrevBar, event_handler);
 
   btnNextBG = lv_btn_create(lv_scr_act(), nullptr);
   btnNextBG->user_data = this;
-  lv_obj_set_size(btnNextBG, 50, 50);
-  lv_obj_align(btnNextBG, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
+  lv_obj_set_size(btnNextBG, 60, 60);
+  lv_obj_align(btnNextBG, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -15, 80);
+  lv_obj_set_style_local_bg_opa(btnNextBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnNextBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
   lv_obj_set_event_cb(btnNextBG, event_handler);
 
   btnPrevBG = lv_btn_create(lv_scr_act(), nullptr);
   btnPrevBG->user_data = this;
-  lv_obj_set_size(btnPrevBG, 50, 50);
-  lv_obj_align(btnPrevBG, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
+  lv_obj_set_size(btnPrevBG, 60, 60);
+  lv_obj_align(btnPrevBG, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 15, 80);
+  lv_obj_set_style_local_bg_opa(btnPrevBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnPrevBG, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
   lv_obj_set_event_cb(btnPrevBG, event_handler);
+
+  btnReset = lv_btn_create(lv_scr_act(), nullptr);
+  btnReset->user_data = this;
+  lv_obj_set_size(btnReset, 60, 60);
+  lv_obj_align(btnReset, lv_scr_act(), LV_ALIGN_CENTER, 0, 80);
+  lv_obj_set_style_local_bg_opa(btnReset, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
+  lv_obj_set_style_local_value_str(btnReset, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Rst");
+  lv_obj_set_event_cb(btnReset, event_handler);
 }
 
 SettingPineTimeStyle::~SettingPineTimeStyle() {
@@ -279,4 +293,14 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
   }
+  if((object == btnReset) && (event == LV_EVENT_PRESSED)) {
+      settingsController.SetPTSColorTime(11);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
+      settingsController.SetPTSColorBar(11);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
+      settingsController.SetPTSColorBG(3);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[3]);
+  }
 }
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.h b/src/displayapp/screens/settings/SettingPineTimeStyle.h
index 9b20f9fb..fe449b2e 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.h
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.h
@@ -27,6 +27,7 @@ namespace Pinetime {
           lv_obj_t * btnPrevBar;
           lv_obj_t * btnNextBG;
           lv_obj_t * btnPrevBG;
+          lv_obj_t * btnReset;
           lv_obj_t * timeColor;
           lv_obj_t * barColor;
           lv_obj_t * bgColor;
-- 
cgit v1.2.3-70-g09d2


From 9bd180896e16bf7451bf7063a646ce1d4b9e44f4 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 29 Jun 2021 21:12:39 +0200
Subject: Replace font file

---
 src/displayapp/fonts/open_sans_light.ttf | Bin 222412 -> 101696 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/fonts/open_sans_light.ttf b/src/displayapp/fonts/open_sans_light.ttf
index 0d381897..6580d3a1 100644
Binary files a/src/displayapp/fonts/open_sans_light.ttf and b/src/displayapp/fonts/open_sans_light.ttf differ
-- 
cgit v1.2.3-70-g09d2


From 2edf41be8eea79461a1f9b45a16d13f150c7e5d5 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Tue, 29 Jun 2021 21:15:39 +0200
Subject: Fix bad merge

---
 src/displayapp/screens/PineTimeStyle.cpp | 27 ---------------------------
 1 file changed, 27 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 57c0f3ba..76db86e3 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -61,7 +61,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   displayedChar[3] = 0;
   displayedChar[4] = 0;
 
-<<<<<<< HEAD
   //Feels like a hack, but if all the colors are white, this is probably not what the user wants
   if (settingsController.GetPTSColorTime() + settingsController.GetPTSColorBar() + settingsController.GetPTSColorBG() == 0) {
       settingsController.SetPTSColorTime(11);
@@ -73,12 +72,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
 
   timebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
-=======
-  /* Create a 200px wide background rectangle */
-
-  timebar = lv_obj_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
->>>>>>> upstream/develop
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
@@ -87,30 +80,18 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
 
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-<<<<<<< HEAD
   lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
-=======
-  lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
->>>>>>> upstream/develop
   lv_label_set_text(timeDD1, "12");
   lv_obj_align(timeDD1, timebar, LV_ALIGN_IN_TOP_MID, 5, 5);
 
   timeDD2 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
-<<<<<<< HEAD
   lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
-=======
-  lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
->>>>>>> upstream/develop
   lv_label_set_text(timeDD2, "34");
   lv_obj_align(timeDD2, timebar, LV_ALIGN_IN_BOTTOM_MID, 5, -5);
 
   timeAMPM = lv_label_create(lv_scr_act(), nullptr);
-<<<<<<< HEAD
   lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
-=======
-  lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
->>>>>>> upstream/develop
   lv_obj_set_style_local_text_line_space(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -3);
   lv_label_set_text(timeAMPM, "");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
@@ -118,11 +99,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   /* Create a 40px wide bar down the right side of the screen */
 
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
-<<<<<<< HEAD
   lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBar()]);
-=======
-  lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x008080));
->>>>>>> upstream/develop
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
@@ -221,11 +198,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, 4);
   lv_obj_set_style_local_line_color(stepGauge, LV_GAUGE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
   lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
-<<<<<<< HEAD
   lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 3);
-=======
-  lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
->>>>>>> upstream/develop
   lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
 
   backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
-- 
cgit v1.2.3-70-g09d2


From b3e3d75d0fd077cd4341092f57403b6b3e17c7fd Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sat, 24 Jul 2021 14:25:27 +0200
Subject: Add extra screen in settings to show scrollbar correctly

---
 src/displayapp/screens/settings/Settings.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index 73347804..43f60a31 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -49,7 +49,7 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
     {Symbols::clock, "Watch face", Apps::SettingWatchFace},
   }};
 
-  return std::make_unique<Screens::List>(0, 2, app, settingsController, applications);
+  return std::make_unique<Screens::List>(0, 3, app, settingsController, applications);
 }
 
 std::unique_ptr<Screen> Settings::CreateScreen2() {
@@ -61,7 +61,7 @@ std::unique_ptr<Screen> Settings::CreateScreen2() {
     {Symbols::list, "About", Apps::SysInfo},
   }};
 
-  return std::make_unique<Screens::List>(1, 2, app, settingsController, applications);
+  return std::make_unique<Screens::List>(1, 3, app, settingsController, applications);
 }
 
 std::unique_ptr<Screen> Settings::CreateScreen3() {
@@ -73,5 +73,5 @@ std::unique_ptr<Screen> Settings::CreateScreen3() {
     {Symbols::none, "None", Apps::None},
   }};
 
-  return std::make_unique<Screens::List>(2, 2, app, settingsController, applications);
+  return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);
 }
-- 
cgit v1.2.3-70-g09d2


From e6bc485679022c51486ac3a28b8473b95ff0d115 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 25 Jul 2021 22:18:39 +0200
Subject: Increment settings value, remove old hacky fix

---
 src/components/settings/Settings.h       |  2 +-
 src/displayapp/screens/PineTimeStyle.cpp | 28 ++++++++--------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index cddef635..40cafe9a 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -154,7 +154,7 @@ namespace Pinetime {
     private:
       Pinetime::Controllers::FS& fs;
 
-      static constexpr uint32_t settingsVersion = 0x0001;
+      static constexpr uint32_t settingsVersion = 0x0002;
       struct SettingsData {
 
         uint32_t version = settingsVersion;
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index b27bd9c7..afce698c 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -52,7 +52,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
     settingsController {settingsController},
     motionController {motionController} {
 
-  /* This sets the watchface number to return to after leaving the menu */
+  // This sets the watchface number to return to after leaving the menu
   settingsController.SetClockFace(2);
 
   displayedChar[0] = 0;
@@ -61,14 +61,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   displayedChar[3] = 0;
   displayedChar[4] = 0;
 
-  //Feels like a hack, but if all the colors are white, this is probably not what the user wants
-  if (settingsController.GetPTSColorTime() + settingsController.GetPTSColorBar() + settingsController.GetPTSColorBG() == 0) {
-      settingsController.SetPTSColorTime(11);
-      settingsController.SetPTSColorBar(11);
-      settingsController.SetPTSColorBG(3);
-  }
-
-  /* Create a 200px wide background rectangle */
+  //Create a 200px wide background rectangle
 
   timebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
@@ -76,8 +69,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_size(timebar, 200, 240);
   lv_obj_align(timebar, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 0);
 
-  /* Display the time */
-
+  // Display the time
   timeDD1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &open_sans_light);
   lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorTime()]);
@@ -96,16 +88,14 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_label_set_text(timeAMPM, "");
   lv_obj_align(timeAMPM, timebar, LV_ALIGN_IN_BOTTOM_LEFT, 2, -20);
 
-  /* Create a 40px wide bar down the right side of the screen */
-
+  // Create a 40px wide bar down the right side of the screen
   sidebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBar()]);
   lv_obj_set_style_local_radius(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
   lv_obj_set_size(sidebar, 40, 240);
   lv_obj_align(sidebar, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
 
-  /* Display icons */
-
+  // Display icons
   batteryIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_label_set_text(batteryIcon, Symbols::batteryFull);
@@ -123,8 +113,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 40);
 
-  /* Calendar icon */
-
+  // Calendar icon
   calendarOuter = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_obj_set_style_local_radius(calendarOuter, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
@@ -161,8 +150,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   lv_obj_set_size(calendarCrossBar2, 8, 3);
   lv_obj_align(calendarCrossBar2, calendarBar2, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
 
-  /* Display date */
-
+  // Display date
   dateDayOfWeek = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(dateDayOfWeek, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
   lv_label_set_text(dateDayOfWeek, "THU");
@@ -303,7 +291,7 @@ bool PineTimeStyle::Refresh() {
         lv_label_set_text(timeAMPM, ampmChar);
     }
 
-      /* Display the time as 2 pairs of digits */
+      // Display the time as 2 pairs of digits
       sprintf(hourStr, "%c%c", hoursChar[0], hoursChar[1]);
       lv_label_set_text(timeDD1, hourStr);
 
-- 
cgit v1.2.3-70-g09d2


From 6bffc7d52840affc5c037d1bb783172b99d4731a Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Thu, 12 Aug 2021 21:28:41 +0200
Subject: Tidying

---
 src/displayapp/screens/PineTimeStyle.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index 04128b21..6b0cc59a 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -62,7 +62,6 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
   displayedChar[4] = 0;
 
   //Create a 200px wide background rectangle
-
   timebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
-- 
cgit v1.2.3-70-g09d2


From 477ff32edc3bc0997f45d943f90f68f8f0608468 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 15 Aug 2021 10:41:00 +0200
Subject: Add randomise button to color picker

---
 .../screens/settings/SettingPineTimeStyle.cpp       | 21 +++++++++++++++++++++
 .../screens/settings/SettingPineTimeStyle.h         |  1 +
 2 files changed, 22 insertions(+)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index ae665464..a32ce34d 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -203,6 +203,14 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_style_local_bg_opa(btnReset, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
   lv_obj_set_style_local_value_str(btnReset, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Rst");
   lv_obj_set_event_cb(btnReset, event_handler);
+
+  btnRandom = lv_btn_create(lv_scr_act(), nullptr);
+  btnRandom->user_data = this;
+  lv_obj_set_size(btnRandom, 60, 60);
+  lv_obj_align(btnRandom, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
+  lv_obj_set_style_local_bg_opa(btnRandom, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_30);
+  lv_obj_set_style_local_value_str(btnRandom, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Rnd");
+  lv_obj_set_event_cb(btnRandom, event_handler);
 }
 
 SettingPineTimeStyle::~SettingPineTimeStyle() {
@@ -303,4 +311,17 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       settingsController.SetPTSColorBG(3);
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[3]);
   }
+  if((object == btnRandom) && (event == LV_EVENT_PRESSED)) {
+    uint8_t randTime = rand() % 17;
+    uint8_t randBar = rand() % 17;
+    uint8_t randBG = rand() % 17;
+    settingsController.SetPTSColorTime(randTime);
+    lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
+    lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
+    lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
+    settingsController.SetPTSColorBar(randBar);
+    lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBar]);
+    settingsController.SetPTSColorBG(randBG);
+    lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBG]);
+  }
 }
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.h b/src/displayapp/screens/settings/SettingPineTimeStyle.h
index fe449b2e..1a01ebbb 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.h
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.h
@@ -28,6 +28,7 @@ namespace Pinetime {
           lv_obj_t * btnNextBG;
           lv_obj_t * btnPrevBG;
           lv_obj_t * btnReset;
+          lv_obj_t * btnRandom;
           lv_obj_t * timeColor;
           lv_obj_t * barColor;
           lv_obj_t * bgColor;
-- 
cgit v1.2.3-70-g09d2


From c0bb88799c2de0ab8de5d38b3eb511f4f80029d7 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 15 Aug 2021 12:33:32 +0200
Subject: Add check for randomise button in case colors clash

---
 src/displayapp/screens/settings/SettingPineTimeStyle.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index a32ce34d..007c1cff 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -315,6 +315,11 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
     uint8_t randTime = rand() % 17;
     uint8_t randBar = rand() % 17;
     uint8_t randBG = rand() % 17;
+    // Check if the time color is the same as its background, or if the sidebar is black. If so, change them to more useful values.
+    if ((randTime == randBG) || (randBar == 3)) {
+      randBG += 1;
+      randBar = randTime;
+    }
     settingsController.SetPTSColorTime(randTime);
     lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
     lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
-- 
cgit v1.2.3-70-g09d2


From 16ea069d55e4bcbba097cf499901eddf1a3828db Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 15 Aug 2021 14:05:21 +0200
Subject: Remove duplicate code, minor fixes

---
 .../screens/settings/SettingPineTimeStyle.cpp      | 52 ++++++++--------------
 1 file changed, 19 insertions(+), 33 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 007c1cff..dfa806a3 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -230,76 +230,60 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
   if((object == btnNextTime) && (event == LV_EVENT_PRESSED)) {
     if ( valueTime < 16 ) {
       valueTime += 1;
-      settingsController.SetPTSColorTime(valueTime);
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     } else {
       valueTime = 0;
-      settingsController.SetPTSColorTime(valueTime);
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
+    settingsController.SetPTSColorTime(valueTime);
+    lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+    lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+    lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
   }
   if((object == btnPrevTime) && (event == LV_EVENT_PRESSED)) {
     if ( valueTime > 0 ) {
       valueTime -= 1;
-      settingsController.SetPTSColorTime(valueTime);
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }  else {
       valueTime = 16;
-      settingsController.SetPTSColorTime(valueTime);
-      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
+    settingsController.SetPTSColorTime(valueTime);
+    lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+    lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+    lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
   }
   if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
     if ( valueBar < 16 ) {
       valueBar += 1;
-      settingsController.SetPTSColorBar(valueBar);
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     } else {
       valueBar = 0;
-      settingsController.SetPTSColorBar(valueBar);
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
+    settingsController.SetPTSColorBar(valueBar);
+    lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
   }
   if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
     if ( valueBar > 0 ) {
       valueBar -= 1;
-      settingsController.SetPTSColorBar(valueBar);
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     } else {
       valueBar = 16;
-      settingsController.SetPTSColorBar(valueBar);
-      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
+    settingsController.SetPTSColorBar(valueBar);
+    lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
   }
   if((object == btnNextBG) && (event == LV_EVENT_PRESSED)) {
     if ( valueBG < 16 ) {
       valueBG += 1;
-      settingsController.SetPTSColorBG(valueBG);
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     } else {
       valueBG = 0;
-      settingsController.SetPTSColorBG(valueBG);
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
+    settingsController.SetPTSColorBG(valueBG);
+    lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
   }
   if((object == btnPrevBG) && (event == LV_EVENT_PRESSED)) {
     if ( valueBG > 0 ) {
       valueBG -= 1;
-      settingsController.SetPTSColorBG(valueBG);
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     } else {
       valueBG = 16;
-      settingsController.SetPTSColorBG(valueBG);
-      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
+    settingsController.SetPTSColorBG(valueBG);
+    lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
   }
   if((object == btnReset) && (event == LV_EVENT_PRESSED)) {
       settingsController.SetPTSColorTime(11);
@@ -316,8 +300,10 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
     uint8_t randBar = rand() % 17;
     uint8_t randBG = rand() % 17;
     // Check if the time color is the same as its background, or if the sidebar is black. If so, change them to more useful values.
-    if ((randTime == randBG) || (randBar == 3)) {
+    if (randTime == randBG) {
       randBG += 1;
+    }
+    if (randBar == 3) {
       randBar = randTime;
     }
     settingsController.SetPTSColorTime(randTime);
-- 
cgit v1.2.3-70-g09d2


From 5789f1527c5c8d1c31e78a6a88c6a2b6158eb671 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 15 Aug 2021 14:42:30 +0200
Subject: Avoid setting the sidebar black

---
 src/displayapp/screens/settings/SettingPineTimeStyle.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index dfa806a3..96b87800 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -252,6 +252,8 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
   if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
     if ( valueBar < 16 ) {
       valueBar += 1;
+      // Avoid setting the sidebar black
+      if ( valueBar == 3 ) { valueBar += 1; }
     } else {
       valueBar = 0;
     }
@@ -261,6 +263,8 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
   if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
     if ( valueBar > 0 ) {
       valueBar -= 1;
+      // Avoid setting the sidebar black
+      if ( valueBar == 3 ) { valueBar -= 1; }
     } else {
       valueBar = 16;
     }
-- 
cgit v1.2.3-70-g09d2


From 639fd3a9bd9f4a1ada36a4b812b7199543d47457 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 15 Aug 2021 15:00:54 +0200
Subject: More tidying following review

---
 .../screens/settings/SettingPineTimeStyle.cpp      | 173 +++++++++++----------
 1 file changed, 88 insertions(+), 85 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 96b87800..979e4b66 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -6,17 +6,14 @@
 using namespace Pinetime::Applications::Screens;
 
 namespace {
-  static void event_handler(lv_obj_t * obj, lv_event_t event) {
-    SettingPineTimeStyle* screen = static_cast<SettingPineTimeStyle *>(obj->user_data);
+  static void event_handler(lv_obj_t* obj, lv_event_t event) {
+    SettingPineTimeStyle* screen = static_cast<SettingPineTimeStyle*>(obj->user_data);
     screen->UpdateSelected(obj, event);
   }
 }
 
-SettingPineTimeStyle::SettingPineTimeStyle(
-  Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
-  Screen(app),
-  settingsController{settingsController}
-{
+SettingPineTimeStyle::SettingPineTimeStyle(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
+  : Screen(app), settingsController {settingsController} {
   timebar = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[settingsController.GetPTSColorBG()]);
   lv_obj_set_style_local_radius(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 0);
@@ -140,7 +137,7 @@ SettingPineTimeStyle::SettingPineTimeStyle(
   lv_obj_set_style_local_line_opa(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, LV_OPA_COVER);
   lv_obj_set_style_local_line_width(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 3);
   lv_obj_set_style_local_pad_inner(stepGauge, LV_GAUGE_PART_NEEDLE, LV_STATE_DEFAULT, 4);
-  
+
   backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_click(backgroundLabel, true);
   lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
@@ -222,74 +219,79 @@ bool SettingPineTimeStyle::Refresh() {
   return running;
 }
 
-void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
+void SettingPineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
   uint8_t valueTime = settingsController.GetPTSColorTime();
   uint8_t valueBar = settingsController.GetPTSColorBar();
   uint8_t valueBG = settingsController.GetPTSColorBG();
-    
-  if((object == btnNextTime) && (event == LV_EVENT_PRESSED)) {
-    if ( valueTime < 16 ) {
-      valueTime += 1;
-    } else {
-      valueTime = 0;
+
+  if (event == LV_EVENT_CLICKED) {
+    if (object == btnNextTime) {
+      if (valueTime < 16) {
+        valueTime += 1;
+      } else {
+        valueTime = 0;
+      }
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
-    settingsController.SetPTSColorTime(valueTime);
-    lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-    lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-    lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-  }
-  if((object == btnPrevTime) && (event == LV_EVENT_PRESSED)) {
-    if ( valueTime > 0 ) {
-      valueTime -= 1;
-    }  else {
-      valueTime = 16;
+    if (object == btnPrevTime) {
+      if (valueTime > 0) {
+        valueTime -= 1;
+      } else {
+        valueTime = 16;
+      }
+      settingsController.SetPTSColorTime(valueTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
     }
-    settingsController.SetPTSColorTime(valueTime);
-    lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-    lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-    lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueTime]);
-  }
-  if((object == btnNextBar) && (event == LV_EVENT_PRESSED)) {
-    if ( valueBar < 16 ) {
-      valueBar += 1;
-      // Avoid setting the sidebar black
-      if ( valueBar == 3 ) { valueBar += 1; }
-    } else {
-      valueBar = 0;
+    if (object == btnNextBar) {
+      if (valueBar < 16) {
+        valueBar += 1;
+        // Avoid setting the sidebar black
+        if (valueBar == 3) {
+          valueBar += 1;
+        }
+      } else {
+        valueBar = 0;
+      }
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
-    settingsController.SetPTSColorBar(valueBar);
-    lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
-  }
-  if((object == btnPrevBar) && (event == LV_EVENT_PRESSED)) {
-    if ( valueBar > 0 ) {
-      valueBar -= 1;
-      // Avoid setting the sidebar black
-      if ( valueBar == 3 ) { valueBar -= 1; }
-    } else {
-      valueBar = 16;
+    if (object == btnPrevBar) {
+      if (valueBar > 0) {
+        valueBar -= 1;
+        // Avoid setting the sidebar black
+        if (valueBar == 3) {
+          valueBar -= 1;
+        }
+      } else {
+        valueBar = 16;
+      }
+      settingsController.SetPTSColorBar(valueBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
     }
-    settingsController.SetPTSColorBar(valueBar);
-    lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBar]);
-  }
-  if((object == btnNextBG) && (event == LV_EVENT_PRESSED)) {
-    if ( valueBG < 16 ) {
-      valueBG += 1;
-    } else {
-      valueBG = 0;
+    if (object == btnNextBG) {
+      if (valueBG < 16) {
+        valueBG += 1;
+      } else {
+        valueBG = 0;
+      }
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
-    settingsController.SetPTSColorBG(valueBG);
-    lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
-  }
-  if((object == btnPrevBG) && (event == LV_EVENT_PRESSED)) {
-    if ( valueBG > 0 ) {
-      valueBG -= 1;
-    } else {
-      valueBG = 16;
+    if (object == btnPrevBG) {
+      if (valueBG > 0) {
+        valueBG -= 1;
+      } else {
+        valueBG = 16;
+      }
+      settingsController.SetPTSColorBG(valueBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
     }
-    settingsController.SetPTSColorBG(valueBG);
-    lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[valueBG]);
-  }
-  if((object == btnReset) && (event == LV_EVENT_PRESSED)) {
+    if (object == btnReset) {
       settingsController.SetPTSColorTime(11);
       lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
       lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
@@ -298,25 +300,26 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t *object, lv_event_t event) {
       lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[11]);
       settingsController.SetPTSColorBG(3);
       lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[3]);
-  }
-  if((object == btnRandom) && (event == LV_EVENT_PRESSED)) {
-    uint8_t randTime = rand() % 17;
-    uint8_t randBar = rand() % 17;
-    uint8_t randBG = rand() % 17;
-    // Check if the time color is the same as its background, or if the sidebar is black. If so, change them to more useful values.
-    if (randTime == randBG) {
-      randBG += 1;
     }
-    if (randBar == 3) {
-      randBar = randTime;
+    if (object == btnRandom) {
+      uint8_t randTime = rand() % 17;
+      uint8_t randBar = rand() % 17;
+      uint8_t randBG = rand() % 17;
+      // Check if the time color is the same as its background, or if the sidebar is black. If so, change them to more useful values.
+      if (randTime == randBG) {
+        randBG += 1;
+      }
+      if (randBar == 3) {
+        randBar = randTime;
+      }
+      settingsController.SetPTSColorTime(randTime);
+      lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
+      lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
+      lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
+      settingsController.SetPTSColorBar(randBar);
+      lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBar]);
+      settingsController.SetPTSColorBG(randBG);
+      lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBG]);
     }
-    settingsController.SetPTSColorTime(randTime);
-    lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
-    lv_obj_set_style_local_text_color(timeDD2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
-    lv_obj_set_style_local_text_color(timeAMPM, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
-    settingsController.SetPTSColorBar(randBar);
-    lv_obj_set_style_local_bg_color(sidebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBar]);
-    settingsController.SetPTSColorBG(randBG);
-    lv_obj_set_style_local_bg_color(timebar, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randBG]);
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 9851ed33d84aa242dfb98c2c3714a20ddbc53f45 Mon Sep 17 00:00:00 2001
From: Kieran Cawthray <kieranc@gmail.com>
Date: Sun, 15 Aug 2021 15:28:40 +0200
Subject: Fix potential edge case of sidebar being set black

---
 src/displayapp/screens/settings/SettingPineTimeStyle.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
index 979e4b66..e125c8a2 100644
--- a/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
+++ b/src/displayapp/screens/settings/SettingPineTimeStyle.cpp
@@ -310,7 +310,7 @@ void SettingPineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
         randBG += 1;
       }
       if (randBar == 3) {
-        randBar = randTime;
+        randBar -= 1;
       }
       settingsController.SetPTSColorTime(randTime);
       lv_obj_set_style_local_text_color(timeDD1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pts_colors[randTime]);
-- 
cgit v1.2.3-70-g09d2