Merge branch 'develop' of

https://github.com/JF002/InfiniTime into StepsApp

1 files changed, 26 insertions, 29 deletions

diff --git a/src/displayapp/screens/settings/QuickSettings.h b/src/displayapp/screens/settings/QuickSettings.h
index 329be55b..8d04bec3 100644
--- a/src/displayapp/screens/settings/QuickSettings.h
+++ b/src/displayapp/screens/settings/QuickSettings.h
@@ -10,47 +10,44 @@
 #include "components/settings/Settings.h"
 #include "components/battery/BatteryController.h"
 
-
 namespace Pinetime {
 
   namespace Applications {
     namespace Screens {
 
-      class QuickSettings : public Screen{
-        public:
-          QuickSettings(DisplayApp* app, 
-            Pinetime::Controllers::Battery& batteryController,
-            Controllers::DateTime& dateTimeController,
-            Controllers::BrightnessController& brightness,
-            Pinetime::Controllers::Settings &settingsController);
-
-          ~QuickSettings() override;
+      class QuickSettings : public Screen {
+      public:
+        QuickSettings(DisplayApp* app,
+                      Pinetime::Controllers::Battery& batteryController,
+                      Controllers::DateTime& dateTimeController,
+                      Controllers::BrightnessController& brightness,
+                      Pinetime::Controllers::Settings& settingsController);
 
-          bool Refresh() override;
-          
-          bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
-          void OnButtonEvent(lv_obj_t *object, lv_event_t event);
+        ~QuickSettings() override;
 
-          void UpdateScreen();
+        bool Refresh() override;
 
-        private:          
+        bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
+        void OnButtonEvent(lv_obj_t* object, lv_event_t event);
 
-          Pinetime::Controllers::Battery& batteryController;
-          Controllers::DateTime& dateTimeController;
-          Controllers::BrightnessController& brightness;
-          Controllers::Settings& settingsController;
+        void UpdateScreen();
 
-          lv_task_t* taskUpdate;
-          lv_obj_t * batteryIcon;
-          lv_obj_t * label_time;
+      private:
+        Pinetime::Controllers::Battery& batteryController;
+        Controllers::DateTime& dateTimeController;
+        Controllers::BrightnessController& brightness;
+        Controllers::Settings& settingsController;
 
-          lv_obj_t * btn1;
-          lv_obj_t * btn1_lvl;
-          lv_obj_t * btn2;
-          lv_obj_t * btn3;
-          lv_obj_t * btn3_lvl;
-          lv_obj_t * btn4;
+        lv_task_t* taskUpdate;
+        lv_obj_t* batteryIcon;
+        lv_obj_t* label_time;
 
+        lv_obj_t* btn1;
+        lv_obj_t* btn1_lvl;
+        lv_obj_t* btn2;
+        lv_obj_t* btn3;
+        lv_obj_t* btn3_lvl;
+        lv_obj_t* btn4;
       };
     }
   }