From 09528d1b93cac3024a3ae4e2a232e88b8dc8cab5 Mon Sep 17 00:00:00 2001
From: Yohan Boujon <yo.boujon@gmail.com>
Date: Thu, 8 May 2025 17:57:31 +0200
Subject: [PATCH] Renamed ScreenPage to Page, Event to EventPage.

---
 include/event.h      | 11 +++++------
 include/pages/page.h |  6 +++---
 include/ui.h         |  6 +++---
 src/event.cpp        |  8 ++++----
 src/ui.cpp           |  6 +++---
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/include/event.h b/include/event.h
index 825183f..e6f2fd6 100644
--- a/include/event.h
+++ b/include/event.h
@@ -1,16 +1,15 @@
 #ifndef HEADER_EVENT_FTXUI
 #define HEADER_EVENT_FTXUI
 
-#include <deque>
 #include <any>
+#include <deque>
 #include <functional>
 #include <mutex>
 
 enum class EventType : uint8_t
 {
     SWITCH_SCREEN,
-    SEND_COMMAND,
-    LAUNCH_INSTANCE,
+    SEND_TEXT,
     STOP,
 };
 
@@ -30,7 +29,7 @@ public:
 
 protected:
     void add_event(const EventPayload &payload);
-    friend class Event;
+    friend class EventPage;
 
 private:
     bool _is_running;
@@ -39,10 +38,10 @@ private:
     std::mutex _mutex;
 };
 
-class Event
+class EventPage
 {
 public:
-    Event(EventHandler &eventhandler);
+    EventPage(EventHandler &eventhandler);
     void send_event(const EventPayload &payload);
     void send_event(const EventType &type, std::any data = {});
 
diff --git a/include/pages/page.h b/include/pages/page.h
index 729e977..484f275 100644
--- a/include/pages/page.h
+++ b/include/pages/page.h
@@ -4,11 +4,11 @@
 #include <ftxui/component/component_base.hpp>
 #include "event.h"
 
-class ScreenPage : public Event
+class Page : public EventPage
 {
 public:
-    ScreenPage(EventHandler &handler)
-        : Event(handler), _page()
+    Page(EventHandler &handler)
+        : EventPage(handler), _page()
     {
     }
 
diff --git a/include/ui.h b/include/ui.h
index c10b786..0c4658f 100644
--- a/include/ui.h
+++ b/include/ui.h
@@ -18,9 +18,9 @@ public:
     }
 
     ftxui::ScreenInteractive *get_screen();
-    void add_screen(ScreenPage *p);
+    void add_screen(Page *p);
     void select_screen(size_t index);
-    void select_screen(const ScreenPage *p);
+    void select_screen(const Page *p);
     void start();
     void update();
 
@@ -29,7 +29,7 @@ private:
     ~UserInterface();
 
     ftxui::ScreenInteractive _screen;
-    std::vector<ScreenPage *> _pages;
+    std::vector<Page *> _pages;
     ftxui::Component _page_container;
     ftxui::Component _main_container;
     ftxui::Component _main_renderer;
diff --git a/src/event.cpp b/src/event.cpp
index dcdb852..92d2831 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -6,19 +6,19 @@
 
 constexpr int64_t EVENT_LOOP_WAIT_MS = 100;
 
-// Event
+// EventPage
 
-Event::Event(EventHandler &eventhandler)
+EventPage::EventPage(EventHandler &eventhandler)
     : _event_handler(eventhandler)
 {
 }
 
-void Event::send_event(const EventPayload &payload)
+void EventPage::send_event(const EventPayload &payload)
 {
     _event_handler.add_event(payload);
 }
 
-void Event::send_event(const EventType &type, std::any data)
+void EventPage::send_event(const EventType &type, std::any data)
 {
     _event_handler.add_event({type, data});
 }
diff --git a/src/ui.cpp b/src/ui.cpp
index fd99aaf..9845226 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -19,7 +19,7 @@ ftxui::ScreenInteractive *UserInterface::get_screen()
     return &_screen;
 }
 
-void UserInterface::add_screen(ScreenPage *p)
+void UserInterface::add_screen(Page *p)
 {
     _pages.push_back(p);
 }
@@ -29,9 +29,9 @@ void UserInterface::select_screen(size_t index)
     _page_index = index;
 }
 
-void UserInterface::select_screen(const ScreenPage *p)
+void UserInterface::select_screen(const Page *p)
 {
-    const typename std::vector<ScreenPage *>::iterator it = std::find(_pages.begin(), _pages.end(), p);
+    const typename std::vector<Page *>::iterator it = std::find(_pages.begin(), _pages.end(), p);
     const size_t index = it - _pages.begin();
     select_screen(index);
 }