Merge branch 'develop' of JF/PineTime into master

1 files changed, 12 insertions, 17 deletions

diff --git a/src/displayapp/screens/settings/Settings.h b/src/displayapp/screens/settings/Settings.h
index 9955e1d..7e332df 100644
--- a/src/displayapp/screens/settings/Settings.h
+++ b/src/displayapp/screens/settings/Settings.h
@@ -6,31 +6,26 @@
 
 namespace Pinetime {
 
-
   namespace Applications {
     namespace Screens {
 
-      class Settings : public Screen{
-        public:
-          Settings(DisplayApp* app,
-          Pinetime::Controllers::Settings &settingsController);
-          ~Settings() override;
-
-          bool Refresh() override;
-          
-          void OnButtonEvent(lv_obj_t *object, lv_event_t event);
-          bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
+      class Settings : public Screen {
+      public:
+        Settings(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
+        ~Settings() override;
 
-        private:          
+        bool Refresh() override;
 
-          Controllers::Settings& settingsController;
-          
-          ScreenList<2> screens;
+        void OnButtonEvent(lv_obj_t* object, lv_event_t event);
+        bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
 
-          std::unique_ptr<Screen> CreateScreen1();
-          std::unique_ptr<Screen> CreateScreen2();
+      private:
+        Controllers::Settings& settingsController;
 
+        ScreenList<2> screens;
 
+        std::unique_ptr<Screen> CreateScreen1();
+        std::unique_ptr<Screen> CreateScreen2();
       };
     }
   }