sans chimes

7 files changed, 0 insertions, 160 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b3bdb66..cecdee9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -426,7 +426,6 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingWakeUp.cpp
         displayapp/screens/settings/SettingDisplay.cpp
         displayapp/screens/settings/SettingSteps.cpp
-        displayapp/screens/settings/SettingChimes.cpp
         displayapp/screens/settings/SettingShakeThreshold.cpp
         displayapp/screens/settings/SettingAirplaneMode.cpp
 
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index ffc0dbb..086aafd 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -10,7 +10,6 @@ namespace Pinetime {
     public:
       enum class ClockType : uint8_t { H24, H12 };
       enum class Notification : uint8_t { ON, OFF };
-      enum class ChimesOption : uint8_t { None, Hours, HalfHours };
       enum class WakeUpMode : uint8_t {
         SingleTap = 0,
         DoubleTap = 1,
@@ -52,16 +51,6 @@ namespace Pinetime {
         return settings.clockFace;
       };
 
-      void SetChimeOption(ChimesOption chimeOption) {
-        if (chimeOption != settings.chimesOption) {
-          settingsChanged = true;
-        }
-        settings.chimesOption = chimeOption;
-      };
-      ChimesOption GetChimeOption() const {
-        return settings.chimesOption;
-      };
-
       void SetAppMenu(uint8_t menu) {
         appMenu = menu;
       };
@@ -191,7 +180,6 @@ namespace Pinetime {
         Notification notificationStatus = Notification::ON;
 
         uint8_t clockFace = 0;
-        ChimesOption chimesOption = ChimesOption::None;
 
         std::bitset<4> wakeUpMode {0};
         uint16_t shakeWakeThreshold = 150;
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index d3b6d92..3af1afa 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -23,7 +23,6 @@ namespace Pinetime {
       SettingDisplay,
       SettingWakeUp,
       SettingSteps,
-      SettingChimes,
       SettingShakeThreshold,
       SettingAirplaneMode,
       Error
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index d6886aa..409ae5e 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -35,7 +35,6 @@
 #include "displayapp/screens/settings/SettingWakeUp.h"
 #include "displayapp/screens/settings/SettingDisplay.h"
 #include "displayapp/screens/settings/SettingSteps.h"
-#include "displayapp/screens/settings/SettingChimes.h"
 #include "displayapp/screens/settings/SettingShakeThreshold.h"
 #include "displayapp/screens/settings/SettingAirplaneMode.h"
 
@@ -380,10 +379,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::SettingChimes:
-      currentScreen = std::make_unique<Screens::SettingChimes>(this, settingsController);
-      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
-      break;
     case Apps::SettingShakeThreshold:
       currentScreen = std::make_unique<Screens::SettingShakeThreshold>(this, settingsController, motionController, *systemTask);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
diff --git a/src/displayapp/screens/settings/SettingChimes.cpp b/src/displayapp/screens/settings/SettingChimes.cpp
deleted file mode 100644
index 543b5e0..0000000
--- a/src/displayapp/screens/settings/SettingChimes.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-#include "displayapp/screens/settings/SettingChimes.h"
-#include <lvgl/lvgl.h>
-#include "displayapp/DisplayApp.h"
-#include "displayapp/screens/Styles.h"
-#include "displayapp/screens/Screen.h"
-#include "displayapp/screens/Symbols.h"
-
-using namespace Pinetime::Applications::Screens;
-
-namespace {
-  static void event_handler(lv_obj_t* obj, lv_event_t event) {
-    SettingChimes* screen = static_cast<SettingChimes*>(obj->user_data);
-    screen->UpdateSelected(obj, event);
-  }
-}
-
-SettingChimes::SettingChimes(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_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, 10, 60);
-  lv_obj_set_width(container1, LV_HOR_RES - 20);
-  lv_obj_set_height(container1, LV_VER_RES - 50);
-  lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
-
-  lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
-  lv_label_set_text_static(title, "Chimes");
-  lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 10, 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);
-
-  optionsTotal = 0;
-  cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
-  lv_checkbox_set_text_static(cbOption[optionsTotal], " Off");
-  cbOption[optionsTotal]->user_data = this;
-  lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
-  SetRadioButtonStyle(cbOption[optionsTotal]);
-  if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::None) {
-    lv_checkbox_set_checked(cbOption[optionsTotal], true);
-  }
-
-  optionsTotal++;
-  cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
-  lv_checkbox_set_text_static(cbOption[optionsTotal], " Every hour");
-  cbOption[optionsTotal]->user_data = this;
-  lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
-  SetRadioButtonStyle(cbOption[optionsTotal]);
-  if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::Hours) {
-    lv_checkbox_set_checked(cbOption[optionsTotal], true);
-  }
-
-  optionsTotal++;
-  cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
-  lv_checkbox_set_text_static(cbOption[optionsTotal], " Every 30 mins");
-  cbOption[optionsTotal]->user_data = this;
-  lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
-  SetRadioButtonStyle(cbOption[optionsTotal]);
-  if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::HalfHours) {
-    lv_checkbox_set_checked(cbOption[optionsTotal], true);
-  }
-
-  optionsTotal++;
-}
-
-SettingChimes::~SettingChimes() {
-  lv_obj_clean(lv_scr_act());
-  settingsController.SaveSettings();
-}
-
-void SettingChimes::UpdateSelected(lv_obj_t* object, lv_event_t event) {
-  if (event == LV_EVENT_VALUE_CHANGED) {
-    for (uint8_t i = 0; i < optionsTotal; i++) {
-      if (object == cbOption[i]) {
-        lv_checkbox_set_checked(cbOption[i], true);
-        if (i == 0) {
-          settingsController.SetChimeOption(Controllers::Settings::ChimesOption::None);
-        }
-        if (i == 1) {
-          settingsController.SetChimeOption(Controllers::Settings::ChimesOption::Hours);
-        }
-        if (i == 2) {
-          settingsController.SetChimeOption(Controllers::Settings::ChimesOption::HalfHours);
-        }
-      } else {
-        lv_checkbox_set_checked(cbOption[i], false);
-      }
-    }
-  }
-}
diff --git a/src/displayapp/screens/settings/SettingChimes.h b/src/displayapp/screens/settings/SettingChimes.h
deleted file mode 100644
index a251e95..0000000
--- a/src/displayapp/screens/settings/SettingChimes.h
+++ /dev/null
@@ -1,27 +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 SettingChimes : public Screen {
-      public:
-        SettingChimes(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
-        ~SettingChimes() override;
-
-        void UpdateSelected(lv_obj_t* object, lv_event_t event);
-
-      private:
-        Controllers::Settings& settingsController;
-        uint8_t optionsTotal;
-        lv_obj_t* cbOption[3];
-      };
-    }
-  }
-}
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 87c46cf..8d5a133 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -388,23 +388,9 @@ void SystemTask::Work() {
           break;
         case Messages::OnNewHour:
           using Pinetime::Controllers::AlarmController;
-          if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::Hours && alarmController.State() != AlarmController::AlarmState::Alerting) {
-            if (isSleeping && !isWakingUp) {
-              GoToRunning();
-              displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock);
-            }
-            motorController.RunForDuration(35);
-          }
           break;
         case Messages::OnNewHalfHour:
           using Pinetime::Controllers::AlarmController;
-          if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::HalfHours && alarmController.State() != AlarmController::AlarmState::Alerting) {
-            if (isSleeping && !isWakingUp) {
-              GoToRunning();
-              displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock);
-            }
-            motorController.RunForDuration(35);
-          }
           break;
         case Messages::OnChargingEvent:
           batteryController.ReadPowerState();