Updated RNExternalDisplayModule to initialize ExternalDisplayHelper and handle display events

Author: Dimon70007

packages/react-native-external-display/android/src/newarch/java/com/externaldisplay/RNExternalDisplayManager.java

@@ -27,11 +27,11 @@
 import java.util.HashMap;
 
 public class RNExternalDisplayManager extends ViewGroupManager<RNExternalDisplayView>
-    implements ExternalDisplayHelper.Listener, RNExternalDisplayManagerInterface<RNExternalDisplayView> {
+    implements RNExternalDisplayManagerInterface<RNExternalDisplayView> {
   public static final String REACT_CLASS = "RNExternalDisplay";
-  private ExternalDisplayHelper helper;
+  private static final String TAG = "RNExternalDisplayEvent";
   private ReactApplicationContext reactContext;
-  private Map<RNExternalDisplayView, RNExternalDisplayView> views = new HashMap<RNExternalDisplayView, RNExternalDisplayView>();
+  //private Map<RNExternalDisplayView, RNExternalDisplayView> views = new HashMap<RNExternalDisplayView, RNExternalDisplayView>();
 
   private final ViewManagerDelegate<RNExternalDisplayView> mDelegate;
 
@@ -54,22 +54,28 @@ public String getName() {
 
   @Override
   public RNExternalDisplayView createViewInstance(ThemedReactContext context) {
-    if (this.helper == null) {
-      this.helper = new ExternalDisplayHelper(reactContext, this);
+    // Retrieve the module to access the helper
+    RNExternalDisplayModule module = context.getNativeModule(RNExternalDisplayModule.class);
+    ExternalDisplayHelper helper = null;
+    if (module != null) {
+      helper = module.getExternalDisplayHelper();
+    } else {
     }
-    RNExternalDisplayView view = new RNExternalDisplayView(context, this.helper);
-    views.put(view, view);
+
+    RNExternalDisplayView view = new RNExternalDisplayView(context, helper);
     return view;
   }
 
   @Override
   public void onDropViewInstance(RNExternalDisplayView view) {
-    views.remove(view);
+    //views.remove(view);
     super.onDropViewInstance(view);
     view.onDropInstance();
   }
-
+/*
   private void checkScreen() {
+    Log.d("RNExternalDisplayEvent", "RNExternalDisplayManager checkScreen");
+
     int screenId = -1;
     for (RNExternalDisplayView view : views.values()) {
       int viewScreenId = view.getScreen();
@@ -83,45 +89,16 @@ private void checkScreen() {
     }
   }
 
+ */
+
   @ReactProp(name = "screen")
-  public void setScreen(RNExternalDisplayView view, @Nullable String screen) {
+  public void setScreen(RNExternalDisplayView view, String screen) {
     view.setScreen(screen);
-    checkScreen();
+    //checkScreen();
   }
 
   @ReactProp(name = "fallbackInMainScreen", defaultBoolean = false)
   public void setFallbackInMainScreen(RNExternalDisplayView view, boolean fallbackInMainScreen) {
     view.setFallbackInMainScreen(fallbackInMainScreen);
   }
-
-  private void sendEvent(String eventName, @Nullable WritableMap params) {
-    reactContext
-      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-      .emit(eventName, params);
-  }
-
-  public void onDisplayAdded(Display[] displays, int displayId) {
-    sendEvent(
-      "@RNExternalDisplay_screenDidConnect",
-      Arguments.makeNativeMap(
-        ExternalDisplayHelper.getScreenInfo(displays)
-      )
-    );
-  }
-  public void onDisplayChanged(Display[] displays, int displayId) {
-    sendEvent(
-      "@RNExternalDisplay_screenDidChange",
-      Arguments.makeNativeMap(
-        ExternalDisplayHelper.getScreenInfo(displays)
-      )
-    );
-  }
-  public void onDisplayRemoved(Display[] displays, int displayId) {
-    sendEvent(
-      "@RNExternalDisplay_screenDidDisconnect",
-      Arguments.makeNativeMap(
-        ExternalDisplayHelper.getScreenInfo(displays)
-      )
-    );
-  }
 }

packages/react-native-external-display/android/src/newarch/java/com/externaldisplay/RNExternalDisplayModule.java

@@ -9,19 +9,24 @@
 
 import android.view.Display;
 import android.hardware.display.DisplayManager;
+import android.util.Log;
 
 import java.util.Map;
 import java.util.HashMap;
 
-public class RNExternalDisplayModule extends NativeRNExternalDisplayEventSpec {
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+public class RNExternalDisplayModule extends NativeRNExternalDisplayEventSpec implements ExternalDisplayHelper.Listener {
   public static final String REACT_CLASS = "RNExternalDisplayEvent";
+  private static final String TAG = "RNExternalDisplayEvent";
+
   private ReactApplicationContext reactContext = null;
-  private DisplayManager dm = null;
-  
+
   public RNExternalDisplayModule(ReactApplicationContext context) {
     super(context);
-    reactContext = context;
-    dm = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
+    this.reactContext = context;
+    // Initialize ExternalDisplayHelper singleton
+    ExternalDisplayHelper.initialize(context, this);
   }
 
   @Override
@@ -32,7 +37,11 @@ public String getName() {
   @Override
   public WritableMap getInitialScreens() {
     WritableMap map = Arguments.createMap();
-    map.putMap("SCREEN_INFO", Arguments.makeNativeMap(ExternalDisplayHelper.getScreenInfo(dm.getDisplays())));
+    try {
+      map.putMap("SCREEN_INFO", Arguments.makeNativeMap(ExternalDisplayHelper.getScreenInfo(ExternalDisplayHelper.getInstance().getDisplays())));
+    } catch (IllegalStateException e) {
+      map.putMap("SCREEN_INFO", Arguments.createMap());
+    }
     return map;
   }
 
@@ -52,4 +61,50 @@ public void init() {}
 
   @Override
   public boolean resumeMainScene() { return false; }
+
+  private void sendEvent(String eventName, WritableMap params) {
+    reactContext
+      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+      .emit(eventName, params);
+  }
+
+  @Override
+  public void onDisplayAdded(Display[] displays, int displayId) {
+    sendEvent(
+      "@RNExternalDisplay_screenDidConnect",
+      Arguments.makeNativeMap(ExternalDisplayHelper.getScreenInfo(displays))
+    );
+  }
+
+  @Override
+  public void onDisplayChanged(Display[] displays, int displayId) {
+    sendEvent(
+      "@RNExternalDisplay_screenDidChange",
+      Arguments.makeNativeMap(ExternalDisplayHelper.getScreenInfo(displays))
+    );
+  }
+
+  @Override
+  public void onDisplayRemoved(Display[] displays, int displayId) {
+    sendEvent(
+      "@RNExternalDisplay_screenDidDisconnect",
+      Arguments.makeNativeMap(ExternalDisplayHelper.getScreenInfo(displays))
+    );
+  }
+
+  @Override
+  public void onCatalystInstanceDestroy() {
+    super.onCatalystInstanceDestroy();
+    // Clean up the ExternalDisplayHelper singleton
+    ExternalDisplayHelper.destroy();
+  }
+
+  // Optional: Provide a getter for ExternalDisplayHelper
+  public ExternalDisplayHelper getExternalDisplayHelper() {
+    try {
+      return ExternalDisplayHelper.getInstance();
+    } catch (IllegalStateException e) {
+      return null;
+    }
+  }
 }