Expose LNPopupShadowedImageView as public API

Support smooth transitions from and to LNPopupShadowedImageView instances

Author: LeoNatan

LNPopupController/LNPopupController.xcodeproj/project.pbxproj

@@ -11,6 +11,7 @@
 #import <LNPopupController/LNPopupItem.h>
 #import <LNPopupController/LNPopupCustomBarViewController.h>
 #import <LNPopupController/LNPopupBarAppearance.h>
+#import <LNPopupController/LNPopupShadowedImageView.h>
 
 #define LN_UNAVAILABLE_PREVIEWING_MSG "Add context menu interaction or register for previewing directly on the popup bar view."
 
@@ -73,7 +74,7 @@ NS_SWIFT_UI_ACTOR
 @property (nullable, nonatomic, copy, readonly) NSArray<UIBarButtonItem*>* trailingBarButtonItems;
 
 /// An image view displayed when the bar style is prominent. (read-only)
-@property (nonatomic, strong, readonly) UIImageView* imageView;
+@property (nonatomic, strong, readonly) LNPopupShadowedImageView* imageView;
 
 /// The popup bar style.
 @property (nonatomic, assign) LNPopupBarStyle barStyle UI_APPEARANCE_SELECTOR;

LNPopupController/LNPopupController/LNPopupBar.h

@@ -0,0 +1,27 @@
+//
+//  LNPopupShadowedImageView.h
+//  LNPopupController
+//
+//  Created by Léo Natan on 2023-09-25.
+//  Copyright © 2015-2024 Léo Natan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// A specialized `UIImageView` subclass, allowing setting a shadow and corner radius.
+///
+/// When used inside a popup content view, instances of this class are especially suited as image transition targets.
+///
+/// See `UIViewController.viewForPopupTransition(from:to:)`.
+@interface LNPopupShadowedImageView : UIImageView
+
+/// The corner radius of the image view.
+@property (nonatomic, assign) CGFloat cornerRadius;
+/// The shadow displayed underneath the image view.
+@property (nonatomic, copy) NSShadow* shadow;
+
+@end
+
+NS_ASSUME_NONNULL_END

LNPopupController/LNPopupController/LNPopupShadowedImageView.h

@@ -12,7 +12,7 @@
 #import "_LNPopupSwizzlingUtils.h"
 #import "_LNPopupBase64Utils.hh"
 #import "NSAttributedString+LNPopupSupport.h"
-#import "_LNPopupBarShadowedImageView.h"
+#import "LNPopupShadowedImageView+Private.h"
 #import "UIView+LNPopupSupportPrivate.h"
 
 #ifdef DEBUG
@@ -296,7 +296,7 @@ @implementation LNPopupBar
 {
 	BOOL _delaysBarButtonItemLayout;
 
-	UIImageView* _imageView;
+	LNPopupShadowedImageView* _imageView;
 
 	_LNPopupBarTitlesView* _titlesView;
 	NSLayoutConstraint* _titlesViewLeadingConstraint;
@@ -518,14 +518,13 @@ - (nonnull instancetype)initWithFrame:(CGRect)frame
 
 		_needsLabelsLayout = YES;
 
-		_imageView = [[_LNPopupBarShadowedImageView alloc] initWithContainingPopupBar:self];;
+		_imageView = [[LNPopupShadowedImageView alloc] initWithContainingPopupBar:self];;
 		_imageView.autoresizingMask = UIViewAutoresizingNone;
 		_imageView.contentMode = UIViewContentModeScaleAspectFit;
 		_imageView.accessibilityTraits = UIAccessibilityTraitImage;
 		_imageView.isAccessibilityElement = YES;
 		_imageView.layer.cornerCurve = kCACornerCurveContinuous;
-		_imageView.layer.masksToBounds = YES;
-		static_cast<_LNPopupBarShadowedImageView*>(_imageView).cornerRadius = 6;
+		_imageView.cornerRadius = 6;
 
 		// support smart invert and therefore do not invert image view colors
 		_imageView.accessibilityIgnoresInvertColors = YES;
@@ -1054,7 +1053,7 @@ - (void)_appearanceDidChange
 
 	_floatingBackgroundShadowView.shadow = self.activeAppearance.floatingBarBackgroundShadow;
 
-	static_cast<_LNPopupBarShadowedImageView*>(_imageView).shadow = self.activeAppearance.imageShadow;
+	_imageView.shadow = self.activeAppearance.imageShadow;
 
 	[self.customBarViewController _activeAppearanceDidChange:self.activeAppearance];
 

LNPopupController/LNPopupController/Private/LNPopupBar.mm

@@ -17,7 +17,11 @@
 #import "UIView+LNPopupSupportPrivate.h"
 #import "LNPopupCustomBarViewController+Private.h"
 #import "_LNPopupTransitionView.h"
-#import "_LNPopupBarShadowedImageView.h"
+#import "_LNPopupTransitionPreferredOpenAnimator.h"
+#import "_LNPopupTransitionGenericOpenAnimator.h"
+#import "_LNPopupTransitionGenericCloseAnimator.h"
+#import "_LNPopupTransitionPreferredCloseAnimator.h"
+
 #import <objc/runtime.h>
 #import <os/log.h>
 
@@ -371,60 +375,24 @@ - (UIView*)_supportedUserTransitionViewFromState:(LNPopupPresentationState)fromS
 	return userView;
 }
 
