Merge with develop and fix conflicts from timaios:set-datetime-manually.

src/CMakeLists.txt

@@ -433,6 +433,8 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingDisplay.cpp
         displayapp/screens/settings/SettingSteps.cpp
         displayapp/screens/settings/SettingPineTimeStyle.cpp
+        displayapp/screens/settings/SettingSetDate.cpp
+        displayapp/screens/settings/SettingSetTime.cpp
 
         ## Watch faces
         displayapp/icons/bg_clock.c

src/components/datetime/DateTimeController.cpp

@@ -107,6 +107,34 @@ const char* DateTime::DayOfWeekShortToStringLow() {
   return DateTime::DaysStringShortLow[static_cast<uint8_t>(dayOfWeek)];
 }
 
+const char* DateTime::MonthShortToString(Months month) {
+  return DateTime::MonthsString[static_cast<uint8_t>(month)];
+}
+
+const char* DateTime::MonthShortToStringLow(Months month) {
+  return DateTime::MonthsStringLow[static_cast<uint8_t>(month)];
+}
+
+const char* DateTime::MonthsToStringLow(Months month) {
+  return DateTime::MonthsLow[static_cast<uint8_t>(month)];
+}
+
+const char* DateTime::DayOfWeekToString(Days dayOfWeek) {
+  return DateTime::DaysString[static_cast<uint8_t>(dayOfWeek)];
+}
+
+const char* DateTime::DayOfWeekShortToString(Days dayOfWeek) {
+  return DateTime::DaysStringShort[static_cast<uint8_t>(dayOfWeek)];
+}
+
+const char* DateTime::DayOfWeekToStringLow(Days dayOfWeek) {
+  return DateTime::DaysStringLow[static_cast<uint8_t>(dayOfWeek)];
+}
+
+const char* DateTime::DayOfWeekShortToStringLow(Days dayOfWeek) {
+  return DateTime::DaysStringShortLow[static_cast<uint8_t>(dayOfWeek)];
+}
+
 void DateTime::Register(Pinetime::System::SystemTask* systemTask) {
   this->systemTask = systemTask;
 }

src/components/datetime/DateTimeController.h

@@ -66,6 +66,14 @@ namespace Pinetime {
       const char* DayOfWeekToStringLow();
       const char* DayOfWeekShortToStringLow();
 
+      static const char* MonthShortToString(Months month);
+      static const char* MonthShortToStringLow(Months month);
+      static const char* MonthsToStringLow(Months month);
+      static const char* DayOfWeekToString(Days dayOfWeek);
+      static const char* DayOfWeekShortToString(Days dayOfWeek);
+      static const char* DayOfWeekToStringLow(Days dayOfWeek);
+      static const char* DayOfWeekShortToStringLow(Days dayOfWeek);
+
       std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> CurrentDateTime() const {
         return currentDateTime;
       }

src/displayapp/Apps.h

@@ -32,7 +32,9 @@ namespace Pinetime {
       SettingDisplay,
       SettingWakeUp,
       SettingSteps,
-      SettingPineTimeStyle
+      SettingPineTimeStyle,
+      SettingSetDate,
+      SettingSetTime
     };
   }
 }

src/displayapp/DisplayApp.cpp

@@ -44,6 +44,8 @@
 #include "displayapp/screens/settings/SettingDisplay.h"
 #include "displayapp/screens/settings/SettingSteps.h"
 #include "displayapp/screens/settings/SettingPineTimeStyle.h"
+#include "displayapp/screens/settings/SettingSetDate.h"
+#include "displayapp/screens/settings/SettingSetTime.h"
 
 #include "libs/lv_conf.h"
 
@@ -365,6 +367,14 @@ 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::SettingSetDate:
+      currentScreen = std::make_unique<Screens::SettingSetDate>(this, dateTimeController);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      break;
+    case Apps::SettingSetTime:
+      currentScreen = std::make_unique<Screens::SettingSetTime>(this, dateTimeController);
+      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);

src/displayapp/screens/settings/SettingSetDate.cpp

