Support SwiftUI/LNPopupUI popup bar images for crossfade

LeoNatan · LeoNatan · commit 9ce0c9821f99 · 2025-04-02T08:06:18.000+03:00
Improve `LNPopupImageView` content mode support
diff --git a/LNPopupController/LNPopupController/Private/LNPopupImageView.mm b/LNPopupController/LNPopupController/Private/LNPopupImageView.mm
@@ -54,6 +54,37 @@ - (void)setContents:(id)contents
 	[_imageContentsLayer setContents:contents];
 }
 
+- (void)setContentsRect:(CGRect)contentsRect
+{
+	[_imageContentsLayer setContentsRect:contentsRect];
+}
+
+- (void)setContentsScale:(CGFloat)contentsScale
+{
+	[_imageContentsLayer setContentsScale:contentsScale];
+}
+
+- (void)setContentsCenter:(CGRect)contentsCenter
+{
+	[_imageContentsLayer setContentsCenter:contentsCenter];
+}
+
+- (void)setContentsFormat:(CALayerContentsFormat)contentsFormat
+{
+	[_imageContentsLayer setContentsFormat:contentsFormat];
+}
+
+- (void)setContentsGravity:(CALayerContentsGravity)contentsGravity
+{
+	[_imageContentsLayer setContentsGravity:contentsGravity];
+}
+
+- (void)setWantsExtendedDynamicRangeContent:(BOOL)wantsExtendedDynamicRangeContent
+{
+	[super setWantsExtendedDynamicRangeContent:wantsExtendedDynamicRangeContent];
+	[_imageContentsLayer setWantsExtendedDynamicRangeContent:wantsExtendedDynamicRangeContent];
+}
+
 - (void)setImageContentsLayer:(CALayer*)layer
 {
 	_imageContentsLayer = layer;
diff --git a/LNPopupController/LNPopupController/Private/_LNPopupTransitionAnimator.h b/LNPopupController/LNPopupController/Private/_LNPopupTransitionAnimator.h
@@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, readonly) LNPopupContentView* popupContentView;
 
 @property (nonatomic, strong, readonly, nullable) _LNPopupTransitionView* transitionView;
-@property (nonatomic, strong, readonly, nullable) UIImageView* crossfadeImageView;
+@property (nonatomic, strong, readonly, nullable) UIView<LNPopupTransitionView>* crossfadeView;
 @property (nonatomic, readonly) CGRect sourceFrame;
 @property (nonatomic, readonly) CGRect targetFrame;
 @property (nonatomic, readonly) CGAffineTransform transform;
diff --git a/LNPopupController/LNPopupController/Private/_LNPopupTransitionAnimator.mm b/LNPopupController/LNPopupController/Private/_LNPopupTransitionAnimator.mm
@@ -7,6 +7,7 @@
 //
 
 #import "_LNPopupTransitionAnimator.h"
+#import "LNPopupBar+Private.h"
 #import <LNPopupController/UIViewController+LNPopupSupport.h>
 #import <objc/runtime.h>
 
@@ -43,18 +44,35 @@ - (void)animateWithAnimator:(UIViewPropertyAnimator *)animator otherAnimations:(
 			_transitionView = [[_LNPopupTransitionView alloc] initWithSourceView:self.view];
 		}
 		
