Refactor application lifecycle and remove AppRunner

Replaces the AppRunner class with direct Application management, consolidating initialization and event loop handling into the Application singleton. Updates all platform-specific implementations and C/C++ APIs to use Application::Run and Application::Run(window), removes app_runner files, and simplifies example usage. This refactor streamlines the application lifecycle and eliminates redundant abstractions.

Author: lijy91

examples/application_c_example/main.c

@@ -10,7 +10,8 @@ void on_application_event(const native_application_event_t* event) {
       printf("Application started event received\n");
       break;
     case NATIVE_APPLICATION_EVENT_EXITING:
-      printf("Application exiting event received with exit code: %d\n", event->exit_code);
+      printf("Application exiting event received with exit code: %d\n",
+             event->exit_code);
       break;
     case NATIVE_APPLICATION_EVENT_ACTIVATED:
       printf("Application activated event received\n");
@@ -44,10 +45,12 @@ int main() {
   }
 
   printf("Application initialized successfully\n");
-  printf("Single instance: %s\n", native_application_is_single_instance(app) ? "Yes" : "No");
+  printf("Single instance: %s\n",
+         native_application_is_single_instance(app) ? "Yes" : "No");
 
   // Add event listener
-  size_t listener_id = native_application_add_event_listener(app, on_application_event);
+  size_t listener_id =
+      native_application_add_event_listener(app, on_application_event);
   if (listener_id == 0) {
     fprintf(stderr, "Failed to add event listener\n");
     return 1;
@@ -60,7 +63,8 @@ int main() {
     return 1;
   }
 
-  native_window_options_set_title(window_options, "Application C Example Window");
+  native_window_options_set_title(window_options,
+                                  "Application C Example Window");
   native_window_options_set_size(window_options, 400.0, 300.0);
 
   native_window_t window = native_window_manager_create(window_options);

examples/application_example/main.cpp

@@ -11,14 +11,9 @@ int main() {
   // Get the Application singleton
   auto& app = Application::GetInstance();
 
-  // Initialize the application
-  if (!app.Initialize()) {
-    std::cerr << "Failed to initialize application" << std::endl;
-    return 1;
-  }
-
-  std::cout << "Application initialized successfully" << std::endl;
-  std::cout << "Single instance: " << (app.IsSingleInstance() ? "Yes" : "No") << std::endl;
+  std::cout << "Application initialized automatically" << std::endl;
+  std::cout << "Single instance: " << (app.IsSingleInstance() ? "Yes" : "No")
+            << std::endl;
 
   // Add event listeners
   auto started_listener = app.AddListener<ApplicationStartedEvent>(
@@ -41,10 +36,9 @@ int main() {
         std::cout << "Application deactivated event received" << std::endl;
       });
 
-
   // Create a simple window
   auto& window_manager = WindowManager::GetInstance();
-  
+
   WindowOptions window_options;
   window_options.title = "Application Example Window";
 

examples/menu_c_example/main.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../../src/capi/app_runner_c.h"
+#include "../../src/capi/application_c.h"
 #include "../../src/capi/menu_c.h"
 
 // Event callback functions

examples/window_example/main.cpp

@@ -1,7 +1,7 @@
 #include <iostream>
 #include "nativeapi.h"
 
-using nativeapi::AppRunner;
+using nativeapi::Application;
 using nativeapi::Display;
 using nativeapi::DisplayAddedEvent;
 using nativeapi::DisplayManager;
@@ -371,7 +371,8 @@ int main() {
                   << std::endl;
       });
 
-  RunApp(window_ptr);
+  auto& app = Application::GetInstance();
+  app.Run(window_ptr);
 
   return 0;
 }

include/nativeapi.h

@@ -5,7 +5,6 @@
 #include "../src/accessibility_manager.h"
 #include "../src/application.h"
 #include "../src/application_event.h"
-#include "../src/app_runner.h"
 #include "../src/display.h"
 #include "../src/display_event.h"
 #include "../src/display_manager.h"
@@ -28,7 +27,6 @@
 // C API headers (available for both C and C++)
 #include "../src/capi/accessibility_manager_c.h"
 #include "../src/capi/application_c.h"
-#include "../src/capi/app_runner_c.h"
 #include "../src/capi/display_c.h"
 #include "../src/capi/display_manager_c.h"
 #include "../src/capi/geometry_c.h"

src/app_runner.cpp

@@ -7,4 +7,8 @@ Application& Application::GetInstance() {
   return instance;
 }
 
+int RunApp(std::shared_ptr<Window> window) {
+  return Application::GetInstance().Run(window);
+}
+
 }  // namespace nativeapi

src/app_runner.h

