Refactor window management to use WindowRegistry

Replaces platform-specific window storage with the shared WindowRegistry for Android, iOS, and OpenHarmony. This centralizes window tracking and simplifies window management logic across platforms.

Author: lijy91

src/platform/android/window_manager_android.cpp

@@ -6,6 +6,7 @@
 #include <unordered_map>
 #include "../../window.h"
 #include "../../window_manager.h"
+#include "../../window_registry.h"
 
 #define LOG_TAG "NativeApi"
 #define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
@@ -90,49 +91,41 @@ void WindowManager::DispatchWindowEvent(const WindowEvent& event) {
 }
 
 std::shared_ptr<Window> WindowManager::Get(WindowId id) {
-  auto it = windows_.find(id);
-  if (it != windows_.end()) {
-    return it->second;
+  auto cached = WindowRegistry::GetInstance().Get(id);
+  if (cached) {
+    return cached;
   }
 
   // Try to find the window by ID
   ANativeWindow* native_window = FindNativeWindowById(id);
   if (native_window) {
     auto window = std::make_shared<Window>(static_cast<void*>(native_window));
-    windows_[id] = window;
+    WindowRegistry::GetInstance().Add(id, window);
     return window;
   }
 
   return nullptr;
 }
 
 std::vector<std::shared_ptr<Window>> WindowManager::GetAll() {
-  std::vector<std::shared_ptr<Window>> windows;
-
-  for (const auto& [id, window] : windows_) {
-    windows.push_back(window);
-  }
-
-  return windows;
+  return WindowRegistry::GetInstance().GetAll();
 }
 
 std::shared_ptr<Window> WindowManager::GetCurrent() {
   // On Android, the current window is typically the Activity's native window
   // This would need to be set by the Activity lifecycle callbacks
-  if (!windows_.empty()) {
-    return windows_.begin()->second;
-  }
-  return nullptr;
+  auto all = WindowRegistry::GetInstance().GetAll();
+  return all.empty() ? nullptr : all.front();
 }
 
 bool WindowManager::Destroy(WindowId id) {
-  auto it = windows_.find(id);
-  if (it != windows_.end()) {
-    windows_.erase(it);
-    Emit<WindowClosedEvent>(id);
-    return true;
+  auto window = WindowRegistry::GetInstance().Get(id);
+  if (!window) {
+    return false;
   }
-  return false;
+  WindowRegistry::GetInstance().Remove(id);
+  Emit<WindowClosedEvent>(id);
+  return true;
 }
 
 std::shared_ptr<Window> WindowManager::Create(const WindowOptions& options) {

src/platform/ios/window_manager_ios.mm

@@ -1,6 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #include "../../window_manager.h"
+#include "../../window_registry.h"
 
 namespace nativeapi {
 
@@ -28,32 +29,24 @@
   auto window = std::make_shared<Window>((__bridge void*)uiWindow);
 
   if (window) {
-    windows_[window->GetId()] = window;
+    WindowRegistry::GetInstance().Add(window->GetId(), window);
     Emit<WindowCreatedEvent>(window->GetId());
   }
 
   return window;
 }
 
 std::shared_ptr<Window> WindowManager::Get(WindowId id) {
-  auto it = windows_.find(id);
-  return (it != windows_.end()) ? it->second : nullptr;
+  return WindowRegistry::GetInstance().Get(id);
 }
 
 std::vector<std::shared_ptr<Window>> WindowManager::GetAll() {
-  std::vector<std::shared_ptr<Window>> result;
-  result.reserve(windows_.size());
-
-  for (const auto& [id, window] : windows_) {
-    result.push_back(window);
-  }
-
-  return result;
+  return WindowRegistry::GetInstance().GetAll();
 }
 
 std::shared_ptr<Window> WindowManager::GetCurrent() {
   // Find the first key window
-  for (const auto& [id, window] : windows_) {
+  for (const auto& window : WindowRegistry::GetInstance().GetAll()) {
     if (window->IsFocused()) {
       return window;
     }
@@ -62,12 +55,12 @@
 }
 
 bool WindowManager::Destroy(WindowId id) {
-  auto it = windows_.find(id);
-  if (it == windows_.end()) {
+  auto window = WindowRegistry::GetInstance().Get(id);
+  if (!window) {
     return false;
   }
 
-  windows_.erase(it);
+  WindowRegistry::GetInstance().Remove(id);
   Emit<WindowClosedEvent>(id);
 
   return true;

src/platform/ohos/window_manager_ohos.cpp

@@ -7,6 +7,7 @@
 #include <unordered_map>
 #include "../../window.h"
 #include "../../window_manager.h"
+#include "../../window_registry.h"
 
 namespace nativeapi {
 
@@ -87,48 +88,40 @@ void WindowManager::DispatchWindowEvent(const WindowEvent& event) {
 }
 
 std::shared_ptr<Window> WindowManager::Get(WindowId id) {
-  auto it = windows_.find(id);
-  if (it != windows_.end()) {
-    return it->second;
+  auto cached = WindowRegistry::GetInstance().Get(id);
+  if (cached) {
+    return cached;
   }
 
   // Try to find the window by ID
   void* native_window = FindNativeWindowById(id);
   if (native_window) {
     auto window = std::make_shared<Window>(native_window);
-    windows_[id] = window;
+    WindowRegistry::GetInstance().Add(id, window);
     return window;
   }
 
   return nullptr;
 }
 
 std::vector<std::shared_ptr<Window>> WindowManager::GetAll() {
-  std::vector<std::shared_ptr<Window>> windows;
-
-  for (const auto& [id, window] : windows_) {
-    windows.push_back(window);
-  }
-
-  return windows;
+  return WindowRegistry::GetInstance().GetAll();
 }
 
 std::shared_ptr<Window> WindowManager::GetCurrent() {
   // On OpenHarmony, the current window is typically the Ability's window
-  if (!windows_.empty()) {
-    return windows_.begin()->second;
-  }
-  return nullptr;
+  auto all = WindowRegistry::GetInstance().GetAll();
+  return all.empty() ? nullptr : all.front();
 }
 
 bool WindowManager::Destroy(WindowId id) {
-  auto it = windows_.find(id);
-  if (it != windows_.end()) {
-    windows_.erase(it);
-    Emit<WindowClosedEvent>(id);
-    return true;
+  auto window = WindowRegistry::GetInstance().Get(id);
+  if (!window) {
+    return false;
   }
-  return false;
+  WindowRegistry::GetInstance().Remove(id);
+  Emit<WindowClosedEvent>(id);
+  return true;
 }
 
 std::shared_ptr<Window> WindowManager::Create(const WindowOptions& options) {