-		_crossfadeImageView = [[UIImageView alloc] initWithImage:self.popupBar.imageView.image];
-		_crossfadeImageView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-		_crossfadeImageView.contentMode = self.popupBar.imageView.contentMode;
-		_crossfadeImageView.frame = _transitionView.bounds;
-		_crossfadeImageView.layer.masksToBounds = YES;
-		[_transitionView addSubview:_crossfadeImageView];
+		UIImage* image;
+		if(self.popupBar.swiftuiImageController != nil)
+		{
+			id contents = self.popupBar.swiftuiImageController.view.subviews.firstObject.layer.contents;
+			if(contents != nil && CFGetTypeID((__bridge CFTypeRef)contents) == CGImageGetTypeID())
+			{
+				image = [[UIImage alloc] initWithCGImage:(__bridge CGImageRef)contents];
+			}
+			else
+			{
+				image = [[[UIGraphicsImageRenderer alloc] initWithSize:self.popupBar.imageView.bounds.size] imageWithActions:^(UIGraphicsImageRendererContext * _Nonnull rendererContext) {
+					[self.popupBar.imageView drawViewHierarchyInRect:self.popupBar.imageView.bounds afterScreenUpdates:NO];
+				}];
+			}
+		}
+		else
+		{
+			image = self.popupBar.imageView.image;
+		}
+		
+		_crossfadeView = [[LNPopupImageView alloc] initWithImage:image];
+		_crossfadeView.contentMode = self.popupBar.imageView.contentMode;
+		_crossfadeView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+		_crossfadeView.frame = _transitionView.bounds;
+		[_transitionView addSubview:_crossfadeView];
 		
 		_transitionView.frame = self.sourceFrame;
 		[self beforeAnyAnimation];
 		
-		_crossfadeImageView.layer.cornerCurve = kCACornerCurveContinuous;
-		
 		objc_setAssociatedObject(self.transitionView.sourceView, _LNPopupOpenCloseTransitionViewKey, _transitionView, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 	}];
 	
diff --git a/LNPopupController/LNPopupController/Private/_LNPopupTransitionCloseAnimator.m b/LNPopupController/LNPopupController/Private/_LNPopupTransitionCloseAnimator.m
@@ -36,7 +36,14 @@ - (CGRect)targetFrame
 
 - (CGFloat)scaledBarImageViewCornerRadius
 {
-	return self.popupBar.imageView.cornerRadius * self.sourceFrame.size.width / self.popupBar.imageView.bounds.size.width;
+	if(self.sourceFrame.size.width > self.sourceFrame.size.height)
+	{
+		return self.popupBar.imageView.cornerRadius * self.sourceFrame.size.width / self.popupBar.imageView.bounds.size.width;
+	}
+	else
+	{
+		return self.popupBar.imageView.cornerRadius * self.sourceFrame.size.height / self.popupBar.imageView.bounds.size.height;
+	}
 }
 
 - (NSShadow *)scaledBarImageViewShadow
@@ -55,15 +62,15 @@ - (void)beforeAnyAnimation
 {
 	[super beforeAnyAnimation];
 	
-	self.crossfadeImageView.alpha = 0.0;
-	self.crossfadeImageView.layer.cornerRadius = self.transitionView.cornerRadius;
+	self.crossfadeView.alpha = 0.0;
+	self.crossfadeView.cornerRadius = self.transitionView.cornerRadius;
 }
 
 - (void)performAdditionalAnimations
 {
 	[self.transitionView setTargetFrameUpdatingTransform:self.targetFrame];
 	
-	self.crossfadeImageView.layer.cornerRadius = self.popupBar.imageView.cornerRadius;
+	self.crossfadeView.cornerRadius = self.popupBar.imageView.cornerRadius;
 	
 	[super performAdditionalAnimations];
 }
@@ -84,7 +91,7 @@ - (void)performAdditionalDelayed015Animations
 		}
 	}
 	
-	self.crossfadeImageView.alpha = 1.0;
+	self.crossfadeView.alpha = 1.0;
 }
 
 - (void)performAdditionalCompletion
diff --git a/LNPopupController/LNPopupController/Private/_LNPopupTransitionGenericOpenAnimator.m b/LNPopupController/LNPopupController/Private/_LNPopupTransitionGenericOpenAnimator.m
@@ -18,16 +18,18 @@ - (void)beforeAnyAnimation
 	[super beforeAnyAnimation];
 	
 	self.transitionView.shadow = self.popupBar.imageView.shadow.copy;
