Merge branch 'develop' of JF/PineTime into master

1 files changed, 39 insertions, 22 deletions

diff --git a/src/displayapp/screens/Brightness.cpp b/src/displayapp/screens/Brightness.cpp
index 38469cf..47c1056 100644
--- a/src/displayapp/screens/Brightness.cpp
+++ b/src/displayapp/screens/Brightness.cpp
@@ -3,14 +3,15 @@
 
 using namespace Pinetime::Applications::Screens;
 
-void slider_event_cb(lv_obj_t * slider, lv_event_t event) {
-  if(event == LV_EVENT_VALUE_CHANGED) {
+void slider_event_cb(lv_obj_t* slider, lv_event_t event) {
+  if (event == LV_EVENT_VALUE_CHANGED) {
     auto* brightnessSlider = static_cast<Brightness*>(slider->user_data);
     brightnessSlider->OnValueChanged();
   }
 }
 
-Brightness::Brightness(Pinetime::Applications::DisplayApp *app, Controllers::BrightnessController& brightness) : Screen(app), brightness{brightness} {
+Brightness::Brightness(Pinetime::Applications::DisplayApp* app, Controllers::BrightnessController& brightness)
+  : Screen(app), brightness {brightness} {
   slider = lv_slider_create(lv_scr_act(), nullptr);
   lv_obj_set_user_data(slider, this);
   lv_obj_set_width(slider, LV_DPI * 2);
@@ -33,13 +34,18 @@ bool Brightness::Refresh() {
   return running;
 }
 
-const char *Brightness::LevelToString(Pinetime::Controllers::BrightnessController::Levels level) {
-  switch(level) {
-    case Pinetime::Controllers::BrightnessController::Levels::Off: return "Off";
-    case Pinetime::Controllers::BrightnessController::Levels::Low: return "Low";
-    case Pinetime::Controllers::BrightnessController::Levels::Medium: return "Medium";
-    case Pinetime::Controllers::BrightnessController::Levels::High: return "High";
-    default : return "???";
+const char* Brightness::LevelToString(Pinetime::Controllers::BrightnessController::Levels level) {
+  switch (level) {
+    case Pinetime::Controllers::BrightnessController::Levels::Off:
+      return "Off";
+    case Pinetime::Controllers::BrightnessController::Levels::Low:
+      return "Low";
+    case Pinetime::Controllers::BrightnessController::Levels::Medium:
+      return "Medium";
+    case Pinetime::Controllers::BrightnessController::Levels::High:
+      return "High";
+    default:
+      return "???";
   }
 }
 
@@ -48,29 +54,40 @@ void Brightness::OnValueChanged() {
 }
 
 void Brightness::SetValue(uint8_t value) {
-  switch(value) {
-    case 0: brightness.Set(Controllers::BrightnessController::Levels::Low); break;
-    case 1: brightness.Set(Controllers::BrightnessController::Levels::Medium); break;
-    case 2: brightness.Set(Controllers::BrightnessController::Levels::High); break;
+  switch (value) {
+    case 0:
+      brightness.Set(Controllers::BrightnessController::Levels::Low);
+      break;
+    case 1:
+      brightness.Set(Controllers::BrightnessController::Levels::Medium);
+      break;
+    case 2:
+      brightness.Set(Controllers::BrightnessController::Levels::High);
+      break;
   }
   lv_label_set_text(slider_label, LevelToString(brightness.Level()));
 }
 
 uint8_t Brightness::LevelToInt(Pinetime::Controllers::BrightnessController::Levels level) {
-  switch(level) {
-    case Pinetime::Controllers::BrightnessController::Levels::Off: return 0;
-    case Pinetime::Controllers::BrightnessController::Levels::Low: return 0;
-    case Pinetime::Controllers::BrightnessController::Levels::Medium: return 1;
-    case Pinetime::Controllers::BrightnessController::Levels::High: return 2;
-    default : return 0;
+  switch (level) {
+    case Pinetime::Controllers::BrightnessController::Levels::Off:
+      return 0;
+    case Pinetime::Controllers::BrightnessController::Levels::Low:
+      return 0;
+    case Pinetime::Controllers::BrightnessController::Levels::Medium:
+      return 1;
+    case Pinetime::Controllers::BrightnessController::Levels::High:
+      return 2;
+    default:
+      return 0;
   }
 }
 
 bool Brightness::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
-  switch(event) {
+  switch (event) {
     case TouchEvents::SwipeLeft:
       brightness.Lower();
-      if ( brightness.Level() == Pinetime::Controllers::BrightnessController::Levels::Off) {
+      if (brightness.Level() == Pinetime::Controllers::BrightnessController::Levels::Off) {
         brightness.Set(Controllers::BrightnessController::Levels::Low);
       }
       SetValue();