Remove settime and setdate

8 files changed, 2 insertions, 488 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d564876..465cdce 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -429,8 +429,6 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingWakeUp.cpp
         displayapp/screens/settings/SettingDisplay.cpp
         displayapp/screens/settings/SettingSteps.cpp
-        displayapp/screens/settings/SettingSetDate.cpp
-        displayapp/screens/settings/SettingSetTime.cpp
         displayapp/screens/settings/SettingChimes.cpp
         displayapp/screens/settings/SettingShakeThreshold.cpp
         displayapp/screens/settings/SettingAirplaneMode.cpp
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index 208a39d..11c71d2 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -26,8 +26,6 @@ namespace Pinetime {
       SettingDisplay,
       SettingWakeUp,
       SettingSteps,
-      SettingSetDate,
-      SettingSetTime,
       SettingChimes,
       SettingShakeThreshold,
       SettingAirplaneMode,
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 8b719ac..229ed79 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -38,8 +38,6 @@
 #include "displayapp/screens/settings/SettingWakeUp.h"
 #include "displayapp/screens/settings/SettingDisplay.h"
 #include "displayapp/screens/settings/SettingSteps.h"
-#include "displayapp/screens/settings/SettingSetDate.h"
-#include "displayapp/screens/settings/SettingSetTime.h"
 #include "displayapp/screens/settings/SettingChimes.h"
 #include "displayapp/screens/settings/SettingShakeThreshold.h"
 #include "displayapp/screens/settings/SettingAirplaneMode.h"
@@ -398,14 +396,6 @@ 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, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
-      break;
     case Apps::SettingChimes:
       currentScreen = std::make_unique<Screens::SettingChimes>(this, settingsController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
diff --git a/src/displayapp/screens/settings/SettingSetDate.cpp b/src/displayapp/screens/settings/SettingSetDate.cpp
deleted file mode 100644
index 8bfded3..0000000
--- a/src/displayapp/screens/settings/SettingSetDate.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-#include "displayapp/screens/settings/SettingSetDate.h"
-#include <lvgl/lvgl.h>
-#include <hal/nrf_rtc.h>
-#include <nrf_log.h>
-#include "displayapp/DisplayApp.h"
-#include "displayapp/screens/Symbols.h"
-
-using namespace Pinetime::Applications::Screens;
-
-namespace {
-  constexpr int16_t POS_X_DAY = -72;
-  constexpr int16_t POS_X_MONTH = 0;
-  constexpr int16_t POS_X_YEAR = 72;
-  constexpr int16_t POS_Y_PLUS = -50;
-  constexpr int16_t POS_Y_TEXT = -6;
-  constexpr int16_t POS_Y_MINUS = 40;
-
-  void event_handler(lv_obj_t * obj, lv_event_t event) {
-    auto* 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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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)));
-}
diff --git a/src/displayapp/screens/settings/SettingSetDate.h b/src/displayapp/screens/settings/SettingSetDate.h
deleted file mode 100644
index 477337f..0000000
--- a/src/displayapp/screens/settings/SettingSetDate.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#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();
-      };
-    }
-  }
-}
diff --git a/src/displayapp/screens/settings/SettingSetTime.cpp b/src/displayapp/screens/settings/SettingSetTime.cpp
deleted file mode 100644
index 037611f..0000000
--- a/src/displayapp/screens/settings/SettingSetTime.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-#include "displayapp/screens/settings/SettingSetTime.h"
-#include <lvgl/lvgl.h>
-#include <hal/nrf_rtc.h>
-#include <nrf_log.h>
-#include "displayapp/DisplayApp.h"
-#include "displayapp/screens/Symbols.h"
-#include "components/settings/Settings.h"
-
-using namespace Pinetime::Applications::Screens;
-
-namespace {
-  constexpr int16_t POS_X_HOURS = -72;
-  constexpr int16_t POS_X_MINUTES = 0;
-  constexpr int16_t POS_X_SECONDS = 72;
-  constexpr int16_t POS_Y_PLUS = -50;
-  constexpr int16_t POS_Y_TEXT = -6;
-  constexpr int16_t POS_Y_MINUS = 40;
-  constexpr int16_t OFS_Y_COLON = -2;
-
-  void event_handler(lv_obj_t* obj, lv_event_t event) {
-    auto* screen = static_cast<SettingSetTime*>(obj->user_data);
-    screen->HandleButtonPress(obj, event);
-  }
-}
-
-SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp* app,
-                               Pinetime::Controllers::DateTime& dateTimeController,
-                               Pinetime::Controllers::Settings& settingsController)
-  : Screen(app), dateTimeController {dateTimeController}, settingsController {settingsController} {
-  lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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);
-
-  lblampm = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
-  lv_label_set_text_static(lblampm, "  ");
-  lv_label_set_align(lblampm, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(lblampm, lv_scr_act(), LV_ALIGN_CENTER, POS_X_SECONDS, POS_Y_PLUS);
-
-  btnHoursPlus = lv_btn_create(lv_scr_act(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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(), nullptr);
-  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);
-
-  SetHourLabels();
-}
-
-SettingSetTime::~SettingSetTime() {
-  lv_obj_clean(lv_scr_act());
-}
-
-void SettingSetTime::SetHourLabels() {
-  if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
-    switch (hoursValue) {
-      case 0:
-        lv_label_set_text_static(lblHours, "12");
-        lv_label_set_text_static(lblampm, "AM");
-        break;
-      case 1 ... 11:
-        lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
-        lv_label_set_text_static(lblampm, "AM");
-        break;
-      case 12:
-        lv_label_set_text_static(lblHours, "12");
-        lv_label_set_text_static(lblampm, "PM");
-        break;
-      case 13 ... 23:
-        lv_label_set_text_fmt(lblHours, "%02d", hoursValue - 12);
-        lv_label_set_text_static(lblampm, "PM");
-        break;
-    }
-  } else {
-    lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
-  }
-}
-
-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;
-    }
-    SetHourLabels();
-    lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
-  } else if (object == btnHoursMinus) {
-    hoursValue--;
-    if (hoursValue < 0) {
-      hoursValue = 23;
-    }
-    SetHourLabels();
-    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);
-  }
-}
diff --git a/src/displayapp/screens/settings/SettingSetTime.h b/src/displayapp/screens/settings/SettingSetTime.h
deleted file mode 100644
index d02c332..0000000
--- a/src/displayapp/screens/settings/SettingSetTime.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <lvgl/lvgl.h>
-#include "components/datetime/DateTimeController.h"
-#include "components/settings/Settings.h"
-#include "displayapp/screens/Screen.h"
-
-namespace Pinetime {
-  namespace Applications {
-    namespace Screens {
-      class SettingSetTime : public Screen {
-      public:
-        SettingSetTime(DisplayApp* app,
-                       Pinetime::Controllers::DateTime& dateTimeController,
-                       Pinetime::Controllers::Settings& settingsController);
-        ~SettingSetTime() override;
-
-        void HandleButtonPress(lv_obj_t* object, lv_event_t event);
-
-      private:
-        Controllers::DateTime& dateTimeController;
-        Controllers::Settings& settingsController;
-
-        void SetHourLabels();
-
-        int hoursValue;
-        int minutesValue;
-        lv_obj_t* lblHours;
-        lv_obj_t* lblMinutes;
-        lv_obj_t* lblampm;
-        lv_obj_t* btnHoursPlus;
-        lv_obj_t* btnHoursMinus;
-        lv_obj_t* btnMinutesPlus;
-        lv_obj_t* btnMinutesMinus;
-        lv_obj_t* btnSetTime;
-      };
-    }
-  }
-}
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index be1eb98..4b53ba0 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -51,8 +51,8 @@ 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::clock, "Set date", Apps::SettingSetDate},
-    {Symbols::clock, "Set time", Apps::SettingSetTime},
+    {Symbols::none, "None", Apps::None}
+    {Symbols::none, "None", Apps::None}
     {Symbols::batteryHalf, "Battery", Apps::BatteryInfo}}};
 
   return std::make_unique<Screens::List>(1, 4, app, settingsController, applications);