Refactoring

Author: lovyan03

library.json

@@ -1,5 +1,5 @@
 {
-  "name": "M5TreeView",
+  "name": "M5Stack_TreeView",
   "description": "TreeView Menu UI for M5Stack",
   "keywords": "treeview, m5stack, esp32",
   "authors": {

src/MenuItem.cpp

@@ -27,7 +27,7 @@ const GFXfont* MenuItem::gfxFont = NULL;
 MenuItem* MenuItem::focusItem = NULL;
 M5ButtonDrawer MenuItem::_btnDrawer;
 
-MenuItem::MenuItem(const String& titleStr, int tg, std::function<void(MenuItem*)> cb)
+MenuItem::MenuItem(const String& titleStr, int tg, TCallBackEnter cb)
 : title(titleStr)
 , callback(cb)
 , tag(tg)
@@ -38,7 +38,7 @@ MenuItem::MenuItem(const String& titleStr, int tg, std::function<void(MenuItem*)
 , _parentItem(NULL)
 {}
 
-MenuItem::MenuItem(const String& titleStr, int tg, std::function<void(MenuItem*)> cb, const std::vector<MenuItem*> &sub) 
+MenuItem::MenuItem(const String& titleStr, int tg, TCallBackEnter cb, const std::vector<MenuItem*> &sub) 
 : MenuItem(titleStr, tg, cb)
 {
   setItems(sub);

src/MenuItem.h

@@ -11,6 +11,8 @@
 class MenuItem {
 protected:
 public:
+  using TCallBackEnter = std::function<void(MenuItem*)>;
+
   static Rect16 clientRect;
   static uint16_t itemHeight;
   static uint16_t itemWidth;
@@ -36,11 +38,11 @@ class MenuItem {
 
   MenuItem() : MenuItem("", 0, NULL) {}
   MenuItem(const String& title, const std::vector<MenuItem*> &sub) : MenuItem(title, 0, sub) {}
-  MenuItem(const String& title, std::function<void(MenuItem*)> cb) : MenuItem(title, 0, cb) {}
-  MenuItem(const String& title, std::function<void(MenuItem*)> cb, const std::vector<MenuItem*> &sub) : MenuItem(title, 0, cb, sub) {}
+  MenuItem(const String& title, TCallBackEnter cb) : MenuItem(title, 0, cb) {}
+  MenuItem(const String& title, TCallBackEnter cb, const std::vector<MenuItem*> &sub) : MenuItem(title, 0, cb, sub) {}
   MenuItem(const String& title, int tg    , const std::vector<MenuItem*> &sub) : MenuItem(title, tg, NULL, sub ) {}
-  MenuItem(const String& title, int tg = 0, std::function<void(MenuItem*)> cb = NULL);
-  MenuItem(const String& title, int tg    , std::function<void(MenuItem*)> cb, const std::vector<MenuItem*> &sub);
+  MenuItem(const String& title, int tg = 0, TCallBackEnter cb = NULL);
+  MenuItem(const String& title, int tg    , TCallBackEnter cb, const std::vector<MenuItem*> &sub);
   virtual ~MenuItem() {};
 
   void addItem(MenuItem* item);
@@ -70,7 +72,7 @@ class MenuItem {
 
   std::vector<MenuItem*> Items;
   String title;
-  std::function<void(MenuItem*)> callback = 0;
+  TCallBackEnter callback = 0;
   Rect16 destRect;    // destinationPoint
   Rect16 rect;        // displayPoint
   int tag = 0;

src/MenuItemFS.h

@@ -9,7 +9,7 @@ class MenuItemFS : public MenuItem {
   String path;
   bool isDir;
 
-  MenuItemFS(const String& title, std::function<void(MenuItem*)>cb = NULL)
+  MenuItemFS(const String& title, TCallBackEnter cb = NULL)
   : MenuItem(title, cb), path(), isDir(true) {};
 
   MenuItemFS(const String& title, const std::vector<MenuItem*> &items)

src/MenuItemNumeric.h

@@ -9,10 +9,10 @@ class MenuItemNumeric : public MenuItem {
   int maximum = 1;
   int value = 0;
 
-  MenuItemNumeric(const String& title, int min, int max, int value, int tg = 0, std::function<void(MenuItem*)> cb = 0)
+  MenuItemNumeric(const String& title, int min, int max, int value, int tg = 0, TCallBackEnter cb = 0)
   : MenuItem(title, tg, cb), minimum(min), maximum(max), value(value) {};
 
-  MenuItemNumeric(const String& title, int min, int max, int value, std::function<void(MenuItem*)> cb)
+  MenuItemNumeric(const String& title, int min, int max, int value, TCallBackEnter cb)
   : MenuItem(title, cb), minimum(min), maximum(max), value(value) {};
 
   virtual void onAfterDraw();

src/MenuItemSD.h

@@ -6,7 +6,7 @@
 class MenuItemSD : public MenuItemFS
 {
 public:
-  MenuItemSD(const String& title, std::function<void(MenuItem*)>cb = NULL)
+  MenuItemSD(const String& title, TCallBackEnter cb = NULL)
   : MenuItemFS(title, cb) {};
 
   MenuItemSD(const String& title, const std::vector<MenuItem*> &items)

src/MenuItemSPIFFS.h

@@ -6,7 +6,7 @@
 class MenuItemSPIFFS : public MenuItemFS
 {
 public:
-  MenuItemSPIFFS(const String& title, std::function<void(MenuItem*)>cb = NULL)
+  MenuItemSPIFFS(const String& title, TCallBackEnter cb = NULL)
   : MenuItemFS(title, cb) {};
 
   MenuItemSPIFFS(const String& title, const std::vector<MenuItem*> &items)

src/MenuItemToggle.h

@@ -7,10 +7,10 @@ class MenuItemToggle : public MenuItem {
 public:
   bool value = false;
 
-  MenuItemToggle(const String& title, bool value = false, int tg = 0, std::function<void(MenuItem*)> cb = 0)
+  MenuItemToggle(const String& title, bool value = false, int tg = 0, TCallBackEnter cb = 0)
   : MenuItem(title, tg, cb), value(value) {};
 
-  MenuItemToggle(const String& title, int value, std::function<void(MenuItem*)> cb)
+  MenuItemToggle(const String& title, int value, TCallBackEnter cb)
   : MenuItem(title, cb), value(value) {};
 
   virtual void onAfterDraw();

src/MenuItemWiFiClient.h

@@ -7,7 +7,7 @@
 
 class MenuItemWiFiClient : public MenuItem {
 public:
-  MenuItemWiFiClient(const String& title, std::function<void(MenuItem*)>cb = 0)
+  MenuItemWiFiClient(const String& title, TCallBackEnter cb = 0)
   : MenuItem(title, cb) {};
 
   virtual void onEnter();