fix: view util bug (#79)

dream-sports-labs · Sep 23, 2024 · 4561e6f · 4561e6f
1 parent 9d413ee
commit 4561e6f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/android/src/main/java/com/dylanvann/fastimage/events/FastImageLoadEndEvent.java b/android/src/main/java/com/dylanvann/fastimage/events/FastImageLoadEndEvent.java
@@ -3,7 +3,8 @@
 import androidx.annotation.NonNull;
 
 import com.facebook.react.uimanager.events.Event;
-
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 public class FastImageLoadEndEvent extends Event<FastImageLoadEndEvent> {
 
     public FastImageLoadEndEvent(int surfaceId, int viewTag) {
@@ -16,4 +17,8 @@ public String getEventName() {
         return "onFastImageLoadEnd";
     }
 
+    @Override
+    protected WritableMap getEventData() {
+        return Arguments.createMap();
+    }
 }
diff --git a/android/src/main/java/com/dylanvann/fastimage/events/FastImageLoadEvent.java b/android/src/main/java/com/dylanvann/fastimage/events/FastImageLoadEvent.java
@@ -1,7 +1,8 @@
 package com.dylanvann.fastimage.events;
 
 import androidx.annotation.NonNull;
-
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
 public class FastImageLoadEvent extends Event<FastImageLoadEvent> {
@@ -16,4 +17,8 @@ public String getEventName() {
         return "onFastImageLoad";
     }
 
+    @Override
+    protected WritableMap getEventData() {
+        return Arguments.createMap();
+    }
 }
diff --git a/android/src/main/java/com/dylanvann/fastimage/events/FastImageLoadStartEvent.java b/android/src/main/java/com/dylanvann/fastimage/events/FastImageLoadStartEvent.java
@@ -1,7 +1,8 @@
 package com.dylanvann.fastimage.events;
 
 import androidx.annotation.NonNull;
-
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
 
 public class FastImageLoadStartEvent extends Event<FastImageLoadStartEvent> {
@@ -16,4 +17,8 @@ public String getEventName() {
         return "onFastImageLoadStart";
     }
 
+    @Override
+    protected WritableMap getEventData() {
+        return Arguments.createMap();
+    }
 }
diff --git a/android/src/newarch/java/com/FastImageViewManager.java b/android/src/newarch/java/com/FastImageViewManager.java
@@ -136,8 +136,9 @@ public void onProgress(String key, long bytesRead, long expectedLength) {
             for (FastImageViewWithUrl view : viewsForKey) {
                 ThemedReactContext context = (ThemedReactContext) view.getContext();
                 EventDispatcher dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.getId());
+                int surfaceId = UIManagerHelper.getSurfaceId(context);
                 FastImageProgressEvent event = new FastImageProgressEvent(
-                        ViewUtil.NO_SURFACE_ID,
+                        surfaceId,
                         view.getId(),
                         (int) bytesRead,
                         (int) expectedLength);

diff --git a/android/src/oldarch/java/com/FastImageViewManager.java b/android/src/oldarch/java/com/FastImageViewManager.java
@@ -122,8 +122,9 @@ public void onProgress(String key, long bytesRead, long expectedLength) {
             for (FastImageViewWithUrl view : viewsForKey) {
                 ThemedReactContext context = (ThemedReactContext) view.getContext();
                 EventDispatcher dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.getId());
+                int surfaceId = UIManagerHelper.getSurfaceId(context);
                 FastImageProgressEvent event = new FastImageProgressEvent(
-                        ViewUtil.NO_SURFACE_ID,
+                        surfaceId,
                         view.getId(),
                         (int) bytesRead,
                         (int) expectedLength);