Reset

17 files changed, 50 insertions, 293 deletions

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
@@ -59,6 +59,15 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pine
   }
 
   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++;
 }
 
 SettingWatchFace::~SettingWatchFace() {
@@ -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));
 }