code refactor

Author: paulocoutinhox

.github/workflows/build.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Build
         run: |
           rm -rf build
-          cmake -B build . -G Ninja -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=ON -DENABLE_ASAN=ON -DBUILD_EXECUTABLE=OFF
+          cmake -B build . -G Ninja -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=ON -DENABLE_ASAN=OFF -DBUILD_EXECUTABLE=OFF
           cmake --build build
           cd build && ctest --output-on-failure --verbose
 

CMakeLists.txt

@@ -8,8 +8,12 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # Testing option
 option(ENABLE_ASAN "Enable Address Sanitizer" OFF)
-option(ENABLE_TESTS "Build tests" OFF)
-option(BUILD_EXECUTABLE "Build the main executable" ON)
+option(ENABLE_TESTS "Enable Tests" OFF)
+option(BUILD_EXECUTABLE "Build The Main Executable" ON)
+
+# UI type option
+set(BITCHAT_GUI "CONSOLE" CACHE STRING "UI Type: CONSOLE or DUMMY")
+set_property(CACHE BITCHAT_GUI PROPERTY STRINGS "CONSOLE" "DUMMY")
 
 if(ENABLE_TESTS)
     enable_testing()
@@ -140,6 +144,9 @@ if(BUILD_EXECUTABLE)
         ${CMAKE_CURRENT_SOURCE_DIR}/vendor
     )
 
+    # Add UI macro
+    target_compile_definitions(bitchat PRIVATE BITCHAT_GUI_${BITCHAT_GUI})
+
     # Link libraries
     target_link_libraries(bitchat ${COMMON_LIBRARIES})
 endif()

src/main.cpp

@@ -7,7 +7,6 @@
 #include "bitchat/services/message_service.h"
 #include "bitchat/services/network_service.h"
 #include "bitchat/services/noise_service.h"
-#include "bitchat/ui/console_ui.h"
 #include <chrono>
 #include <ctime>
 #include <iostream>
@@ -16,6 +15,14 @@
 #include <string>
 #include <thread>
 
+// clang-format off
+#ifdef BITCHAT_GUI_CONSOLE
+    #include "bitchat/ui/console_ui.h"
+#elif defined(BITCHAT_GUI_DUMMY)
+    #include "bitchat/ui/dummy_ui.h"
+#endif
+// clang-format on
+
 using namespace bitchat;
 
 int main()
@@ -48,14 +55,22 @@ int main()
     auto bluetoothAnnounceRunner = std::make_shared<bitchat::BluetoothAnnounceRunner>();
     auto cleanupRunner = std::make_shared<bitchat::CleanupRunner>();
 
+    // clang-format off
     // Create UI
-    auto consoleUserInterface = std::make_shared<bitchat::ConsoleUserInterface>();
+    #ifdef BITCHAT_GUI_CONSOLE
+        auto userInterface = std::make_shared<bitchat::ConsoleUserInterface>();
+    #elif defined(BITCHAT_GUI_DUMMY)
+        auto userInterface = std::make_shared<bitchat::DummyUserInterface>();
+    #else
+        #error "No valid BITCHAT_GUI macro defined"
+    #endif
+    // clang-format on
 
     // Create and initialize manager
     auto manager = std::make_shared<BitchatManager>();
 
     // Initialize manager
-    if (!manager->initialize(consoleUserInterface, bluetoothNetworkInterface, networkService, messageService, cryptoService, noiseService, bluetoothAnnounceRunner, cleanupRunner))
+    if (!manager->initialize(userInterface, bluetoothNetworkInterface, networkService, messageService, cryptoService, noiseService, bluetoothAnnounceRunner, cleanupRunner))
     {
         spdlog::error("Failed to initialize BitchatManager");
         return EXIT_FAILURE;