Settings: Add double click action settings

This patch adds a global setting determining the executed action upon a
double click on the physical watch button.

Author: faxe1008

src/CMakeLists.txt

@@ -425,6 +425,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingChimes.cpp
         displayapp/screens/settings/SettingShakeThreshold.cpp
         displayapp/screens/settings/SettingBluetooth.cpp
+        displayapp/screens/settings/SettingDoubleClick.cpp
 
         ## Watch faces
         displayapp/icons/bg_clock.c

src/components/settings/Settings.h

@@ -18,6 +18,7 @@ namespace Pinetime {
         RaiseWrist = 2,
         Shake = 3,
       };
+      enum class DoubleClickAction : uint8_t { GoToNotifications, AudioNext };
       enum class Colors : uint8_t {
         White,
         Silver,
@@ -242,6 +243,16 @@ namespace Pinetime {
         return settings.wakeUpMode;
       }
 
+      void SetDoubleClickAction(DoubleClickAction action) {
+        if (settings.doubleClickAction != action)
+          settingsChanged = true;
+        settings.doubleClickAction = action;
+      }
+
+      DoubleClickAction GetDoubleClickAction() {
+        return settings.doubleClickAction;
+      }
+
       bool isWakeUpModeOn(const WakeUpMode mode) const {
         return getWakeUpModes()[static_cast<size_t>(mode)];
       }
@@ -279,7 +290,7 @@ namespace Pinetime {
     private:
       Pinetime::Controllers::FS& fs;
 
-      static constexpr uint32_t settingsVersion = 0x0005;
+      static constexpr uint32_t settingsVersion = 0x0006;
 
       struct SettingsData {
         uint32_t version = settingsVersion;
@@ -299,6 +310,7 @@ namespace Pinetime {
         std::bitset<4> wakeUpMode {0};
         uint16_t shakeWakeThreshold = 150;
         Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium;
+        DoubleClickAction doubleClickAction;
       };
 
       SettingsData settings;

src/displayapp/Apps.h

@@ -37,6 +37,7 @@ namespace Pinetime {
       SettingChimes,
       SettingShakeThreshold,
       SettingBluetooth,
+      SettingDoubleClick,
       Error
     };
   }

src/displayapp/DisplayApp.cpp

@@ -8,6 +8,7 @@
 #include "components/ble/BleController.h"
 #include "components/datetime/DateTimeController.h"
 #include "components/ble/NotificationManager.h"
+#include "components/ble/MusicService.h"
 #include "components/motion/MotionController.h"
 #include "components/motor/MotorController.h"
 #include "displayapp/screens/ApplicationList.h"
@@ -48,6 +49,7 @@
 #include "displayapp/screens/settings/SettingChimes.h"
 #include "displayapp/screens/settings/SettingShakeThreshold.h"
 #include "displayapp/screens/settings/SettingBluetooth.h"
+#include "displayapp/screens/settings/SettingDoubleClick.h"
 
 #include "libs/lv_conf.h"
 
@@ -341,9 +343,7 @@ void DisplayApp::Refresh() {
         LoadNewScreen(Apps::SysInfo, DisplayApp::FullRefreshDirections::Up);
         break;
       case Messages::ButtonDoubleClicked:
-        if (currentApp != Apps::Notifications && currentApp != Apps::NotificationsPreview) {
-          LoadNewScreen(Apps::Notifications, DisplayApp::FullRefreshDirections::Down);
-        }
+        HandleDoubleClick();
         break;
 
       case Messages::BleFirmwareUpdateStarted:
@@ -482,6 +482,9 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
     case Apps::SettingWakeUp:
       currentScreen = std::make_unique<Screens::SettingWakeUp>(settingsController);
       break;
+    case Apps::SettingDoubleClick:
+      currentScreen = std::make_unique<Screens::SettingDoubleClick>(settingsController);
+      break;
     case Apps::SettingDisplay:
       currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController);
       break;
@@ -607,3 +610,17 @@ void DisplayApp::ApplyBrightness() {
   }
   brightnessController.Set(brightness);
 }
+
+void DisplayApp::HandleDoubleClick()
+{
+  switch(settingsController.GetDoubleClickAction()){
+    case Controllers::Settings::DoubleClickAction::GoToNotifications:
+      if (currentApp != Apps::Notifications && currentApp != Apps::NotificationsPreview) {
+        LoadNewScreen(Apps::Notifications, DisplayApp::FullRefreshDirections::Down);
+      }
+      break;
+    case Controllers::Settings::DoubleClickAction::AudioNext:
+      systemTask->nimble().music().event(Controllers::MusicService::EVENT_MUSIC_NEXT);
+      break;
+  }
+}

src/displayapp/DisplayApp.h

@@ -123,6 +123,7 @@ namespace Pinetime {
       DisplayApp::FullRefreshDirections nextDirection;
       System::BootErrors bootError;
       void ApplyBrightness();
+      void HandleDoubleClick();
 
       static constexpr size_t returnAppStackSize = 10;
       Utility::StaticStack<Apps, returnAppStackSize> returnAppStack;

src/displayapp/fonts/fonts.json

@@ -7,7 +7,7 @@
          },
          {
             "file": "FontAwesome5-Solid+Brands+Regular.woff",
-            "range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c"
+            "range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf101"
          }
       ],
       "bpp": 1,

