Merge 7fe6dda88a into 6d68466891

src/activities/reader/EpubReaderMenuActivity.cpp

@@ -1,5 +1,7 @@
 #include "EpubReaderMenuActivity.h"
+
 #include <GfxRenderer.h>
+
 #include "fontIds.h"
 
 void EpubReaderMenuActivity::onEnter() {

src/activities/reader/EpubReaderMenuActivity.h

@@ -3,23 +3,21 @@
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
 #include <freertos/task.h>
-#include <functional>
-#include <vector>
-#include <string>
 
-#include "MappedInputManager.h"
+#include <functional>
+#include <string>
+#include <vector>
+
 #include "../ActivityWithSubactivity.h"
+#include "MappedInputManager.h"
 
 class EpubReaderMenuActivity final : public ActivityWithSubactivity {
  public:
   enum class MenuAction { SELECT_CHAPTER, GO_HOME, DELETE_CACHE };
 
   explicit EpubReaderMenuActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
-                                  const std::function<void()>& onBack,
-                                  const std::function<void(MenuAction)>& onAction)
-      : ActivityWithSubactivity("EpubReaderMenu", renderer, mappedInput),
-        onBack(onBack),
-        onAction(onAction) {}
+                                  const std::function<void()>& onBack, const std::function<void(MenuAction)>& onAction)
+      : ActivityWithSubactivity("EpubReaderMenu", renderer, mappedInput), onBack(onBack), onAction(onAction) {}
 
   void onEnter() override;
   void onExit() override;
@@ -31,8 +29,7 @@ class EpubReaderMenuActivity final : public ActivityWithSubactivity {
     std::string label;
   };
 
-  const std::vector<MenuItem> menuItems = {
-      {MenuAction::SELECT_CHAPTER, "Select Chapter"},
+  const std::vector<MenuItem> menuItems = {{MenuAction::SELECT_CHAPTER, "Select Chapter"},
                                            {MenuAction::GO_HOME, "Go Home"},
                                            {MenuAction::DELETE_CACHE, "Delete Book Cache"}};