zkit-ui 2.0.5 → 2.0.7

package/android/src/main/java/cn/fontree/zkit/ui/preview/{GalleryViewerOverlayView.java → NativeImagePreviewViewerOverlayView.java}

@@ -20,16 +20,16 @@ import androidx.viewpager2.widget.ViewPager2;
 import java.util.ArrayList;
 import java.util.List;
 
-public final class GalleryViewerOverlayView extends FrameLayout implements GalleryViewerPageView.Listener {
+public final class NativeImagePreviewViewerOverlayView extends FrameLayout implements NativeImagePreviewViewerPageView.Listener {
     public interface Listener {
         void onOverlayDismissed();
 
         void onOverlayIndexChange(int index);
     }
 
-    private final List<GalleryMediaItem> items;
+    private final List<NativeImagePreviewMediaItem> items;
     @Nullable
-    private final String galleryId;
+    private final String previewGroupId;
     @Nullable
     private final Listener listener;
     private final boolean lightTheme;
@@ -39,8 +39,8 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
     private View backgroundView;
     private FrameLayout contentView;
     private ViewPager2 viewPager;
-    private GalleryPagerAdapter pagerAdapter;
-    private GalleryViewerTransitionController transitionController;
+    private NativeImagePreviewPagerAdapter pagerAdapter;
+    private NativeImagePreviewViewerTransitionController transitionController;
     private int currentIndex;
     private float downX;
     private float downY;
@@ -54,7 +54,7 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
     @Nullable
     private View dragTarget;
     @Nullable
-    private GalleryViewerPageView dragPageView;
+    private NativeImagePreviewViewerPageView dragPageView;
     @Nullable
     private ImageView hiddenActiveSourceView;
     private float hiddenActiveSourcePreviousAlpha = 1f;
@@ -69,7 +69,7 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
             if (openingTransitionStarted || closing || finished) {
                 return;
             }
-            GalleryViewerPageView pageView = resolveCurrentPageView();
+            NativeImagePreviewViewerPageView pageView = resolveCurrentPageView();
             if (pageView == null || getWidth() <= 0 || getHeight() <= 0) {
                 postOnAnimation(this);
                 return;
@@ -78,19 +78,19 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
         }
     };
 
-    public GalleryViewerOverlayView(
+    public NativeImagePreviewViewerOverlayView(
             @NonNull Context context,
-            @NonNull List<GalleryMediaItem> sourceItems,
+            @NonNull List<NativeImagePreviewMediaItem> sourceItems,
             int startIndex,
             boolean lightTheme,
-            @Nullable String galleryId,
+            @Nullable String previewGroupId,
             @Nullable Listener listener
     ) {
         super(context);
         this.items = new ArrayList<>(sourceItems);
         this.currentIndex = Math.max(0, Math.min(startIndex, items.size() - 1));
         this.lightTheme = lightTheme;
-        this.galleryId = galleryId;
+        this.previewGroupId = previewGroupId;
         this.listener = listener;
         ViewConfiguration viewConfiguration = ViewConfiguration.get(context);
         touchSlop = viewConfiguration.getScaledTouchSlop();
@@ -187,7 +187,7 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
                 if (!dragging) {
                     float dx = event.getRawX() - downX;
                     float dy = event.getRawY() - downY;
-                    GalleryViewerPageView pageView = resolveCurrentPageView();
+                    NativeImagePreviewViewerPageView pageView = resolveCurrentPageView();
                     if (pageView != null
                             && Math.abs(dy) > touchSlop
                             && pageView.canBeginVerticalDismiss(dx, dy, event.getRawX(), event.getRawY())) {
@@ -244,14 +244,14 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
     }
 
     @Override
-    public void onDismissRequested(@NonNull GalleryViewerPageView pageView) {
+    public void onDismissRequested(@NonNull NativeImagePreviewViewerPageView pageView) {
         if (pageView == resolveCurrentPageView()) {
             closeViewer();
         }
     }
 
     @Override
-    public void onVideoCloseRequested(@NonNull GalleryViewerPageView pageView) {
+    public void onVideoCloseRequested(@NonNull NativeImagePreviewViewerPageView pageView) {
         if (pageView == resolveCurrentPageView()) {
             closeViewer();
         }
@@ -281,7 +281,7 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
         ));
         viewPager.setOffscreenPageLimit(1);
         viewPager.setUserInputEnabled(false);
-        pagerAdapter = new GalleryPagerAdapter(this, this::applySourcePlaceholderIfNeeded);
+        pagerAdapter = new NativeImagePreviewPagerAdapter(this, this::applySourcePlaceholderIfNeeded);
         viewPager.setAdapter(pagerAdapter);
         pagerAdapter.setItems(items);
         viewPager.setCurrentItem(currentIndex, false);
@@ -302,31 +302,31 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
         contentView.addView(viewPager);
         addView(contentView);
 
-        transitionController = new GalleryViewerTransitionController(this, backgroundView, contentView);
+        transitionController = new NativeImagePreviewViewerTransitionController(this, backgroundView, contentView);
     }
 
     private void startOpenTransition(
-            @NonNull GalleryViewerPageView pageView,
-            @Nullable GallerySharedElementState resolvedPageState
+            @NonNull NativeImagePreviewViewerPageView pageView,
+            @Nullable NativeImagePreviewSharedElementState resolvedPageState
     ) {
         if (openingTransitionStarted) {
             return;
         }
         openingTransitionStarted = true;
-        GalleryMediaItem item = items.get(currentIndex);
-        String anchorKey = GallerySharedElementNames.forItem(galleryId, item);
-        ImageView sourceView = GallerySourceViewRegistry.find(anchorKey);
-        GallerySharedElementState sourceState = GalleryLayoutSupport.captureImageViewState(sourceView);
+        NativeImagePreviewMediaItem item = items.get(currentIndex);
+        String anchorKey = NativeImagePreviewSharedElementNames.forItem(previewGroupId, item);
+        ImageView sourceView = NativeImagePreviewSourceViewRegistry.find(anchorKey);
+        NativeImagePreviewSharedElementState sourceState = NativeImagePreviewLayoutSupport.captureImageViewState(sourceView);
         applySourcePlaceholderIfNeeded(pageView, currentIndex);
         pageView.prepareForOpenTransition();
         pageView.setMediaHidden(true);
 
         Drawable fallbackDrawable = sourceState != null ? sourceState.getDrawable() : null;
-        RectF overlayBounds = GalleryLayoutSupport.viewBoundsOnScreen(this);
-        GallerySharedElementState effectivePageState = usableSharedElementState(resolvedPageState)
+        RectF overlayBounds = NativeImagePreviewLayoutSupport.viewBoundsOnScreen(this);
+        NativeImagePreviewSharedElementState effectivePageState = usableSharedElementState(resolvedPageState)
                 ? resolvedPageState
                 : pageView.sharedElementState();
-        GallerySharedElementGeometry targetGeometry = usableSharedElementState(effectivePageState)
+        NativeImagePreviewSharedElementGeometry targetGeometry = usableSharedElementState(effectivePageState)
                 ? effectivePageState.getGeometry()
                 : defaultOpenGeometryFromSource(sourceState, overlayBounds, pageView, fallbackDrawable);
 
@@ -338,7 +338,7 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
         );
     }
 
-    private void finishOpenTransition(@NonNull GalleryViewerPageView pageView) {
+    private void finishOpenTransition(@NonNull NativeImagePreviewViewerPageView pageView) {
         if (contentPresented) {
             return;
         }
@@ -365,23 +365,23 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
         viewPager.requestDisallowInterceptTouchEvent(false);
         releaseVelocityTracker();
 
-        GalleryViewerPageView pageView = resolveCurrentPageView();
+        NativeImagePreviewViewerPageView pageView = resolveCurrentPageView();
         if (pageView == null) {
             finishWithoutAnimation();
             return;
         }
 
         pageView.prepareForReturnTransition();
-        GallerySharedElementState pageState = pageView.sharedElementState();
+        NativeImagePreviewSharedElementState pageState = pageView.sharedElementState();
         pageView.setMediaHidden(true);
 
-        GalleryMediaItem item = items.get(currentIndex);
-        String anchorKey = GallerySharedElementNames.forItem(galleryId, item);
-        ImageView targetView = GallerySourceViewRegistry.find(anchorKey);
-        GallerySharedElementState targetState = GalleryLayoutSupport.captureImageViewState(targetView);
-        GallerySharedElementGeometry targetGeometry = targetState != null
+        NativeImagePreviewMediaItem item = items.get(currentIndex);
+        String anchorKey = NativeImagePreviewSharedElementNames.forItem(previewGroupId, item);
+        ImageView targetView = NativeImagePreviewSourceViewRegistry.find(anchorKey);
+        NativeImagePreviewSharedElementState targetState = NativeImagePreviewLayoutSupport.captureImageViewState(targetView);
+        NativeImagePreviewSharedElementGeometry targetGeometry = targetState != null
                 ? targetState.getGeometry()
-                : GalleryLayoutSupport.captureImageViewGeometry(
+                : NativeImagePreviewLayoutSupport.captureImageViewGeometry(
                         targetView,
                         pageState != null ? pageState.getDrawable() : null
                 );
@@ -398,8 +398,8 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
     }
 
     @Nullable
-    private GalleryViewerPageView resolveCurrentPageView() {
-        GalleryViewerPageView pageView = pagerAdapter.findAttachedView(currentIndex);
+    private NativeImagePreviewViewerPageView resolveCurrentPageView() {
+        NativeImagePreviewViewerPageView pageView = pagerAdapter.findAttachedView(currentIndex);
         if (pageView != null) {
             return pageView;
         }
@@ -407,16 +407,16 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
     }
 
     @NonNull
-    private GallerySharedElementGeometry defaultOpenGeometryFromSource(
-            @Nullable GallerySharedElementState sourceState,
+    private NativeImagePreviewSharedElementGeometry defaultOpenGeometryFromSource(
+            @Nullable NativeImagePreviewSharedElementState sourceState,
             @NonNull RectF overlayBounds,
-            @NonNull GalleryViewerPageView pageView,
+            @NonNull NativeImagePreviewViewerPageView pageView,
             @Nullable Drawable fallbackDrawable
     ) {
         if (sourceState != null) {
             RectF sourceContent = sourceState.getGeometry().getContentFrameInVisibleBounds();
             if (sourceContent.width() > 1f && sourceContent.height() > 1f) {
-                return GalleryLayoutSupport.defaultGeometryForAspectRatio(
+                return NativeImagePreviewLayoutSupport.defaultGeometryForAspectRatio(
                         sourceContent.width(),
                         sourceContent.height(),
                         overlayBounds
@@ -426,7 +426,7 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
         return pageView.defaultTransitionGeometry(overlayBounds, fallbackDrawable);
     }
 
-    private boolean usableSharedElementState(@Nullable GallerySharedElementState state) {
+    private boolean usableSharedElementState(@Nullable NativeImagePreviewSharedElementState state) {
         if (state == null) {
             return false;
         }
@@ -446,7 +446,7 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
         currentIndex = Math.max(0, Math.min(pagerIndex, items.size() - 1));
     }
 
-    private void startDragging(@NonNull GalleryViewerPageView pageView, float rawY) {
+    private void startDragging(@NonNull NativeImagePreviewViewerPageView pageView, float rawY) {
         dragging = true;
         dragPageView = pageView;
         dragPageView.prepareForDismissDrag();
@@ -493,7 +493,7 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
     }
 
     private void syncPagerGesturePolicy() {
-        GalleryViewerPageView pageView = resolveCurrentPageView();
+        NativeImagePreviewViewerPageView pageView = resolveCurrentPageView();
         boolean canPage = items.size() > 1 && pageView != null && pageView.canPageHorizontally();
         viewPager.setUserInputEnabled(canPage);
         viewPager.requestDisallowInterceptTouchEvent(!canPage);
@@ -525,7 +525,7 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
 
     private void animateBackToCenter() {
         View target = getActiveDragTarget();
-        GalleryViewerPageView restorePageView = dragPageView;
+        NativeImagePreviewViewerPageView restorePageView = dragPageView;
         dragPageView = null;
         target.animate()
                 .translationY(0f)
@@ -550,17 +550,17 @@ public final class GalleryViewerOverlayView extends FrameLayout implements Galle
         if (index < 0 || index >= items.size()) {
             return null;
         }
-        GalleryMediaItem item = items.get(index);
-        String anchorKey = GallerySharedElementNames.forItem(galleryId, item);
-        return GallerySourceViewRegistry.find(anchorKey);
+        NativeImagePreviewMediaItem item = items.get(index);
+        String anchorKey = NativeImagePreviewSharedElementNames.forItem(previewGroupId, item);
+        return NativeImagePreviewSourceViewRegistry.find(anchorKey);
     }
 
-    private void applySourcePlaceholderIfNeeded(@NonNull GalleryViewerPageView pageView, int index) {
+    private void applySourcePlaceholderIfNeeded(@NonNull NativeImagePreviewViewerPageView pageView, int index) {
         ImageView sourceView = sourceViewForIndex(index);
         if (sourceView == null) {
             return;
         }
-        Drawable sourceDrawable = GalleryLayoutSupport.transitionDrawableForImageView(sourceView);
+        Drawable sourceDrawable = NativeImagePreviewLayoutSupport.transitionDrawableForImageView(sourceView);
         pageView.setImagePlaceholderIfEmpty(sourceDrawable);
     }
 

package/android/src/main/java/cn/fontree/zkit/ui/preview/{GalleryViewerPageView.java → NativeImagePreviewViewerPageView.java}

@@ -23,26 +23,26 @@ import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
 import com.github.chrisbanes.photoview.PhotoView;
 
-public final class GalleryViewerPageView extends FrameLayout {
+public final class NativeImagePreviewViewerPageView extends FrameLayout {
     public interface Listener {
-        void onDismissRequested(@NonNull GalleryViewerPageView pageView);
+        void onDismissRequested(@NonNull NativeImagePreviewViewerPageView pageView);
 
-        void onVideoCloseRequested(@NonNull GalleryViewerPageView pageView);
+        void onVideoCloseRequested(@NonNull NativeImagePreviewViewerPageView pageView);
     }
 
     private final FrameLayout mediaContainer;
     private final PhotoView photoView;
-    private final GalleryVideoPlayerView videoPlayerView;
+    private final NativeImagePreviewVideoPlayerView videoPlayerView;
     private final FrameLayout loadingContainer;
     private final ObjectAnimator loadingPulseAnimator;
     @Nullable
-    private GalleryMediaItem item;
+    private NativeImagePreviewMediaItem item;
     @Nullable
     private Listener listener;
     private boolean active;
     private boolean allowParentInterceptOnImageEdge;
 
-    public GalleryViewerPageView(@NonNull Context context) {
+    public NativeImagePreviewViewerPageView(@NonNull Context context) {
         super(context);
         setLayoutParams(new LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
@@ -73,7 +73,7 @@ public final class GalleryViewerPageView extends FrameLayout {
         });
         mediaContainer.addView(photoView);
 
-        videoPlayerView = new GalleryVideoPlayerView(context);
+        videoPlayerView = new NativeImagePreviewVideoPlayerView(context);
         videoPlayerView.setVisibility(GONE);
         videoPlayerView.setListener(() -> {
             if (listener != null) {
@@ -106,9 +106,9 @@ public final class GalleryViewerPageView extends FrameLayout {
         this.listener = listener;
     }
 
-    public void bind(@NonNull GalleryMediaItem item) {
+    public void bind(@NonNull NativeImagePreviewMediaItem item) {
         this.item = item;
-        if (item.getMediaType() == GalleryMediaItem.MediaType.IMAGE) {
+        if (item.getMediaType() == NativeImagePreviewMediaItem.MediaType.IMAGE) {
             bindImage(item);
         } else {
             bindVideo(item);
@@ -117,7 +117,7 @@ public final class GalleryViewerPageView extends FrameLayout {
 
     public void setActive(boolean active) {
         this.active = active;
-        if (item == null || item.getMediaType() != GalleryMediaItem.MediaType.VIDEO) {
+        if (item == null || item.getMediaType() != NativeImagePreviewMediaItem.MediaType.VIDEO) {
             return;
         }
         videoPlayerView.setActive(active);
@@ -144,7 +144,7 @@ public final class GalleryViewerPageView extends FrameLayout {
         if (item == null) {
             return true;
         }
-        if (item.getMediaType() == GalleryMediaItem.MediaType.IMAGE) {
+        if (item.getMediaType() == NativeImagePreviewMediaItem.MediaType.IMAGE) {
             return photoView.getScale() <= 1.02f;
         }
         return true;
@@ -162,7 +162,7 @@ public final class GalleryViewerPageView extends FrameLayout {
         if (Math.abs(dy) <= Math.abs(dx) * 1.02f) {
             return false;
         }
-        if (item.getMediaType() == GalleryMediaItem.MediaType.IMAGE) {
+        if (item.getMediaType() == NativeImagePreviewMediaItem.MediaType.IMAGE) {
             return photoView.getScale() <= 1.02f;
         }
         return !videoPlayerView.isTouchOnInteractiveControls(rawX, rawY);
@@ -172,7 +172,7 @@ public final class GalleryViewerPageView extends FrameLayout {
         if (item == null) {
             return;
         }
-        if (item.getMediaType() == GalleryMediaItem.MediaType.IMAGE) {
+        if (item.getMediaType() == NativeImagePreviewMediaItem.MediaType.IMAGE) {
             photoView.setAlpha(hidden ? 0f : 1f);
         } else {
             videoPlayerView.setMediaHidden(hidden);
@@ -180,7 +180,7 @@ public final class GalleryViewerPageView extends FrameLayout {
     }
 
     public void setImagePlaceholderIfEmpty(@Nullable Drawable drawable) {
-        if (item == null || item.getMediaType() != GalleryMediaItem.MediaType.IMAGE) {
+        if (item == null || item.getMediaType() != NativeImagePreviewMediaItem.MediaType.IMAGE) {
             return;
         }
         if (drawable == null || photoView.getDrawable() != null) {
@@ -192,18 +192,18 @@ public final class GalleryViewerPageView extends FrameLayout {
     }
 
     @Nullable
-    public GallerySharedElementState sharedElementState() {
+    public NativeImagePreviewSharedElementState sharedElementState() {
         if (item == null) {
             return null;
         }
-        if (item.getMediaType() == GalleryMediaItem.MediaType.IMAGE) {
-            return GalleryLayoutSupport.captureImageViewState(photoView);
+        if (item.getMediaType() == NativeImagePreviewMediaItem.MediaType.IMAGE) {
+            return NativeImagePreviewLayoutSupport.captureImageViewState(photoView);
         }
         return videoPlayerView.sharedElementState();
     }
 
     @NonNull
-    public GallerySharedElementGeometry defaultTransitionGeometry(@NonNull RectF containerBounds, @Nullable Drawable fallbackDrawable) {
+    public NativeImagePreviewSharedElementGeometry defaultTransitionGeometry(@NonNull RectF containerBounds, @Nullable Drawable fallbackDrawable) {
         Drawable drawable = currentDrawable();
         if (drawable == null) {
             drawable = fallbackDrawable;
@@ -215,16 +215,16 @@ public final class GalleryViewerPageView extends FrameLayout {
             float top = containerBounds.top + (containerBounds.height() - fallbackHeight) * 0.5f;
             RectF visibleFrame = new RectF(left, top, left + fallbackWidth, top + fallbackHeight);
             RectF contentFrame = new RectF(0f, 0f, visibleFrame.width(), visibleFrame.height());
-            return new GallerySharedElementGeometry(visibleFrame, contentFrame);
+            return new NativeImagePreviewSharedElementGeometry(visibleFrame, contentFrame);
         }
-        return GalleryLayoutSupport.defaultGeometryFor(drawable, containerBounds);
+        return NativeImagePreviewLayoutSupport.defaultGeometryFor(drawable, containerBounds);
     }
 
     public void prepareForOpenTransition() {
         if (item == null) {
             return;
         }
-        if (item.getMediaType() == GalleryMediaItem.MediaType.IMAGE) {
+        if (item.getMediaType() == NativeImagePreviewMediaItem.MediaType.IMAGE) {
             photoView.setScale(1f, false);
             photoView.setAllowParentInterceptOnEdge(allowParentInterceptOnImageEdge);
         } else {
@@ -236,7 +236,7 @@ public final class GalleryViewerPageView extends FrameLayout {
         if (item == null) {
             return;
         }
-        if (item.getMediaType() == GalleryMediaItem.MediaType.IMAGE) {
+        if (item.getMediaType() == NativeImagePreviewMediaItem.MediaType.IMAGE) {
             photoView.setScale(1f, false);
             photoView.setAllowParentInterceptOnEdge(allowParentInterceptOnImageEdge);
         } else {
@@ -248,7 +248,7 @@ public final class GalleryViewerPageView extends FrameLayout {
         if (item == null) {
             return;
         }
-        if (item.getMediaType() == GalleryMediaItem.MediaType.IMAGE) {
+        if (item.getMediaType() == NativeImagePreviewMediaItem.MediaType.IMAGE) {
             photoView.setScale(1f, false);
         } else {
             videoPlayerView.prepareForReturnTransition();
@@ -256,13 +256,13 @@ public final class GalleryViewerPageView extends FrameLayout {
     }
 
     public void restoreAfterDismissCancelled() {
-        if (item == null || item.getMediaType() != GalleryMediaItem.MediaType.VIDEO) {
+        if (item == null || item.getMediaType() != NativeImagePreviewMediaItem.MediaType.VIDEO) {
             return;
         }
         videoPlayerView.restoreAfterDismissCancelled();
     }
 
-    private void bindImage(@NonNull GalleryMediaItem item) {
+    private void bindImage(@NonNull NativeImagePreviewMediaItem item) {
         photoView.setVisibility(VISIBLE);
         videoPlayerView.release();
         videoPlayerView.setVisibility(GONE);
@@ -313,7 +313,7 @@ public final class GalleryViewerPageView extends FrameLayout {
         });
     }
 
-    private void bindVideo(@NonNull GalleryMediaItem item) {
+    private void bindVideo(@NonNull NativeImagePreviewMediaItem item) {
         photoView.setVisibility(GONE);
         Glide.with(photoView).clear(photoView);
         photoView.setImageDrawable(null);
@@ -328,7 +328,7 @@ public final class GalleryViewerPageView extends FrameLayout {
         if (item == null) {
             return null;
         }
-        if (item.getMediaType() == GalleryMediaItem.MediaType.IMAGE) {
+        if (item.getMediaType() == NativeImagePreviewMediaItem.MediaType.IMAGE) {
             return photoView.getDrawable();
         }
         return videoPlayerView.getPosterDrawable();

package/android/src/main/java/cn/fontree/zkit/ui/preview/{GalleryViewerTransitionController.java → NativeImagePreviewViewerTransitionController.java}

@@ -12,16 +12,16 @@ import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-public final class GalleryViewerTransitionController {
+public final class NativeImagePreviewViewerTransitionController {
     private final FrameLayout containerView;
     private final View backgroundView;
     private final View contentView;
     @Nullable
-    private GalleryTransitionSnapshotView snapshotView;
+    private NativeImagePreviewTransitionSnapshotView snapshotView;
     @Nullable
     private ImageView hiddenSourceView;
 
-    public GalleryViewerTransitionController(
+    public NativeImagePreviewViewerTransitionController(
             @NonNull FrameLayout containerView,
             @NonNull View backgroundView,
             @NonNull View contentView
@@ -33,8 +33,8 @@ public final class GalleryViewerTransitionController {
 
     public void performOpenTransition(
             @Nullable ImageView sourceView,
-            @Nullable GallerySharedElementState sourceState,
-            @NonNull GallerySharedElementGeometry targetGeometry,
+            @Nullable NativeImagePreviewSharedElementState sourceState,
+            @NonNull NativeImagePreviewSharedElementGeometry targetGeometry,
             @NonNull Runnable completion
     ) {
         clearSnapshot();
@@ -54,9 +54,9 @@ public final class GalleryViewerTransitionController {
             return;
         }
 
-        GallerySharedElementGeometry sourceGeometry = frameInContainer(sourceState.getGeometry());
-        GallerySharedElementGeometry endGeometry = frameInContainer(targetGeometry);
-        snapshotView = new GalleryTransitionSnapshotView(containerView.getContext(), sourceState.getDrawable());
+        NativeImagePreviewSharedElementGeometry sourceGeometry = frameInContainer(sourceState.getGeometry());
+        NativeImagePreviewSharedElementGeometry endGeometry = frameInContainer(targetGeometry);
+        snapshotView = new NativeImagePreviewTransitionSnapshotView(containerView.getContext(), sourceState.getDrawable());
         containerView.addView(snapshotView);
         snapshotView.applyGeometry(sourceGeometry);
         animateSnapshot(
@@ -86,8 +86,8 @@ public final class GalleryViewerTransitionController {
     }
 
     public void performCloseTransition(
-            @Nullable GallerySharedElementState pageState,
-            @Nullable GallerySharedElementGeometry targetGeometry,
+            @Nullable NativeImagePreviewSharedElementState pageState,
+            @Nullable NativeImagePreviewSharedElementGeometry targetGeometry,
             @Nullable ImageView targetView,
             @NonNull Runnable completion
     ) {
@@ -111,9 +111,9 @@ public final class GalleryViewerTransitionController {
         if (targetView != null) {
             targetView.setAlpha(0f);
         }
-        GallerySharedElementGeometry startGeometry = frameInContainer(pageState.getGeometry());
-        GallerySharedElementGeometry endGeometry = frameInContainer(targetGeometry);
-        snapshotView = new GalleryTransitionSnapshotView(containerView.getContext(), pageState.getDrawable());
+        NativeImagePreviewSharedElementGeometry startGeometry = frameInContainer(pageState.getGeometry());
+        NativeImagePreviewSharedElementGeometry endGeometry = frameInContainer(targetGeometry);
+        snapshotView = new NativeImagePreviewTransitionSnapshotView(containerView.getContext(), pageState.getDrawable());
         containerView.addView(snapshotView);
         snapshotView.applyGeometry(startGeometry);
         animateSnapshot(
@@ -138,14 +138,14 @@ public final class GalleryViewerTransitionController {
     }
 
     private void animateSnapshot(
-            @NonNull GallerySharedElementGeometry startGeometry,
-            @NonNull GallerySharedElementGeometry endGeometry,
+            @NonNull NativeImagePreviewSharedElementGeometry startGeometry,
+            @NonNull NativeImagePreviewSharedElementGeometry endGeometry,
             float backgroundStartAlpha,
             float backgroundEndAlpha,
             long durationMs,
             @NonNull Runnable completion
     ) {
-        GalleryTransitionSnapshotView localSnapshotView = snapshotView;
+        NativeImagePreviewTransitionSnapshotView localSnapshotView = snapshotView;
         if (localSnapshotView == null) {
             completion.run();
             return;
@@ -169,14 +169,14 @@ public final class GalleryViewerTransitionController {
     }
 
     @NonNull
-    private GallerySharedElementGeometry interpolateGeometry(
-            @NonNull GallerySharedElementGeometry start,
-            @NonNull GallerySharedElementGeometry end,
+    private NativeImagePreviewSharedElementGeometry interpolateGeometry(
+            @NonNull NativeImagePreviewSharedElementGeometry start,
+            @NonNull NativeImagePreviewSharedElementGeometry end,
             float progress
     ) {
         RectF visibleFrame = interpolateRect(start.getVisibleFrameInWindow(), end.getVisibleFrameInWindow(), progress);
         RectF contentFrame = interpolateRect(start.getContentFrameInVisibleBounds(), end.getContentFrameInVisibleBounds(), progress);
-        return new GallerySharedElementGeometry(visibleFrame, contentFrame);
+        return new NativeImagePreviewSharedElementGeometry(visibleFrame, contentFrame);
     }
 
     @NonNull
@@ -190,12 +190,12 @@ public final class GalleryViewerTransitionController {
     }
 
     @NonNull
-    private GallerySharedElementGeometry frameInContainer(@NonNull GallerySharedElementGeometry geometry) {
+    private NativeImagePreviewSharedElementGeometry frameInContainer(@NonNull NativeImagePreviewSharedElementGeometry geometry) {
         int[] location = new int[2];
         containerView.getLocationOnScreen(location);
         RectF visibleFrame = geometry.getVisibleFrameInWindow();
         visibleFrame.offset(-location[0], -location[1]);
-        return new GallerySharedElementGeometry(
+        return new NativeImagePreviewSharedElementGeometry(
                 visibleFrame,
                 geometry.getContentFrameInVisibleBounds()
         );

package/dist/ui/Button/index.d.ts

@@ -61,7 +61,7 @@ export type ButtonColors = {
     loading?: string;
     pressedOverlay?: string;
 };
-type NativePressableProps = Omit<React.ComponentPropsWithoutRef<typeof Pressable>, 'accessibilityRole' | 'accessibilityState' | 'children' | 'disabled' | 'style'>;
+type NativePressableProps = Omit<React.ComponentPropsWithoutRef<typeof Pressable>, 'accessibilityRole' | 'accessibilityState' | 'children' | 'disabled' | 'role' | 'style'>;
 export type ButtonRef = React.ComponentRef<typeof Pressable>;
 export interface ButtonProps extends NativePressableProps {
     variant?: ButtonVariant;

package/dist/ui/Button/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui/Button/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui/Button/index.tsx"],"names":[],"mappings":"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"}