src/displayapp/screens/Symbols.h

@@ -37,6 +37,7 @@ namespace Pinetime {
         static constexpr const char* eye = "\xEF\x81\xAE";
         static constexpr const char* home = "\xEF\x80\x95";
         static constexpr const char* sleep = "\xEE\xBD\x84";
+        static constexpr const char* angleDoubleRight = "\xEF\x84\x81";
 
         // fontawesome_weathericons.c
         // static constexpr const char* sun = "\xEF\x86\x85";

src/displayapp/screens/settings/SettingDoubleClick.cpp

@@ -0,0 +1,61 @@
+#include "displayapp/screens/settings/SettingDoubleClick.h"
+#include <lvgl/lvgl.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Styles.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  struct Option {
+    Pinetime::Controllers::Settings::DoubleClickAction action;
+    const char* name;
+  };
+
+  constexpr std::array<Option, 2> options = {{
+    {Pinetime::Controllers::Settings::DoubleClickAction::GoToNotifications, "Notifications"},
+    {Pinetime::Controllers::Settings::DoubleClickAction::AudioNext, "Audio Next"},
+  }};
+
+  std::array<CheckboxList::Item, CheckboxList::MaxItems> CreateOptionArray() {
+    std::array<Pinetime::Applications::Screens::CheckboxList::Item, CheckboxList::MaxItems> optionArray;
+    for (size_t i = 0; i < CheckboxList::MaxItems; i++) {
+      if (i >= options.size()) {
+        optionArray[i].name = "";
+        optionArray[i].enabled = false;
+      } else {
+        optionArray[i].name = options[i].name;
+        optionArray[i].enabled = true;
+      }
+    }
+    return optionArray;
+  }
+
+  uint32_t GetDefaultOption(Pinetime::Controllers::Settings::DoubleClickAction currentOption) {
+    for (size_t i = 0; i < options.size(); i++) {
+      if (options[i].action == currentOption) {
+        return i;
+      }
+    }
+    return 0;
+  }
+}
+
+SettingDoubleClick::SettingDoubleClick(Pinetime::Controllers::Settings& settingsController)
+  : checkboxList(
+      0,
+      1,
+      "Double Click",
+      Symbols::angleDoubleRight,
+      GetDefaultOption(settingsController.GetDoubleClickAction()),
+      [&settings = settingsController](uint32_t index) {
+        settings.SetDoubleClickAction(options[index].action);
+        settings.SaveSettings();
+      },
+      CreateOptionArray()) {
+}
+
+SettingDoubleClick::~SettingDoubleClick() {
+  lv_obj_clean(lv_scr_act());
+}

src/displayapp/screens/settings/SettingDoubleClick.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <array>
+#include <cstdint>
+#include <lvgl/lvgl.h>
+
+#include "components/settings/Settings.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/CheckboxList.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingDoubleClick : public Screen {
+      public:
+        SettingDoubleClick(Pinetime::Controllers::Settings& settingsController);
+        ~SettingDoubleClick() override;
+
+      private:
+        CheckboxList checkboxList;
+      };
+    }
+  }
+}

src/displayapp/screens/settings/Settings.h

@@ -29,22 +29,24 @@ namespace Pinetime {
         static constexpr int entriesPerScreen = 4;
 
         // Increment this when more space is needed
-        static constexpr int nScreens = 3;
+        static constexpr int nScreens = 4;
 
         static constexpr std::array<List::Applications, entriesPerScreen * nScreens> entries {{
           {Symbols::sun, "Display", Apps::SettingDisplay},
           {Symbols::eye, "Wake Up", Apps::SettingWakeUp},
+          {Symbols::angleDoubleRight, "Double Click", Apps::SettingDoubleClick},
           {Symbols::clock, "Time format", Apps::SettingTimeFormat},
-          {Symbols::home, "Watch face", Apps::SettingWatchFace},
 
+          {Symbols::home, "Watch face", Apps::SettingWatchFace},
           {Symbols::shoe, "Steps", Apps::SettingSteps},
           {Symbols::clock, "Date&Time", Apps::SettingSetDateTime},
           {Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
-          {Symbols::clock, "Chimes", Apps::SettingChimes},
 
+          {Symbols::clock, "Chimes", Apps::SettingChimes},
           {Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold},
           {Symbols::check, "Firmware", Apps::FirmwareValidation},
           {Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth},
+
           {Symbols::list, "About", Apps::SysInfo},
 
           // {Symbols::none, "None", Apps::None},