zkit-ui 2.0.5 → 2.0.7

package/README.md

@@ -263,7 +263,7 @@ const styles = StyleSheet.create({
 });
 ```
 
-`NativeImagePreview` 不是 `ImagePreview` 的命令式替代品，而是面向真实缩略图锚点的原生共享转场组件。`items` 顺序必须和 `NativeImagePreview.Item index` 对齐，`Item` 内必须渲染真实图片节点；iOS / Android 走原生 viewer，原生模块未注册时不会降级到普通 `ImagePreview`，需要重建 native app。Web 仅渲染子节点，不提供预览能力。
+`NativeImagePreview` 不是 `ImagePreview` 的命令式替代品，而是面向真实缩略图锚点的共享转场组件。`items` 顺序必须和 `NativeImagePreview.Item index` 对齐，`Item` 内必须渲染真实图片节点；iOS / Android 走原生 viewer，原生模块未注册时不会降级到普通 `ImagePreview`，需要重建 native app；Web 走 H5 viewer，支持共享转场、缩放、滑动、视频播放和拖拽关闭。
 
 ### 目录与导出
 

package/android/src/main/java/cn/fontree/zkit/ui/preview/{GalleryLayoutSupport.java → NativeImagePreviewLayoutSupport.java}

@@ -15,19 +15,19 @@ import androidx.annotation.Nullable;
 
 import com.github.chrisbanes.photoview.PhotoView;
 
-public final class GalleryLayoutSupport {
+public final class NativeImagePreviewLayoutSupport {
     private static final int MAX_TRANSITION_BITMAP_SIDE = 2048;
 
-    private GalleryLayoutSupport() {
+    private NativeImagePreviewLayoutSupport() {
     }
 
     @Nullable
-    public static GallerySharedElementState captureImageViewState(@Nullable ImageView imageView) {
+    public static NativeImagePreviewSharedElementState captureImageViewState(@Nullable ImageView imageView) {
         return captureImageViewState(imageView, null);
     }
 
     @Nullable
-    public static GallerySharedElementState captureImageViewState(@Nullable ImageView imageView, @Nullable RectF clippingFrameInWindow) {
+    public static NativeImagePreviewSharedElementState captureImageViewState(@Nullable ImageView imageView, @Nullable RectF clippingFrameInWindow) {
         if (imageView == null) {
             return null;
         }
@@ -72,14 +72,14 @@ public final class GalleryLayoutSupport {
                 contentFrameInWindow.bottom - visibleFrameInWindow.top
         );
 
-        return new GallerySharedElementState(
+        return new NativeImagePreviewSharedElementState(
                 transitionDrawable,
-                new GallerySharedElementGeometry(visibleFrameInWindow, contentFrameInVisibleBounds)
+                new NativeImagePreviewSharedElementGeometry(visibleFrameInWindow, contentFrameInVisibleBounds)
         );
     }
 
     @Nullable
-    public static GallerySharedElementGeometry captureImageViewGeometry(@Nullable ImageView imageView, @Nullable Drawable geometryDrawable) {
+    public static NativeImagePreviewSharedElementGeometry captureImageViewGeometry(@Nullable ImageView imageView, @Nullable Drawable geometryDrawable) {
         if (imageView == null || imageView.getWidth() <= 0 || imageView.getHeight() <= 0) {
             return null;
         }
@@ -117,7 +117,7 @@ public final class GalleryLayoutSupport {
                 contentFrameInWindow.bottom - visibleFrameInWindow.top
         );
 
-        return new GallerySharedElementGeometry(visibleFrameInWindow, contentFrameInVisibleBounds);
+        return new NativeImagePreviewSharedElementGeometry(visibleFrameInWindow, contentFrameInVisibleBounds);
     }
 
     @NonNull
@@ -225,16 +225,16 @@ public final class GalleryLayoutSupport {
     }
 
     @NonNull
-    public static GallerySharedElementGeometry defaultGeometryFor(@NonNull Drawable drawable, @NonNull RectF containerBounds) {
+    public static NativeImagePreviewSharedElementGeometry defaultGeometryFor(@NonNull Drawable drawable, @NonNull RectF containerBounds) {
         RectF visibleFrame = aspectFitRect(drawable, containerBounds);
-        return new GallerySharedElementGeometry(
+        return new NativeImagePreviewSharedElementGeometry(
                 visibleFrame,
                 new RectF(0f, 0f, visibleFrame.width(), visibleFrame.height())
         );
     }
 
     @NonNull
-    public static GallerySharedElementGeometry defaultGeometryForAspectRatio(float width, float height, @NonNull RectF containerBounds) {
+    public static NativeImagePreviewSharedElementGeometry defaultGeometryForAspectRatio(float width, float height, @NonNull RectF containerBounds) {
         float safeWidth = Math.max(1f, width);
         float safeHeight = Math.max(1f, height);
         float widthScale = containerBounds.width() / safeWidth;
@@ -245,7 +245,7 @@ public final class GalleryLayoutSupport {
         float left = containerBounds.left + (containerBounds.width() - targetWidth) * 0.5f;
         float top = containerBounds.top + (containerBounds.height() - targetHeight) * 0.5f;
         RectF visibleFrame = new RectF(left, top, left + targetWidth, top + targetHeight);
-        return new GallerySharedElementGeometry(
+        return new NativeImagePreviewSharedElementGeometry(
                 visibleFrame,
                 new RectF(0f, 0f, visibleFrame.width(), visibleFrame.height())
         );

package/android/src/main/java/cn/fontree/zkit/ui/preview/{GalleryMediaItem.java → NativeImagePreviewMediaItem.java}

@@ -1,6 +1,6 @@
 package cn.fontree.zkit.ui.preview;
 
-public class GalleryMediaItem {
+public class NativeImagePreviewMediaItem {
     public enum MediaType {
         IMAGE,
         VIDEO
@@ -11,7 +11,7 @@ public class GalleryMediaItem {
     private final String sourceUrl;
     private final String thumbnailUrl;
 
-    public GalleryMediaItem(String id, MediaType mediaType, String sourceUrl, String thumbnailUrl) {
+    public NativeImagePreviewMediaItem(String id, MediaType mediaType, String sourceUrl, String thumbnailUrl) {
         this.id = id;
         this.mediaType = mediaType;
         this.sourceUrl = sourceUrl;

package/android/src/main/java/cn/fontree/zkit/ui/preview/NativeImagePreviewModule.kt

@@ -0,0 +1,43 @@
+package cn.fontree.zkit.ui.preview
+
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+class NativeImagePreviewModule : Module() {
+    override fun definition() = ModuleDefinition {
+        Name("ZKitNativeImagePreview")
+
+        View(NativeImagePreviewView::class) {
+            Events(
+                "onIndexChange"
+            )
+            Prop("theme") { view: NativeImagePreviewView, theme: Theme ->
+                view.theme = theme
+            }
+            Prop("items") { view: NativeImagePreviewView, items: Array<Map<String, Any?>> ->
+                view.items = items.toList()
+            }
+            Prop("urls") { view: NativeImagePreviewView, urls: Array<String> ->
+                view.urls = urls
+            }
+            Prop("index") { view: NativeImagePreviewView, index: Int ->
+                view.initialIndex = index
+            }
+            Prop("previewGroupId") { view: NativeImagePreviewView, previewGroupId: String? ->
+                view.previewGroupId = previewGroupId
+            }
+            Prop("disableHiddenOriginalImage") { view: NativeImagePreviewView, disableHiddenOriginalImage: Boolean ->
+                view.disableHiddenOriginalImage = disableHiddenOriginalImage
+            }
+            Prop("edgeToEdge") { view: NativeImagePreviewView, edgeToEdge: Boolean ->
+                view.edgeToEdge = edgeToEdge
+            }
+            Prop("transitionOffsetY") { view: NativeImagePreviewView, transitionOffsetY: Int? ->
+                view.transitionOffsetY = transitionOffsetY
+            }
+            Prop("transitionOffsetX") { view: NativeImagePreviewView, transitionOffsetX: Int? ->
+                view.transitionOffsetX = transitionOffsetX
+            }
+        }
+    }
+}

package/android/src/main/java/cn/fontree/zkit/ui/preview/{GalleryPagerAdapter.java → NativeImagePreviewPagerAdapter.java}

@@ -11,28 +11,28 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public final class GalleryPagerAdapter extends RecyclerView.Adapter<GalleryPagerAdapter.PageViewHolder> {
+public final class NativeImagePreviewPagerAdapter extends RecyclerView.Adapter<NativeImagePreviewPagerAdapter.PageViewHolder> {
     public interface PageBindCallback {
-        void onPageBound(@NonNull GalleryViewerPageView pageView, int position);
+        void onPageBound(@NonNull NativeImagePreviewViewerPageView pageView, int position);
     }
 
-    private final List<GalleryMediaItem> items = new ArrayList<>();
-    private final Map<Integer, GalleryViewerPageView> attachedViews = new HashMap<>();
+    private final List<NativeImagePreviewMediaItem> items = new ArrayList<>();
+    private final Map<Integer, NativeImagePreviewViewerPageView> attachedViews = new HashMap<>();
     @Nullable
-    private final GalleryViewerPageView.Listener pageListener;
+    private final NativeImagePreviewViewerPageView.Listener pageListener;
     @Nullable
     private final PageBindCallback pageBindCallback;
     private int activeIndex = -1;
 
-    public GalleryPagerAdapter(
-            @Nullable GalleryViewerPageView.Listener pageListener,
+    public NativeImagePreviewPagerAdapter(
+            @Nullable NativeImagePreviewViewerPageView.Listener pageListener,
             @Nullable PageBindCallback pageBindCallback
     ) {
         this.pageListener = pageListener;
         this.pageBindCallback = pageBindCallback;
     }
 
-    public void setItems(@NonNull List<GalleryMediaItem> list) {
+    public void setItems(@NonNull List<NativeImagePreviewMediaItem> list) {
         attachedViews.clear();
         items.clear();
         items.addAll(list);
@@ -41,21 +41,21 @@ public final class GalleryPagerAdapter extends RecyclerView.Adapter<GalleryPager
 
     public void setActiveIndex(int index) {
         activeIndex = index;
-        for (Map.Entry<Integer, GalleryViewerPageView> entry : attachedViews.entrySet()) {
+        for (Map.Entry<Integer, NativeImagePreviewViewerPageView> entry : attachedViews.entrySet()) {
             entry.getValue().setActive(entry.getKey() == index);
         }
     }
 
     public void releaseAll() {
-        for (GalleryViewerPageView view : attachedViews.values()) {
+        for (NativeImagePreviewViewerPageView view : attachedViews.values()) {
             view.release();
         }
         attachedViews.clear();
     }
 
     @Nullable
-    public GalleryViewerPageView findAttachedView(int position) {
-        GalleryViewerPageView pageView = attachedViews.get(position);
+    public NativeImagePreviewViewerPageView findAttachedView(int position) {
+        NativeImagePreviewViewerPageView pageView = attachedViews.get(position);
         if (pageView == null) {
             return null;
         }
@@ -67,14 +67,14 @@ public final class GalleryPagerAdapter extends RecyclerView.Adapter<GalleryPager
     }
 
     @Nullable
-    public GalleryViewerPageView findActiveView() {
+    public NativeImagePreviewViewerPageView findActiveView() {
         return attachedViews.get(activeIndex);
     }
 
     @NonNull
     @Override
     public PageViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        GalleryViewerPageView pageView = new GalleryViewerPageView(parent.getContext());
+        NativeImagePreviewViewerPageView pageView = new NativeImagePreviewViewerPageView(parent.getContext());
         pageView.setListener(pageListener);
         return new PageViewHolder(pageView);
     }
@@ -112,9 +112,9 @@ public final class GalleryPagerAdapter extends RecyclerView.Adapter<GalleryPager
         holder.pageView.release();
     }
 
-    private void removeAttachedViewKeys(@NonNull GalleryViewerPageView pageView) {
+    private void removeAttachedViewKeys(@NonNull NativeImagePreviewViewerPageView pageView) {
         List<Integer> keys = new ArrayList<>();
-        for (Map.Entry<Integer, GalleryViewerPageView> entry : attachedViews.entrySet()) {
+        for (Map.Entry<Integer, NativeImagePreviewViewerPageView> entry : attachedViews.entrySet()) {
             if (entry.getValue() == pageView) {
                 keys.add(entry.getKey());
             }
@@ -130,9 +130,9 @@ public final class GalleryPagerAdapter extends RecyclerView.Adapter<GalleryPager
     }
 
     static final class PageViewHolder extends RecyclerView.ViewHolder {
-        final GalleryViewerPageView pageView;
+        final NativeImagePreviewViewerPageView pageView;
 
-        PageViewHolder(@NonNull GalleryViewerPageView itemView) {
+        PageViewHolder(@NonNull NativeImagePreviewViewerPageView itemView) {
             super(itemView);
             this.pageView = itemView;
         }

package/android/src/main/java/cn/fontree/zkit/ui/preview/{GallerySharedElementGeometry.java → NativeImagePreviewSharedElementGeometry.java}

@@ -4,11 +4,11 @@ import android.graphics.RectF;
 
 import androidx.annotation.NonNull;
 
-public final class GallerySharedElementGeometry {
+public final class NativeImagePreviewSharedElementGeometry {
     private final RectF visibleFrameInWindow;
     private final RectF contentFrameInVisibleBounds;
 
-    public GallerySharedElementGeometry(@NonNull RectF visibleFrameInWindow, @NonNull RectF contentFrameInVisibleBounds) {
+    public NativeImagePreviewSharedElementGeometry(@NonNull RectF visibleFrameInWindow, @NonNull RectF contentFrameInVisibleBounds) {
         this.visibleFrameInWindow = new RectF(visibleFrameInWindow);
         this.contentFrameInVisibleBounds = new RectF(contentFrameInVisibleBounds);
     }

package/android/src/main/java/cn/fontree/zkit/ui/preview/NativeImagePreviewSharedElementNames.java

@@ -0,0 +1,39 @@
+package cn.fontree.zkit.ui.preview;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public final class NativeImagePreviewSharedElementNames {
+    private static final String PREFIX = "zkit-native-image-preview:media:";
+
+    private NativeImagePreviewSharedElementNames() {
+    }
+
+    @NonNull
+    public static String forItem(@NonNull NativeImagePreviewMediaItem item) {
+        return forItem(null, item);
+    }
+
+    @NonNull
+    public static String forItem(@Nullable String previewGroupId, @NonNull NativeImagePreviewMediaItem item) {
+        return forId(previewGroupId, item.getId());
+    }
+
+    @NonNull
+    public static String forIndex(int index) {
+        return forIndex(null, index);
+    }
+
+    @NonNull
+    public static String forIndex(@Nullable String previewGroupId, int index) {
+        return forId(previewGroupId, String.valueOf(index));
+    }
+
+    @NonNull
+    private static String forId(@Nullable String previewGroupId, @NonNull String id) {
+        if (previewGroupId == null || previewGroupId.isEmpty()) {
+            return PREFIX + id;
+        }
+        return PREFIX + previewGroupId + ":" + id;
+    }
+}

package/android/src/main/java/cn/fontree/zkit/ui/preview/{GallerySharedElementState.java → NativeImagePreviewSharedElementState.java}

@@ -4,11 +4,11 @@ import android.graphics.drawable.Drawable;
 
 import androidx.annotation.NonNull;
 
-public final class GallerySharedElementState {
+public final class NativeImagePreviewSharedElementState {
     private final Drawable drawable;
-    private final GallerySharedElementGeometry geometry;
+    private final NativeImagePreviewSharedElementGeometry geometry;
 
-    public GallerySharedElementState(@NonNull Drawable drawable, @NonNull GallerySharedElementGeometry geometry) {
+    public NativeImagePreviewSharedElementState(@NonNull Drawable drawable, @NonNull NativeImagePreviewSharedElementGeometry geometry) {
         this.drawable = drawable;
         this.geometry = geometry;
     }
@@ -19,7 +19,7 @@ public final class GallerySharedElementState {
     }
 
     @NonNull
-    public GallerySharedElementGeometry getGeometry() {
+    public NativeImagePreviewSharedElementGeometry getGeometry() {
         return geometry;
     }
 }

package/android/src/main/java/cn/fontree/zkit/ui/preview/{GallerySourceViewRegistry.java → NativeImagePreviewSourceViewRegistry.java}

@@ -12,10 +12,10 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-public final class GallerySourceViewRegistry {
+public final class NativeImagePreviewSourceViewRegistry {
     private static final Map<String, WeakReference<ImageView>> SOURCE_VIEWS = new HashMap<>();
 
-    private GallerySourceViewRegistry() {
+    private NativeImagePreviewSourceViewRegistry() {
     }
 
     public static synchronized void register(@NonNull String key, @NonNull ImageView imageView) {

package/android/src/main/java/cn/fontree/zkit/ui/preview/{GalleryTransitionSnapshotView.java → NativeImagePreviewTransitionSnapshotView.java}

@@ -9,10 +9,10 @@ import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 
-public final class GalleryTransitionSnapshotView extends FrameLayout {
+public final class NativeImagePreviewTransitionSnapshotView extends FrameLayout {
     private final ImageView imageView;
 
-    public GalleryTransitionSnapshotView(@NonNull Context context, @NonNull Drawable drawable) {
+    public NativeImagePreviewTransitionSnapshotView(@NonNull Context context, @NonNull Drawable drawable) {
         super(context);
         setClipChildren(true);
         setClipToPadding(true);
@@ -22,7 +22,7 @@ public final class GalleryTransitionSnapshotView extends FrameLayout {
         addView(imageView);
     }
 
-    public void applyGeometry(@NonNull GallerySharedElementGeometry geometry) {
+    public void applyGeometry(@NonNull NativeImagePreviewSharedElementGeometry geometry) {
         RectF visibleFrame = geometry.getVisibleFrameInWindow();
         FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) getLayoutParams();
         if (layoutParams == null) {

package/android/src/main/java/cn/fontree/zkit/ui/preview/{GalleryVideoPlayerView.java → NativeImagePreviewVideoPlayerView.java}

@@ -29,7 +29,7 @@ import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
 
-public final class GalleryVideoPlayerView extends FrameLayout {
+public final class NativeImagePreviewVideoPlayerView extends FrameLayout {
     public interface Listener {
         void onCloseRequested();
     }
@@ -40,7 +40,7 @@ public final class GalleryVideoPlayerView extends FrameLayout {
     @Nullable
     private Runnable contentReadyListener;
     @Nullable
-    private GalleryMediaItem item;
+    private NativeImagePreviewMediaItem item;
     @Nullable
     private ExoPlayer player;
     @Nullable
@@ -60,7 +60,7 @@ public final class GalleryVideoPlayerView extends FrameLayout {
         }
     };
 
-    public GalleryVideoPlayerView(@NonNull Context context) {
+    public NativeImagePreviewVideoPlayerView(@NonNull Context context) {
         super(context);
         setLayoutParams(new LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
@@ -78,7 +78,7 @@ public final class GalleryVideoPlayerView extends FrameLayout {
         addView(posterImageView);
 
         playerView = (PlayerView) LayoutInflater.from(context)
-                .inflate(R.layout.galeria_player_view, this, false);
+                .inflate(R.layout.native_image_preview_player_view, this, false);
         playerView.setUseController(true);
         playerView.setControllerAutoShow(true);
         playerView.setControllerHideOnTouch(true);
@@ -134,7 +134,7 @@ public final class GalleryVideoPlayerView extends FrameLayout {
         this.contentReadyListener = contentReadyListener;
     }
 
-    public void bind(@NonNull GalleryMediaItem item) {
+    public void bind(@NonNull NativeImagePreviewMediaItem item) {
         this.item = item;
         firstFrameReady = false;
         playerView.animate().cancel();
@@ -194,8 +194,8 @@ public final class GalleryVideoPlayerView extends FrameLayout {
     }
 
     @Nullable
-    public GallerySharedElementState sharedElementState() {
-        return GalleryLayoutSupport.captureImageViewState(posterImageView);
+    public NativeImagePreviewSharedElementState sharedElementState() {
+        return NativeImagePreviewLayoutSupport.captureImageViewState(posterImageView);
     }
 
     @Nullable

package/android/src/main/java/cn/fontree/zkit/ui/preview/{GaleriaView.kt → NativeImagePreviewView.kt}

@@ -15,7 +15,7 @@ enum class Theme(val value: String) {
     Light("light")
 }
 
-class GaleriaView(context: Context) : ViewGroup(context) {
+class NativeImagePreviewView(context: Context) : ViewGroup(context) {
     var urls: Array<String>? = null
     var items: List<Map<String, Any?>> = emptyList()
     var theme: Theme = Theme.Dark
@@ -24,7 +24,7 @@ class GaleriaView(context: Context) : ViewGroup(context) {
             field = value
             bindSourceImageView()
         }
-    var galleryId: String? = null
+    var previewGroupId: String? = null
         set(value) {
             field = value
             bindSourceImageView()
@@ -39,7 +39,7 @@ class GaleriaView(context: Context) : ViewGroup(context) {
     private var observedSourceImageView: ImageView? = null
     private var sourceImageLayoutListener: View.OnLayoutChangeListener? = null
     private var sourceImageAttachListener: View.OnAttachStateChangeListener? = null
-    private var overlayView: GalleryViewerOverlayView? = null
+    private var overlayView: NativeImagePreviewViewerOverlayView? = null
     private var overlayBackCallback: OnBackPressedCallback? = null
 
     override fun onAttachedToWindow() {
@@ -64,14 +64,14 @@ class GaleriaView(context: Context) : ViewGroup(context) {
         unregisterSourceImageView()
     }
 
-    private fun scopedGalleryId(): String? = galleryId?.takeIf { it.isNotBlank() }
+    private fun scopedPreviewGroupId(): String? = previewGroupId?.takeIf { it.isNotBlank() }
 
     private fun transitionNameForIndex(index: Int): String {
-        return GallerySharedElementNames.forIndex(scopedGalleryId(), index)
+        return NativeImagePreviewSharedElementNames.forIndex(scopedPreviewGroupId(), index)
     }
 
-    private fun transitionNameForItem(item: GalleryMediaItem): String {
-        return GallerySharedElementNames.forItem(scopedGalleryId(), item)
+    private fun transitionNameForItem(item: NativeImagePreviewMediaItem): String {
+        return NativeImagePreviewSharedElementNames.forItem(scopedPreviewGroupId(), item)
     }
 
     private fun bindSourceImageView() {
@@ -85,7 +85,7 @@ class GaleriaView(context: Context) : ViewGroup(context) {
         if (previousSourceImageView != null && previousSourceImageView !== imageView) {
             clearSourceImageObserver()
             if (!isSourceImageViewUsable(previousSourceImageView)) {
-                GallerySourceViewRegistry.unregisterView(previousSourceImageView)
+                NativeImagePreviewSourceViewRegistry.unregisterView(previousSourceImageView)
             }
         }
 
@@ -110,14 +110,14 @@ class GaleriaView(context: Context) : ViewGroup(context) {
             ?: activity.findViewById<ViewGroup>(android.R.id.content)
             ?: return
         val sourceKey = transitionNameForItem(mediaItems[safeIndex])
-        GallerySourceViewRegistry.register(sourceKey, sourceView)
-        val overlay = GalleryViewerOverlayView(
+        NativeImagePreviewSourceViewRegistry.register(sourceKey, sourceView)
+        val overlay = NativeImagePreviewViewerOverlayView(
             activity,
             mediaItems,
             safeIndex,
             theme == Theme.Light,
-            scopedGalleryId(),
-            object : GalleryViewerOverlayView.Listener {
+            scopedPreviewGroupId(),
+            object : NativeImagePreviewViewerOverlayView.Listener {
                 override fun onOverlayDismissed() {
                     if (overlayView != null) {
                         overlayView = null
@@ -145,22 +145,22 @@ class GaleriaView(context: Context) : ViewGroup(context) {
         }
     }
 
-    private fun buildMediaItems(): List<GalleryMediaItem> {
+    private fun buildMediaItems(): List<NativeImagePreviewMediaItem> {
         if (items.isNotEmpty()) {
             return items.mapIndexedNotNull { index, data ->
                 val type = data["type"] as? String ?: return@mapIndexedNotNull null
                 val url = data["url"] as? String ?: return@mapIndexedNotNull null
                 if (type.lowercase() == "video") {
                     val poster = data["poster"] as? String ?: url
-                    GalleryMediaItem(index.toString(), GalleryMediaItem.MediaType.VIDEO, url, poster)
+                    NativeImagePreviewMediaItem(index.toString(), NativeImagePreviewMediaItem.MediaType.VIDEO, url, poster)
                 } else {
-                    GalleryMediaItem(index.toString(), GalleryMediaItem.MediaType.IMAGE, url, url)
+                    NativeImagePreviewMediaItem(index.toString(), NativeImagePreviewMediaItem.MediaType.IMAGE, url, url)
                 }
             }
         }
         val rawUrls = urls ?: return emptyList()
         return rawUrls.mapIndexed { index, url ->
-            GalleryMediaItem(index.toString(), GalleryMediaItem.MediaType.IMAGE, url, url)
+            NativeImagePreviewMediaItem(index.toString(), NativeImagePreviewMediaItem.MediaType.IMAGE, url, url)
         }
     }
 
@@ -191,7 +191,7 @@ class GaleriaView(context: Context) : ViewGroup(context) {
         val transitionName = transitionNameForIndex(initialIndex)
         if (isSourceImageViewUsable(imageView)) {
             clearSourceImageObserver(imageView)
-            GallerySourceViewRegistry.register(transitionName, imageView)
+            NativeImagePreviewSourceViewRegistry.register(transitionName, imageView)
             return
         }
 
@@ -298,7 +298,7 @@ class GaleriaView(context: Context) : ViewGroup(context) {
     private fun unregisterSourceImageView() {
         clearSourceImageObserver()
         sourceImageView?.let { imageView ->
-            GallerySourceViewRegistry.unregisterView(imageView)
+            NativeImagePreviewSourceViewRegistry.unregisterView(imageView)
         }
         sourceImageView = null
     }