fix: new arch codegen by unify NativeRNExternalDisplayEvent

mybigday · Sep 1, 2024 · 88057a7 · 88057a7
1 parent 9c9350c
commit 88057a7
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/...xternal-display/android/src/newarch/java/com/externaldisplay/RNExternalDisplayModule.java b/...xternal-display/android/src/newarch/java/com/externaldisplay/RNExternalDisplayModule.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.Arguments;
 
@@ -37,4 +38,18 @@ public WritableMap getInitialScreens() {
 
   @Override
   public void init() {}
+
+  // --- Mock methods (from iOS) ---
+
+  @Override
+  public boolean requestScene(ReadableMap options) { return false; }
+
+  @Override
+  public boolean closeScene(String sceneId) { return false; }
+
+  @Override
+  public boolean isMainSceneActive() { return false; }
+
+  @Override
+  public boolean resumeMainScene() { return false; }
 }
diff --git a/...xternal-display/android/src/oldarch/java/com/externaldisplay/RNExternalDisplayModule.java b/...xternal-display/android/src/oldarch/java/com/externaldisplay/RNExternalDisplayModule.java
@@ -4,6 +4,7 @@
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
 
 import android.view.Display;
 import android.hardware.display.DisplayManager;
@@ -33,4 +34,18 @@ public Map<String, Object> getConstants() {
     map.put("SCREEN_INFO", ExternalDisplayHelper.getScreenInfo(dm.getDisplays()));
     return map;
   }
+
+  // --- Mock methods (from iOS) ---
+
+  @Override
+  public boolean requestScene(ReadableMap options) { return false; }
+
+  @Override
+  public boolean closeScene(String sceneId) { return false; }
+
+  @Override
+  public boolean isMainSceneActive() { return false; }
+
+  @Override
+  public boolean resumeMainScene() { return false; }
 }
diff --git a/packages/react-native-external-display/js/NativeRNExternalDisplayEvent.android.js b/packages/react-native-external-display/js/NativeRNExternalDisplayEvent.android.js
diff --git a/...ay/js/NativeRNExternalDisplayEvent.ios.js → ...isplay/js/NativeRNExternalDisplayEvent.js b/...ay/js/NativeRNExternalDisplayEvent.ios.js → ...isplay/js/NativeRNExternalDisplayEvent.js
@@ -6,7 +6,7 @@ export interface Spec extends TurboModule {
   getInitialScreens: () => {||},
   init: () => void,
 
-  // Scene API
+  // Scene API (iOS only)
   requestScene: (options: {}) => boolean,
   closeScene: (sceneId: string) => boolean,
   isMainSceneActive: () => boolean,

diff --git a/packages/react-native-external-display/js/SceneManager.js b/packages/react-native-external-display/js/SceneManager.js
@@ -1,4 +1,4 @@
-import RNExternalDisplayEvent from './NativeRNExternalDisplayEvent.android'
+import RNExternalDisplayEvent from './NativeRNExternalDisplayEvent'
 
 const sceneTypes = {
   EXTERNAL_DISPLAY: '@RNExternalDisplay_externalDisplay',