@@ -0,0 +1,208 @@
+#include "SettingSetDate.h"
+#include <lvgl/lvgl.h>
+#include <hal/nrf_rtc.h>
+#include <nrf_log.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Symbols.h"
+
+#define POS_X_DAY   -72
+#define POS_X_MONTH   0
+#define POS_X_YEAR   72
+#define POS_Y_PLUS  -50
+#define POS_Y_TEXT   -6
+#define POS_Y_MINUS  40
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  static void event_handler(lv_obj_t * obj, lv_event_t event) {
+    SettingSetDate* screen = static_cast<SettingSetDate *>(obj->user_data);
+    screen->HandleButtonPress(obj, event);
+  }
+}
+
+SettingSetDate::SettingSetDate(
+  Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::DateTime &dateTimeController) :
+  Screen(app),
+  dateTimeController {dateTimeController}
+{
+  lv_obj_t * title = lv_label_create(lv_scr_act(), NULL);  
+  lv_label_set_text_static(title, "Set current date");
+  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::clock);
+  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
+
+  dayValue = static_cast<int>(dateTimeController.Day());
+  lblDay = lv_label_create(lv_scr_act(), NULL);
+  lv_label_set_text_fmt(lblDay, "%d", dayValue);
+  lv_label_set_align(lblDay, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(lblDay, lv_scr_act(), LV_ALIGN_CENTER, POS_X_DAY, POS_Y_TEXT);
+  lv_obj_set_auto_realign(lblDay, true);
+
+  monthValue = static_cast<int>(dateTimeController.Month());
+  lblMonth = lv_label_create(lv_scr_act(), NULL);
+  UpdateMonthLabel();
+  lv_label_set_align(lblMonth, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(lblMonth, lv_scr_act(), LV_ALIGN_CENTER, POS_X_MONTH, POS_Y_TEXT);
+  lv_obj_set_auto_realign(lblMonth, true);
+
+  yearValue = static_cast<int>(dateTimeController.Year());
+  if (yearValue < 2021)
+    yearValue = 2021;
+  lblYear = lv_label_create(lv_scr_act(), NULL);
+  lv_label_set_text_fmt(lblYear, "%d", yearValue);
+  lv_label_set_align(lblYear, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(lblYear, lv_scr_act(), LV_ALIGN_CENTER, POS_X_YEAR, POS_Y_TEXT);
+  lv_obj_set_auto_realign(lblYear, true);
+
+  btnDayPlus = lv_btn_create(lv_scr_act(), NULL);
+  btnDayPlus->user_data = this;
+  lv_obj_set_size(btnDayPlus, 50, 40);
+  lv_obj_align(btnDayPlus, lv_scr_act(), LV_ALIGN_CENTER, POS_X_DAY, POS_Y_PLUS);
+  lv_obj_set_style_local_value_str(btnDayPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
+  lv_obj_set_event_cb(btnDayPlus, event_handler);
+
+  btnDayMinus = lv_btn_create(lv_scr_act(), NULL);
+  btnDayMinus->user_data = this;
+  lv_obj_set_size(btnDayMinus, 50, 40);
+  lv_obj_align(btnDayMinus, lv_scr_act(), LV_ALIGN_CENTER, POS_X_DAY, POS_Y_MINUS);
+  lv_obj_set_style_local_value_str(btnDayMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
+  lv_obj_set_event_cb(btnDayMinus, event_handler);
+
+  btnMonthPlus = lv_btn_create(lv_scr_act(), NULL);
+  btnMonthPlus->user_data = this;
+  lv_obj_set_size(btnMonthPlus, 50, 40);
+  lv_obj_align(btnMonthPlus, lv_scr_act(), LV_ALIGN_CENTER, POS_X_MONTH, POS_Y_PLUS);
+  lv_obj_set_style_local_value_str(btnMonthPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
+  lv_obj_set_event_cb(btnMonthPlus, event_handler);
+
+  btnMonthMinus = lv_btn_create(lv_scr_act(), NULL);
+  btnMonthMinus->user_data = this;
+  lv_obj_set_size(btnMonthMinus, 50, 40);
+  lv_obj_align(btnMonthMinus, lv_scr_act(), LV_ALIGN_CENTER, POS_X_MONTH, POS_Y_MINUS);
+  lv_obj_set_style_local_value_str(btnMonthMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
+  lv_obj_set_event_cb(btnMonthMinus, event_handler);
+
+  btnYearPlus = lv_btn_create(lv_scr_act(), NULL);
+  btnYearPlus->user_data = this;
+  lv_obj_set_size(btnYearPlus, 50, 40);
+  lv_obj_align(btnYearPlus, lv_scr_act(), LV_ALIGN_CENTER, POS_X_YEAR, POS_Y_PLUS);
+  lv_obj_set_style_local_value_str(btnYearPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
+  lv_obj_set_event_cb(btnYearPlus, event_handler);
+
+  btnYearMinus = lv_btn_create(lv_scr_act(), NULL);
+  btnYearMinus->user_data = this;
+  lv_obj_set_size(btnYearMinus, 50, 40);
+  lv_obj_align(btnYearMinus, lv_scr_act(), LV_ALIGN_CENTER, POS_X_YEAR, POS_Y_MINUS);
+  lv_obj_set_style_local_value_str(btnYearMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
+  lv_obj_set_event_cb(btnYearMinus, event_handler);
+
+  btnSetTime = lv_btn_create(lv_scr_act(), NULL);
+  btnSetTime->user_data = this;
+  lv_obj_set_size(btnSetTime, 120, 48);
+  lv_obj_align(btnSetTime, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+  lv_obj_set_style_local_value_str(btnSetTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Set");
+  lv_obj_set_event_cb(btnSetTime, event_handler);
+}
+
+SettingSetDate::~SettingSetDate() {
+  lv_obj_clean(lv_scr_act());
+}
+
+void SettingSetDate::HandleButtonPress(lv_obj_t *object, lv_event_t event) {
+
+  if (event != LV_EVENT_CLICKED)
+    return;
+
+  if (object == btnDayPlus) {
+    dayValue++;
+    if (dayValue > MaximumDayOfMonth())
+      dayValue = 1;
+    lv_label_set_text_fmt(lblDay, "%d", dayValue);
+    lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
+  }
+  else if (object == btnDayMinus) {
+    dayValue--;
+    if (dayValue < 1)
+      dayValue = MaximumDayOfMonth();
+    lv_label_set_text_fmt(lblDay, "%d", dayValue);
+    lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
+  }
+  else if (object == btnMonthPlus) {
+    monthValue++;
+    if (monthValue > 12)
+      monthValue = 1;
+    UpdateMonthLabel();
+    lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
+    CheckDay();
+  }
+  else if (object == btnMonthMinus) {
+    monthValue--;
+    if (monthValue < 1)
+      monthValue = 12;
+    UpdateMonthLabel();
+    lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
+    CheckDay();
+  }
+  else if (object == btnYearPlus) {
+    yearValue++;
+    lv_label_set_text_fmt(lblYear, "%d", yearValue);
+    lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
+    CheckDay();
+  }
+  else if (object == btnYearMinus) {
+    yearValue--;
+    lv_label_set_text_fmt(lblYear, "%d", yearValue);
+    lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
+    CheckDay();
+  }
+  else if (object == btnSetTime) {
+    NRF_LOG_INFO("Setting date (manually) to %04d-%02d-%02d", yearValue, monthValue, dayValue);
+    dateTimeController.SetTime(static_cast<uint16_t>(yearValue),
+                               static_cast<uint8_t>(monthValue),
+                               static_cast<uint8_t>(dayValue),
+                               0,
+                               dateTimeController.Hours(),
+                               dateTimeController.Minutes(),
+                               dateTimeController.Seconds(),
+                               nrf_rtc_counter_get(portNRF_RTC_REG));
+    lv_btn_set_state(btnSetTime, LV_BTN_STATE_DISABLED);
+  }
+}
+
+int SettingSetDate::MaximumDayOfMonth() const {
+  switch (monthValue) {
+    case 2:
+      if ((((yearValue % 4) == 0) && ((yearValue % 100) != 0)) || ((yearValue % 400) == 0))
+        return 29;
+      return 28;
+    case 4:
+    case 6:
+    case 9:
+    case 11:
+      return 30;
+    default:
+      return 31;
+  }
+}
+
+void SettingSetDate::CheckDay() {
+  int maxDay = MaximumDayOfMonth();
+  if (dayValue > maxDay) {
+    dayValue = maxDay;
+    lv_label_set_text_fmt(lblDay, "%d", dayValue);
+    lv_obj_align(lblDay, lv_scr_act(), LV_ALIGN_CENTER, POS_X_DAY, POS_Y_TEXT);
+  }
+}
+
+void SettingSetDate::UpdateMonthLabel() {
+  lv_label_set_text_static(lblMonth,
+                           Pinetime::Controllers::DateTime::MonthShortToStringLow(static_cast<Pinetime::Controllers::DateTime::Months>(monthValue)));
+}
+

src/displayapp/screens/settings/SettingSetDate.h

@@ -0,0 +1,44 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "components/datetime/DateTimeController.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingSetDate : public Screen{
+        public:
+          SettingSetDate(DisplayApp* app, Pinetime::Controllers::DateTime &dateTimeController);
+          ~SettingSetDate() override;
+
+          void HandleButtonPress(lv_obj_t *object, lv_event_t event);
+         
+        private:          
+
+          Controllers::DateTime& dateTimeController;
+
+          int dayValue;
+          int monthValue;
+          int yearValue;
+          lv_obj_t * lblDay;
+          lv_obj_t * lblMonth;
+          lv_obj_t * lblYear;
+          lv_obj_t * btnDayPlus;
+          lv_obj_t * btnDayMinus;
+          lv_obj_t * btnMonthPlus;
+          lv_obj_t * btnMonthMinus;
+          lv_obj_t * btnYearPlus;
+          lv_obj_t * btnYearMinus;
+          lv_obj_t * btnSetTime;
+
+          int MaximumDayOfMonth() const;
+          void CheckDay();
+          void UpdateMonthLabel();
+      };
+    }
+  }
+}

src/displayapp/screens/settings/SettingSetTime.cpp

@@ -0,0 +1,161 @@
+#include "SettingSetTime.h"
+#include <lvgl/lvgl.h>
+#include <hal/nrf_rtc.h>
+#include <nrf_log.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Symbols.h"
+
+#define POS_X_HOURS    -72
+#define POS_X_MINUTES    0
+#define POS_X_SECONDS   72
+#define POS_Y_PLUS     -50
+#define POS_Y_TEXT      -6
+#define POS_Y_MINUS     40
+#define OFS_Y_COLON     -2
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  static void event_handler(lv_obj_t * obj, lv_event_t event) {
+    SettingSetTime* screen = static_cast<SettingSetTime *>(obj->user_data);
+    screen->HandleButtonPress(obj, event);
+  }
+}
+
+SettingSetTime::SettingSetTime(
+  Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::DateTime &dateTimeController) :
+  Screen(app),
+  dateTimeController {dateTimeController}
+{
+  lv_obj_t * title = lv_label_create(lv_scr_act(), NULL);  
+  lv_label_set_text_static(title, "Set current time");
+  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::clock);
+  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
+
+  hoursValue = static_cast<int>(dateTimeController.Hours());
+  lblHours = lv_label_create(lv_scr_act(), NULL);
+  lv_obj_set_style_local_text_font(lblHours, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
+  lv_label_set_align(lblHours, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(lblHours, lv_scr_act(), LV_ALIGN_CENTER, POS_X_HOURS, POS_Y_TEXT);
+  lv_obj_set_auto_realign(lblHours, true);
+
+  lv_obj_t * lblColon1 = lv_label_create(lv_scr_act(), NULL);
+  lv_obj_set_style_local_text_font(lblColon1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_label_set_text_static(lblColon1, ":");
+  lv_label_set_align(lblColon1, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(lblColon1, lv_scr_act(), LV_ALIGN_CENTER, (POS_X_HOURS + POS_X_MINUTES) / 2, POS_Y_TEXT + OFS_Y_COLON);
+
+  minutesValue = static_cast<int>(dateTimeController.Minutes());
+  lblMinutes = lv_label_create(lv_scr_act(), NULL);
+  lv_obj_set_style_local_text_font(lblMinutes, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_label_set_text_fmt(lblMinutes, "%02d", minutesValue);
+  lv_label_set_align(lblMinutes, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(lblMinutes, lv_scr_act(), LV_ALIGN_CENTER, POS_X_MINUTES, POS_Y_TEXT);
+  lv_obj_set_auto_realign(lblMinutes, true);
+
+  lv_obj_t * lblColon2 = lv_label_create(lv_scr_act(), NULL);
+  lv_obj_set_style_local_text_font(lblColon2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_label_set_text_static(lblColon2, ":");
+  lv_label_set_align(lblColon2, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(lblColon2, lv_scr_act(), LV_ALIGN_CENTER, (POS_X_MINUTES + POS_X_SECONDS) / 2, POS_Y_TEXT + OFS_Y_COLON);
+
+  lv_obj_t * lblSeconds = lv_label_create(lv_scr_act(), NULL);
+  lv_obj_set_style_local_text_font(lblSeconds, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_label_set_text_static(lblSeconds, "00");
+  lv_label_set_align(lblSeconds, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(lblSeconds, lv_scr_act(), LV_ALIGN_CENTER, POS_X_SECONDS, POS_Y_TEXT);
+
+  btnHoursPlus = lv_btn_create(lv_scr_act(), NULL);
+  btnHoursPlus->user_data = this;
+  lv_obj_set_size(btnHoursPlus, 50, 40);
+  lv_obj_align(btnHoursPlus, lv_scr_act(), LV_ALIGN_CENTER, -72, -50);
+  lv_obj_set_style_local_value_str(btnHoursPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
+  lv_obj_set_event_cb(btnHoursPlus, event_handler);
+
+  btnHoursMinus = lv_btn_create(lv_scr_act(), NULL);
+  btnHoursMinus->user_data = this;
+  lv_obj_set_size(btnHoursMinus, 50, 40);
+  lv_obj_align(btnHoursMinus, lv_scr_act(), LV_ALIGN_CENTER, -72, 40);
+  lv_obj_set_style_local_value_str(btnHoursMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
+  lv_obj_set_event_cb(btnHoursMinus, event_handler);
+
+  btnMinutesPlus = lv_btn_create(lv_scr_act(), NULL);
+  btnMinutesPlus->user_data = this;
+  lv_obj_set_size(btnMinutesPlus, 50, 40);
+  lv_obj_align(btnMinutesPlus, lv_scr_act(), LV_ALIGN_CENTER, 0, -50);
+  lv_obj_set_style_local_value_str(btnMinutesPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
+  lv_obj_set_event_cb(btnMinutesPlus, event_handler);
+
+  btnMinutesMinus = lv_btn_create(lv_scr_act(), NULL);
+  btnMinutesMinus->user_data = this;
+  lv_obj_set_size(btnMinutesMinus, 50, 40);
+  lv_obj_align(btnMinutesMinus, lv_scr_act(), LV_ALIGN_CENTER, 0, 40);
+  lv_obj_set_style_local_value_str(btnMinutesMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
+  lv_obj_set_event_cb(btnMinutesMinus, event_handler);
+
+  btnSetTime = lv_btn_create(lv_scr_act(), NULL);
+  btnSetTime->user_data = this;
+  lv_obj_set_size(btnSetTime, 120, 48);
+  lv_obj_align(btnSetTime, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+  lv_obj_set_style_local_value_str(btnSetTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Set");
+  lv_obj_set_event_cb(btnSetTime, event_handler);
+}
+
+SettingSetTime::~SettingSetTime() {
+  lv_obj_clean(lv_scr_act());
+}
+
+void SettingSetTime::HandleButtonPress(lv_obj_t *object, lv_event_t event) {
+
+  if (event != LV_EVENT_CLICKED)
+    return;
+
+  if (object == btnHoursPlus) {
+    hoursValue++;
+    if (hoursValue > 23)
+      hoursValue = 0;
+    lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
+    lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
+  }
+  else if (object == btnHoursMinus) {
+    hoursValue--;
+    if (hoursValue < 0)
+      hoursValue = 23;
+    lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
+    lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
+  }
+  else if (object == btnMinutesPlus) {
+    minutesValue++;
+    if (minutesValue > 59)
+      minutesValue = 0;
+    lv_label_set_text_fmt(lblMinutes, "%02d", minutesValue);
+    lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
+  }
+  else if (object == btnMinutesMinus) {
+    minutesValue--;
+    if (minutesValue < 0)
+      minutesValue = 59;
+    lv_label_set_text_fmt(lblMinutes, "%02d", minutesValue);
+    lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
+  }
+  else if (object == btnSetTime) {
+    NRF_LOG_INFO("Setting time (manually) to %02d:%02d:00", hoursValue, minutesValue);
+    dateTimeController.SetTime(dateTimeController.Year(),
+                               static_cast<uint8_t>(dateTimeController.Month()),
+                               dateTimeController.Day(),
+                               static_cast<uint8_t>(dateTimeController.DayOfWeek()),
+                               static_cast<uint8_t>(hoursValue),
+                               static_cast<uint8_t>(minutesValue),
+                               0,
+                               nrf_rtc_counter_get(portNRF_RTC_REG));
+    lv_btn_set_state(btnSetTime, LV_BTN_STATE_DISABLED);
+  }
+}

src/displayapp/screens/settings/SettingSetTime.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "components/datetime/DateTimeController.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingSetTime : public Screen{
+        public:
+          SettingSetTime(DisplayApp* app, Pinetime::Controllers::DateTime &dateTimeController);
+          ~SettingSetTime() override;
+
+          void HandleButtonPress(lv_obj_t *object, lv_event_t event);
+         
+        private:          
+
+          Controllers::DateTime& dateTimeController;
+
+          int hoursValue;
+          int minutesValue;
+          lv_obj_t * lblHours;
+          lv_obj_t * lblMinutes;
+          lv_obj_t * btnHoursPlus;
+          lv_obj_t * btnHoursMinus;
+          lv_obj_t * btnMinutesPlus;
+          lv_obj_t * btnMinutesMinus;
+          lv_obj_t * btnSetTime;
+          
+      };
+    }
+  }
+}

src/displayapp/screens/settings/Settings.cpp

@@ -49,9 +49,9 @@ std::unique_ptr<Screen> Settings::CreateScreen2() {
 
   std::array<Screens::List::Applications, 4> applications {{
     {Symbols::shoe, "Steps", Apps::SettingSteps},
-    {Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
-    {Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle},
-    {Symbols::check, "Firmware", Apps::FirmwareValidation},
+    {Symbols::clock, "Set date", Apps::SettingSetDate},
+    {Symbols::clock, "Set time", Apps::SettingSetTime},
+    {Symbols::batteryHalf, "Battery", Apps::BatteryInfo}
   }};
 
   return std::make_unique<Screens::List>(1, 3, app, settingsController, applications);
@@ -60,10 +60,10 @@ std::unique_ptr<Screen> Settings::CreateScreen2() {
 std::unique_ptr<Screen> Settings::CreateScreen3() {
 
   std::array<Screens::List::Applications, 4> applications {{
+    {Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle},
+    {Symbols::check, "Firmware", Apps::FirmwareValidation},
     {Symbols::list, "About", Apps::SysInfo},
     {Symbols::none, "None", Apps::None},
-    {Symbols::none, "None", Apps::None},
-    {Symbols::none, "None", Apps::None},
   }};
 
   return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);