@@ -13,7 +13,6 @@
 
 namespace nativeapi {
 
-
 /**
  * @brief Application is a singleton class that manages the application lifecycle
  *
@@ -50,7 +49,7 @@ class Application : public EventEmitter<ApplicationEvent> {
    * @code
    * // Usage example:
    * auto& app = Application::GetInstance();
-   * app.Initialize(options);
+   * int exit_code = app.Run();
    * @endcode
    */
   static Application& GetInstance();
@@ -64,40 +63,38 @@ class Application : public EventEmitter<ApplicationEvent> {
   virtual ~Application();
 
   /**
-   * @brief Initialize the application
-   *
-   * Sets up the application with default configuration. This method
-   * should be called before any other application operations. It sets up
-   * platform-specific initialization and emits an ApplicationStartedEvent.
+   * @brief Run the application main event loop
    *
-   * @return true if initialization succeeded, false otherwise
+   * Starts the main event loop and blocks until the application exits.
+   * This method handles platform-specific event processing and coordination
+   * between different managers.
    *
-   * @throws std::runtime_error if initialization fails due to system limitations
+   * @return Exit code of the application (0 for success)
    *
    * @code
    * auto& app = Application::GetInstance();
-   * if (app.Initialize()) {
-   *     // Application initialized successfully
-   * }
+   * int exit_code = app.Run();
    * @endcode
    */
-  bool Initialize();
+  int Run();
 
   /**
-   * @brief Run the application main event loop
+   * @brief Run the application with the specified window
    *
-   * Starts the main event loop and blocks until the application exits.
-   * This method handles platform-specific event processing and coordination
-   * between different managers.
+   * Starts the main event loop with the given window and blocks until the
+   * application exits. This method sets the window as the primary window
+   * and starts the event loop.
    *
+   * @param window The window to run the application with
    * @return Exit code of the application (0 for success)
    *
    * @code
    * auto& app = Application::GetInstance();
-   * int exit_code = app.Run();
+   * auto window = WindowManager::GetInstance().Create(options);
+   * int exit_code = app.Run(window);
    * @endcode
    */
-  int Run();
+  int Run(std::shared_ptr<Window> window);
 
   /**
    * @brief Request the application to quit
@@ -121,7 +118,6 @@ class Application : public EventEmitter<ApplicationEvent> {
    */
   bool IsRunning() const;
 
-
   /**
    * @brief Check if this is a single instance application
    *
@@ -191,12 +187,11 @@ class Application : public EventEmitter<ApplicationEvent> {
    */
   std::vector<std::shared_ptr<Window>> GetAllWindows() const;
 
-
  private:
   /**
    * @brief Private constructor to enforce singleton pattern
    *
-   * Initializes the Application instance and sets up platform-specific
+   * Automatically initializes the Application instance and sets up platform-specific
    * event monitoring. This constructor is private to prevent direct instantiation.
    */
   Application();
@@ -216,7 +211,6 @@ class Application : public EventEmitter<ApplicationEvent> {
   class Impl;
   std::unique_ptr<Impl> pimpl_;
 
-
   /**
    * @brief Application state
    */
@@ -229,15 +223,24 @@ class Application : public EventEmitter<ApplicationEvent> {
    */
   std::shared_ptr<Window> primary_window_;
 
-  /**
-   * @brief Clean up platform-specific event monitoring
-   *
-   * Stops event monitoring and cleans up associated resources.
-   * This is called during destruction.
-   */
-  void CleanupEventMonitoring();
-
  private:
 };
 
+/**
+ * @brief Convenience function to run the application with the specified window
+ *
+ * This is equivalent to calling Application::GetInstance().Run(window).
+ * This function provides a simple way to run an application without
+ * explicitly accessing the singleton.
+ *
+ * @param window The window to run the application with
+ * @return Exit code of the application (0 for success)
+ *
+ * @code
+ * auto window = WindowManager::GetInstance().Create(options);
+ * int exit_code = RunApp(window);
+ * @endcode
+ */
+int RunApp(std::shared_ptr<Window> window);
+
 }  // namespace nativeapi

src/application.cpp

@@ -31,7 +31,7 @@ class ApplicationStartedEvent : public ApplicationEvent {
 class ApplicationExitingEvent : public ApplicationEvent {
  public:
   ApplicationExitingEvent(int exit_code) : exit_code_(exit_code) {}
-  
+
   int GetExitCode() const { return exit_code_; }
   std::string GetTypeName() const override { return "ApplicationExitingEvent"; }
 
@@ -66,5 +66,4 @@ class ApplicationQuitRequestedEvent : public ApplicationEvent {
   std::string GetTypeName() const override { return "ApplicationQuitRequestedEvent"; }
 };
 
-
 }  // namespace nativeapi