Merge ../../InfiniTime into ultraredux

# Conflicts:
#	src/displayapp/screens/WatchFaceDigital.cpp

1 files changed, 27 insertions, 0 deletions

diff --git a/src/displayapp/screens/settings/SettingChimes.h b/src/displayapp/screens/settings/SettingChimes.h
new file mode 100644
index 0000000..a251e95
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingChimes.h
@@ -0,0 +1,27 @@
+#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];
+      };
+    }
+  }
+}