+	self.transitionView.cornerRadius = self.scaledBarImageViewCornerRadius;
 	
 	_targetShadow = [self.transitionView.shadow copy];
 	_targetShadow.shadowColor = [_targetShadow.shadowColor colorWithAlphaComponent:0.0];
 }
 
 - (void)performAdditionalAnimations
 {
-	self.transitionView.shadow = _targetShadow;
-	
 	[super performAdditionalAnimations];
+	
+	self.transitionView.shadow = _targetShadow;
+	self.transitionView.cornerRadius = 0.000001;
 }
 
 @end
diff --git a/LNPopupController/LNPopupController/Private/_LNPopupTransitionOpenAnimator.m b/LNPopupController/LNPopupController/Private/_LNPopupTransitionOpenAnimator.m
@@ -49,8 +49,8 @@ - (void)beforeAnyAnimation
 {
 	[super beforeAnyAnimation];
 	
-	self.crossfadeImageView.alpha = 1.0;
-	self.crossfadeImageView.layer.cornerRadius = self.popupBar.imageView.cornerRadius;
+	self.crossfadeView.alpha = 1.0;
+	self.crossfadeView.cornerRadius = self.popupBar.imageView.cornerRadius;
 }
 
 - (void)performBeforeAdditionalAnimations
@@ -66,14 +66,14 @@ - (void)performAdditionalAnimations
 	
 	self.transitionView.frame = self.targetFrame;
 	self.transitionView.sourceViewTransform = CGAffineTransformIdentity;
+	self.crossfadeView.cornerRadius = self.transitionView.cornerRadius;
 }
 
 - (void)performAdditional01Animations
 {
 	[super performAdditional01Animations];
 	
-	self.crossfadeImageView.alpha = 0.0;
-	self.crossfadeImageView.layer.cornerRadius = self.transitionView.cornerRadius;
+	self.crossfadeView.alpha = 0.0;
 }
 
 @end
diff --git a/LNPopupController/LNPopupController/Private/_LNPopupTransitionPreferredCloseAnimator.mm b/LNPopupController/LNPopupController/Private/_LNPopupTransitionPreferredCloseAnimator.mm
@@ -40,14 +40,15 @@ - (void)beforeAnyAnimation
 		_originalShadow = nil;
 	}
 	
-	self.crossfadeImageView.layer.cornerRadius = self.view.cornerRadius;
+	self.crossfadeView.cornerRadius = self.view.cornerRadius;
 }
 
 - (void)performAdditionalAnimations
 {
 	[super performAdditionalAnimations];
 	
 	self.view.cornerRadius = self.scaledBarImageViewCornerRadius;
+	self.crossfadeView.cornerRadius = self.popupBar.imageView.cornerRadius;
 	if(_supportsShadow)
 	{
 		self.view.shadow = self.scaledBarImageViewShadow;
diff --git a/LNPopupController/LNPopupController/Private/_LNPopupTransitionPreferredOpenAnimator.mm b/LNPopupController/LNPopupController/Private/_LNPopupTransitionPreferredOpenAnimator.mm
@@ -67,7 +67,7 @@ - (void)performAdditionalAnimations
 		self.transitionView.shadow = _originalShadow;
 	}
 	
-	self.crossfadeImageView.layer.cornerRadius = self.view.cornerRadius;
+	self.crossfadeView.cornerRadius = self.view.cornerRadius;
 }
 
 @end
diff --git a/LNPopupController/LNPopupController/Private/_LNPopupTransitionView.h b/LNPopupController/LNPopupController/Private/_LNPopupTransitionView.h
@@ -7,10 +7,11 @@
 //
 
 #import <UIKit/UIKit.h>
+#import <LNPopupController/UIViewController+LNPopupSupport.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface _LNPopupTransitionView : UIView
+@interface _LNPopupTransitionView : UIView <LNPopupTransitionView>
 
 + (instancetype)transitionViewWithSourceView:(UIView*)sourceView;
 