-static const void* _LNPopupOpenCloseTransitionViewKey = &_LNPopupOpenCloseTransitionViewKey;
-
 - (void)animateOpenTransitionIfNeededWithAnimator:(UIViewPropertyAnimator*)animator userTransitionView:(UIView*)userView otherAnimations:(void(^)(void))otherAnimations
 {
 	if(userView == nil)
 	{
 		return;
 	}
 
-	__block CGRect sourceFrame;
-	__block _LNPopupTransitionView* transitionView;
-	__block NSShadow* targetShadow;
-	[UIView performWithoutAnimation:^{
-		[self.popupContentView layoutIfNeeded];
-		self.popupBar.imageView.alpha = 0.0;
-		
-		sourceFrame = [self.popupBar.imageView.window convertRect:self.popupBar.imageView.bounds fromView:self.popupBar.imageView];
-		
-		transitionView = [[_LNPopupTransitionView alloc] initWithFrame:sourceFrame sourceView:userView];
-		transitionView.shadow = [((_LNPopupBarShadowedImageView*)self.popupBar.imageView).shadow copy];
-		
-		targetShadow = [transitionView.shadow copy];
-		targetShadow.shadowColor = [targetShadow.shadowColor colorWithAlphaComponent:0.0];
-		
-		objc_setAssociatedObject(userView, _LNPopupOpenCloseTransitionViewKey, transitionView, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-	}];
-	
-	[animator addAnimations:otherAnimations];
+	_LNPopupTransitionOpenAnimator* handler;
+	if([userView isKindOfClass:LNPopupShadowedImageView.class])
+	{
+		handler = [[_LNPopupTransitionPreferredOpenAnimator alloc] initWithUserView:(LNPopupShadowedImageView*)userView popupBar:self.popupBar popupContentView:self.popupContentView];
+	}
+	else
+	{
+		handler = [[_LNPopupTransitionGenericOpenAnimator alloc] initWithUserView:userView popupBar:self.popupBar popupContentView:self.popupContentView];
+	}
 
-	[animator addAnimations:^{
-		__block CGRect targetFrame;
-		[UIView performWithoutAnimation:^{
-			targetFrame = [self.popupContentView.window convertRect:userView.bounds fromView:userView];
-			CGFloat ratioX = sourceFrame.size.width / targetFrame.size.width;
-			CGFloat ratioY = sourceFrame.size.height / targetFrame.size.height;
-			transitionView.sourceViewTransform = CGAffineTransformMakeScale(ratioX, ratioY);
-			
-			[self.popupContentView.window addSubview:transitionView];
-		}];
-		
-		transitionView.frame = targetFrame;
-		transitionView.sourceViewTransform = CGAffineTransformIdentity;
-		transitionView.shadow = targetShadow;
-	}];
-}
-
-- (void)completeOpenTransitionIfNeededWithUserTransitionView:(UIView*)userView
-{
-	[UIView performWithoutAnimation:^{
-		UIView* transitionView = objc_getAssociatedObject(userView, _LNPopupOpenCloseTransitionViewKey);
-		[transitionView removeFromSuperview];
-		objc_setAssociatedObject(userView, _LNPopupOpenCloseTransitionViewKey, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-		self.popupBar.imageView.alpha = 1.0;
-	}];
+	[handler animateWithAnimator:animator otherAnimations:otherAnimations];
 }
 
 - (void)animateCloseTransitionIfNeededWithAnimator:(UIViewPropertyAnimator*)animator userTransitionView:(UIView*)userView otherAnimations:(void(^)(void))otherAnimations
@@ -434,66 +402,18 @@ - (void)animateCloseTransitionIfNeededWithAnimator:(UIViewPropertyAnimator*)anim
 		return;
 	}
 
-	__block CGRect sourceFrame;
-	__block _LNPopupTransitionView* transitionView;
-	__block NSShadow* targetShadow;
-	[UIView performWithoutAnimation:^{
-		[self.popupContentView layoutIfNeeded];
-		self.popupBar.imageView.alpha = 0.0;
-		
-		sourceFrame = [self.popupContentView.window convertRect:userView.bounds fromView:userView];
-		
-		transitionView = [[_LNPopupTransitionView alloc] initWithFrame:sourceFrame sourceView:userView];
-		
-		_LNPopupBarShadowedImageView* imageView = (id)self.popupBar.imageView;
-		
-		targetShadow = [imageView.shadow copy];
-		
-		NSShadow* hiddenShadow = [targetShadow copy];
-		hiddenShadow.shadowColor = [targetShadow.shadowColor colorWithAlphaComponent:0.0];
-		transitionView.shadow = hiddenShadow;
-		
-		objc_setAssociatedObject(userView, _LNPopupOpenCloseTransitionViewKey, transitionView, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-		
-		[self.popupContentView.window addSubview:transitionView];
-	}];
+	_LNPopupTransitionCloseAnimator* handler;
 
-	[animator addAnimations:^{
-		otherAnimations();
-		
-		CGRect targetFrame = [self.popupBar.imageView.window convertRect:self.popupBar.imageView.bounds fromView:self.popupBar.imageView];
-		[transitionView setTargetFrameUpdatingTransform:targetFrame];
-		
-		transitionView.shadow = targetShadow;
-		
-		if(self.containerController._ln_shouldPopupContentViewFadeForTransition)
-		{
-			self.popupContentView.alpha = 0.0;
-		}
-		else
-		{
-			self.currentContentController.view.alpha = 0.0;
-		}
-	}];
+	if([userView isKindOfClass:LNPopupShadowedImageView.class])
+	{
+		handler = [[_LNPopupTransitionPreferredCloseAnimator alloc] initWithUserView:userView popupBar:self.popupBar popupContentView:self.popupContentView currentContentController:self.currentContentController containerController:self.containerController];
+	}
+	else
+	{
+		handler = [[_LNPopupTransitionGenericCloseAnimator alloc] initWithUserView:userView popupBar:self.popupBar popupContentView:self.popupContentView currentContentController:self.currentContentController containerController:self.containerController];
+	}
 
-	dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)((animator.duration * 0.38) * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-		[animator addAnimations:^{
-			_LNPopupBarShadowedImageView* imageView = (id)self.popupBar.imageView;
-			transitionView.cornerRadius = imageView.cornerRadius;
-		}];
-	});
-}
-
-- (void)completeCloseTransitionIfNeededWithUserTransitionView:(UIView*)userView
-{
-	[UIView performWithoutAnimation:^{
-		UIView* transitionView = objc_getAssociatedObject(userView, _LNPopupOpenCloseTransitionViewKey);
-		[transitionView removeFromSuperview];
-		objc_setAssociatedObject(userView, _LNPopupOpenCloseTransitionViewKey, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-		self.popupBar.imageView.alpha = 1.0;
-		self.popupContentView.alpha = 1.0;
-		self.currentContentController.view.alpha = 1.0;
-	}];
+	[handler animateWithAnimator:animator otherAnimations:otherAnimations];
 }
 
 - (void)_transitionToState:(LNPopupPresentationState)state notifyDelegate:(BOOL)notifyDelegate animated:(BOOL)animated useSpringAnimation:(BOOL)spring allowPopupBarAlphaModification:(BOOL)allowBarAlpha allowFeedbackGeneration:(BOOL)allowFeedbackGeneration forceFeedbackGenerationAtStart:(BOOL)forceFeedbackAtStart completion:(void(^)(void))completion
@@ -726,26 +646,20 @@ - (void)_transitionToState:(LNPopupPresentationState)state notifyDelegate:(BOOL)
 	if(userView != nil)
 	{
 		animationDuration *= 1.25;
+//		animationDuration = 4;
 	}
 
 	_runningPopupAnimation = [[UIViewPropertyAnimator alloc] initWithDuration:animationDuration dampingRatio:spring && userView == nil ? 0.85 : 1.0 animations:nil];
+//	_runningPopupAnimation = [[UIViewPropertyAnimator alloc] initWithDuration:animationDuration curve:UIViewAnimationCurveLinear animations:nil];
 	_runningPopupAnimation.userInteractionEnabled = NO;
 
 	if(stateAtStart == LNPopupPresentationStateBarPresented && userView != nil)
 	{
 		[self animateOpenTransitionIfNeededWithAnimator:_runningPopupAnimation userTransitionView:userView otherAnimations:animationBlock];
-		
-		[_runningPopupAnimation addCompletion:^(UIViewAnimatingPosition finalPosition) {
-			[self completeOpenTransitionIfNeededWithUserTransitionView:userView];
-		}];
 	}
 	else if(state == LNPopupPresentationStateBarPresented && userView != nil)
 	{
 		[self animateCloseTransitionIfNeededWithAnimator:_runningPopupAnimation userTransitionView:userView otherAnimations:animationBlock];
-		
-		[_runningPopupAnimation addCompletion:^(UIViewAnimatingPosition finalPosition) {
-			[self completeCloseTransitionIfNeededWithUserTransitionView:userView];
-		}];
 	}
 	else
 	{

LNPopupController/LNPopupController/Private/LNPopupController.mm

@@ -0,0 +1,23 @@
+//
+//  LNPopupShadowedImageView+Private.h
+//  LNPopupController
+//
+//  Created by Léo Natan on 24/3/25.
+//  Copyright © 2025 Léo Natan. All rights reserved.
+//
+
+#import "LNPopupShadowedImageView.h"
+#import "LNPopupBar+Private.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface LNPopupShadowedImageView ()
+
+- (instancetype)initWithContainingPopupBar:(LNPopupBar*)popupBar;
+
+@property (nonatomic, strong, nullable) NSNumber* transitionCornerRadius;
+@property (nonatomic, copy, nullable) NSShadow* transitionShadow;
+
+@end
+
+NS_ASSUME_NONNULL_END