Merge branch 'develop' of JF/PineTime into master

1 files changed, 31 insertions, 36 deletions

diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 1a4e0eb..9879985 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -23,42 +23,37 @@ namespace Pinetime {
   namespace Applications {
     namespace Screens {
       class Clock : public Screen {
-        public:
-          Clock(DisplayApp* app,
-                  Controllers::DateTime& dateTimeController,
-                  Controllers::Battery& batteryController,
-                  Controllers::Ble& bleController,
-                  Controllers::NotificationManager& notificatioManager,
-                  Controllers::Settings &settingsController,
-                  Controllers::HeartRateController& heartRateController,
-                  Controllers::MotionController& motionController);
-          ~Clock() override;
-
-          bool Refresh() override;
-          
-          bool OnTouchEvent(TouchEvents event) override;
-
-        private:
-
-          Controllers::DateTime& dateTimeController;
-          Controllers::Battery& batteryController;
-          Controllers::Ble& bleController;
-          Controllers::NotificationManager& notificatioManager;
-          Controllers::Settings& settingsController;
-          Controllers::HeartRateController& heartRateController;
-          Controllers::MotionController& motionController;
-
-
-          ScreenList<2> screens;
-          std::unique_ptr<Screen> WatchFaceDigitalScreen();
-          std::unique_ptr<Screen> WatchFaceAnalogScreen();
-
-          // Examples for more watch faces
-          //std::unique_ptr<Screen> WatchFaceMinimalScreen();
-          //std::unique_ptr<Screen> WatchFaceCustomScreen();
-
-          
-
+      public:
+        Clock(DisplayApp* app,
+              Controllers::DateTime& dateTimeController,
+              Controllers::Battery& batteryController,
+              Controllers::Ble& bleController,
+              Controllers::NotificationManager& notificatioManager,
+              Controllers::Settings& settingsController,
+              Controllers::HeartRateController& heartRateController,
+              Controllers::MotionController& motionController);
+        ~Clock() override;
+
+        bool Refresh() override;
+
+        bool OnTouchEvent(TouchEvents event) override;
+
+      private:
+        Controllers::DateTime& dateTimeController;
+        Controllers::Battery& batteryController;
+        Controllers::Ble& bleController;
+        Controllers::NotificationManager& notificatioManager;
+        Controllers::Settings& settingsController;
+        Controllers::HeartRateController& heartRateController;
+        Controllers::MotionController& motionController;
+
+        ScreenList<2> screens;
+        std::unique_ptr<Screen> WatchFaceDigitalScreen();
+        std::unique_ptr<Screen> WatchFaceAnalogScreen();
+
+        // Examples for more watch faces
+        // std::unique_ptr<Screen> WatchFaceMinimalScreen();
+        // std::unique_ptr<Screen> WatchFaceCustomScreen();
       };
     }
   }