@@ -20,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong, readonly) UIView* sourceView;
 
-@property (nonatomic, strong) NSShadow* shadow;
+@property (nonatomic, copy) NSShadow* shadow;
 @property (nonatomic, assign) CGFloat cornerRadius;
 @property (nonatomic, assign) BOOL layerAlwaysMasksToBounds;
 
diff --git a/LNPopupController/LNPopupController/Private/_LNPopupTransitionView.mm b/LNPopupController/LNPopupController/Private/_LNPopupTransitionView.mm
@@ -33,7 +33,7 @@ - (instancetype)initWithSourceView:(UIView*)sourceView
 		[_portalView setValue:sourceView forKey:LNPopupHiddenString("sourceView")];
 		[_portalView setValue:@YES forKey:LNPopupHiddenString("hidesSourceView")];
 		[_portalView setValue:@YES forKey:LNPopupHiddenString("matchesTransform")];
-		_portalView.layer.contentsGravity = kCAGravityCenter;
+		_portalView.layer.contentsGravity = kCAGravityResize;
 		
 		_radiusContainerView = [[UIView alloc] initWithFrame:CGRectZero];
 		_radiusContainerView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
diff --git a/LNPopupSettings b/LNPopupSettings
@@ -1 +1 @@
-Subproject commit 182231db52a8fd3b099985e2c2ed3693fcee76f9
+Subproject commit 77b6e65d1e57874ec1550b967412d5c2557a6bbd

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,14 @@ - (CGRect)targetFrame`
`36`	`36`
`37`	`37`	`- (CGFloat)scaledBarImageViewCornerRadius`
`38`	`38`	`{`
`39`		`- return self.popupBar.imageView.cornerRadius * self.sourceFrame.size.width / self.popupBar.imageView.bounds.size.width;`
	`39`	`+ if(self.sourceFrame.size.width > self.sourceFrame.size.height)`
	`40`	`+ {`
	`41`	`+ return self.popupBar.imageView.cornerRadius * self.sourceFrame.size.width / self.popupBar.imageView.bounds.size.width;`
	`42`	`+ }`
	`43`	`+ else`
	`44`	`+ {`
	`45`	`+ return self.popupBar.imageView.cornerRadius * self.sourceFrame.size.height / self.popupBar.imageView.bounds.size.height;`
	`46`	`+ }`
`40`	`47`	`}`
`41`	`48`
`42`	`49`	`- (NSShadow *)scaledBarImageViewShadow`
`@@ -55,15 +62,15 @@ - (void)beforeAnyAnimation`
`55`	`62`	`{`
`56`	`63`	`[super beforeAnyAnimation];`
`57`	`64`
`58`		`- self.crossfadeImageView.alpha = 0.0;`
`59`		`- self.crossfadeImageView.layer.cornerRadius = self.transitionView.cornerRadius;`
	`65`	`+ self.crossfadeView.alpha = 0.0;`
	`66`	`+ self.crossfadeView.cornerRadius = self.transitionView.cornerRadius;`
`60`	`67`	`}`
`61`	`68`
`62`	`69`	`- (void)performAdditionalAnimations`
`63`	`70`	`{`
`64`	`71`	`[self.transitionView setTargetFrameUpdatingTransform:self.targetFrame];`
`65`	`72`
`66`		`- self.crossfadeImageView.layer.cornerRadius = self.popupBar.imageView.cornerRadius;`
	`73`	`+ self.crossfadeView.cornerRadius = self.popupBar.imageView.cornerRadius;`
`67`	`74`
`68`	`75`	`[super performAdditionalAnimations];`
`69`	`76`	`}`
`@@ -84,7 +91,7 @@ - (void)performAdditionalDelayed015Animations`
`84`	`91`	`}`
`85`	`92`	`}`
`86`	`93`
`87`		`- self.crossfadeImageView.alpha = 1.0;`
	`94`	`+ self.crossfadeView.alpha = 1.0;`
`88`	`95`	`}`
`89`	`96`
`90`	`97`	`- (void)performAdditionalCompletion`
Original file line number	Diff line number	Diff line change
`@@ -18,16 +18,18 @@ - (void)beforeAnyAnimation`
`18`	`18`	`[super beforeAnyAnimation];`
`19`	`19`
`20`	`20`	`self.transitionView.shadow = self.popupBar.imageView.shadow.copy;`
	`21`	`+ self.transitionView.cornerRadius = self.scaledBarImageViewCornerRadius;`
`21`	`22`
`22`	`23`	`_targetShadow = [self.transitionView.shadow copy];`
`23`	`24`	`_targetShadow.shadowColor = [_targetShadow.shadowColor colorWithAlphaComponent:0.0];`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`- (void)performAdditionalAnimations`
`27`	`28`	`{`
`28`		`- self.transitionView.shadow = _targetShadow;`
`29`		`-`
`30`	`29`	`[super performAdditionalAnimations];`
	`30`	`+`
	`31`	`+ self.transitionView.shadow = _targetShadow;`
	`32`	`+ self.transitionView.cornerRadius = 0.000001;`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ - (void)beforeAnyAnimation`
`49`	`49`	`{`
`50`	`50`	`[super beforeAnyAnimation];`
`51`	`51`
`52`		`- self.crossfadeImageView.alpha = 1.0;`
`53`		`- self.crossfadeImageView.layer.cornerRadius = self.popupBar.imageView.cornerRadius;`
	`52`	`+ self.crossfadeView.alpha = 1.0;`
	`53`	`+ self.crossfadeView.cornerRadius = self.popupBar.imageView.cornerRadius;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`- (void)performBeforeAdditionalAnimations`
`@@ -66,14 +66,14 @@ - (void)performAdditionalAnimations`
`66`	`66`
`67`	`67`	`self.transitionView.frame = self.targetFrame;`
`68`	`68`	`self.transitionView.sourceViewTransform = CGAffineTransformIdentity;`
	`69`	`+ self.crossfadeView.cornerRadius = self.transitionView.cornerRadius;`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`- (void)performAdditional01Animations`
`72`	`73`	`{`
`73`	`74`	`[super performAdditional01Animations];`
`74`	`75`
`75`		`- self.crossfadeImageView.alpha = 0.0;`
`76`		`- self.crossfadeImageView.layer.cornerRadius = self.transitionView.cornerRadius;`
	`76`	`+ self.crossfadeView.alpha = 0.0;`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,15 @@ - (void)beforeAnyAnimation`
`40`	`40`	`_originalShadow = nil;`
`41`	`41`	`}`
`42`	`42`
`43`		`- self.crossfadeImageView.layer.cornerRadius = self.view.cornerRadius;`
	`43`	`+ self.crossfadeView.cornerRadius = self.view.cornerRadius;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`- (void)performAdditionalAnimations`
`47`	`47`	`{`
`48`	`48`	`[super performAdditionalAnimations];`
`49`	`49`
`50`	`50`	`self.view.cornerRadius = self.scaledBarImageViewCornerRadius;`
	`51`	`+ self.crossfadeView.cornerRadius = self.popupBar.imageView.cornerRadius;`
`51`	`52`	`if(_supportsShadow)`
`52`	`53`	`{`
`53`	`54`	`self.view.shadow = self.scaledBarImageViewShadow;`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ - (void)performAdditionalAnimations`
`67`	`67`	`self.transitionView.shadow = _originalShadow;`
`68`	`68`	`}`
`69`	`69`
`70`		`- self.crossfadeImageView.layer.cornerRadius = self.view.cornerRadius;`
	`70`	`+ self.crossfadeView.cornerRadius = self.view.cornerRadius;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`@end`