feat: add shadow config for present content view

HeathWang · Oct 24, 2019 · d71cd23 · d71cd23
1 parent 6eddb2f
commit d71cd23
Show file tree

Hide file tree

Showing 17 changed files with 105 additions and 28 deletions.
diff --git a/Demo/PanControllerExample/Base/HWBaseViewController.m b/Demo/PanControllerExample/Base/HWBaseViewController.m
@@ -44,6 +44,10 @@ - (BOOL)anchorModalToLongForm {
     return NO;
 }
 
+- (HWPanModalShadow)contentShadow {
+    return PanModalShadowMake([UIColor yellowColor], 10, CGSizeMake(0, 2), 1);
+}
+
 - (UIViewAnimationOptions)transitionAnimationOptions {
     return UIViewAnimationOptionCurveLinear;
 }

diff --git a/Demo/PanControllerExample/Base/HWGroupViewController.m b/Demo/PanControllerExample/Base/HWGroupViewController.m
@@ -75,6 +75,10 @@ - (UIScrollView *)panScrollable {
     return self.tableView;
 }
 
+- (BOOL)showsScrollableVerticalScrollIndicator {
+    return NO;
+}
+
 #pragma mark - Getter
 
 - (NSArray<UIColor *> *)colors {

diff --git a/Demo/PanControllerExample/TestViewPanModal/HWSimplePanModalView.m b/Demo/PanControllerExample/TestViewPanModal/HWSimplePanModalView.m
@@ -80,6 +80,10 @@ - (PanModalHeight)shortFormHeight {
     return PanModalHeightMake(PanModalHeightTypeContent, 200);
 }
 
+- (CGFloat)topOffset {
+    return [UIApplication sharedApplication].keyWindow.rootViewController.topLayoutGuide.length + 21;
+}
+
 - (BOOL)shouldRoundTopCorners {
     return YES;
 }

diff --git a/HWPanModal.podspec b/HWPanModal.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'HWPanModal'
-  s.version          = '0.6.0'
+  s.version          = '0.6.1'
   s.summary          = 'HWPanModal is used to present controller and drag to dismiss.'
 
 # This description is used to generate tags and improve search results.

diff --git a/HWPanModal.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/HWPanModal.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -3,6 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>BuildSystemType</key>
-	<string>Latest</string>
+	<string>Original</string>
+	<key>PreviewsEnabled</key>
+	<false/>
 </dict>
 </plist>
diff --git a/Sources/Animator/HWPanModalPresentationAnimator.m b/Sources/Animator/HWPanModalPresentationAnimator.m
@@ -141,9 +141,20 @@ - (void)animateDismissal:(id<UIViewControllerContextTransitioning>)context {
             [context completeTransition:finished];
 		}];
 	} else {
+
+        CGFloat offsetY = 0;
+        HWPanModalShadow shadowConfig = [presentable contentShadow];
+        if (shadowConfig.shadowColor) {
+            // we should make the panView move further to hide the shadow effect.
+            offsetY = offsetY + shadowConfig.shadowRadius + shadowConfig.shadowOffset.height;
+            if ([presentable showDragIndicator]) {
+                offsetY += [presentable customIndicatorView] ? [presentable customIndicatorView].indicatorSize.height : 13;
+            }
+        }
+
 		[HWPanModalAnimator animate:^{
 			[self dismissAnimationForPresentingVC:presentable];
-			panView.hw_top = context.containerView.frame.size.height;
+			panView.hw_top = (context.containerView.frame.size.height + offsetY);
 		} config:presentable completion:^(BOOL completion) {
 			[fromVC.view removeFromSuperview];
             [self endAppearanceTransitionForController:fromVC];

diff --git a/Sources/Controller/HWPanModalPresentationController.m b/Sources/Controller/HWPanModalPresentationController.m
@@ -228,6 +228,8 @@ - (void)layoutPresentedView:(UIView *)containerView {
 	if ([self.presentable showDragIndicator]) {
 		[self addDragIndicatorViewToView:self.panContainerView];
 	}
+
+    [self addShadowToContainerView];
 
 	[self setNeedsLayoutUpdate];
 	[self adjustPanContainerBackgroundColor];
@@ -268,6 +270,13 @@ - (void)addRoundedCornersToView:(UIView *)view {
 	view.layer.rasterizationScale = [UIScreen mainScreen].scale;
 }
 
+- (void)addShadowToContainerView {
+    HWPanModalShadow shadow = [[self presentable] contentShadow];
+    if (shadow.shadowColor) {
+        [self.panContainerView updateShadow:shadow.shadowColor shadowRadius:shadow.shadowRadius shadowOffset:shadow.shadowOffset shadowOpacity:shadow.shadowOpacity];
+    }
+}
+
 - (void)snapToYPos:(CGFloat)yPos {
 	[HWPanModalAnimator animate:^{
         self.isPresentedViewAnimating = YES;

diff --git a/Sources/Mediator/HWPanModalPresentableHandler.m b/Sources/Mediator/HWPanModalPresentableHandler.m
@@ -282,7 +282,7 @@ - (void)observeScrollable {
 */
 - (void)trackScrolling:(UIScrollView *)scrollView {
     self.scrollViewYOffset = MAX(scrollView.contentOffset.y, -(MAX(scrollView.contentInset.top, 0)));
-    scrollView.showsVerticalScrollIndicator = [[self presentable] showsScrollableHorizontalScrollIndicator];
+    scrollView.showsVerticalScrollIndicator = [[self presentable] showsScrollableVerticalScrollIndicator];
 }
 
 /**

diff --git a/Sources/Presentable/HWPanModalHeight.h b/Sources/Presentable/HWPanModalHeight.h
@@ -33,6 +33,24 @@ CG_INLINE PanModalHeight PanModalHeightMake(PanModalHeightType heightType, CGFlo
     return modalHeight;
 }
 
+struct HWPanModalShadow {
+    UIColor *shadowColor;
+    CGFloat shadowRadius;
+    CGSize shadowOffset;
+    float shadowOpacity;
+};
+
+typedef struct HWPanModalShadow HWPanModalShadow;
+
+CG_INLINE HWPanModalShadow PanModalShadowMake(UIColor *shadowColor, CGFloat shadowRadius, CGSize shadowOffset, float shadowOpacity) {
+    HWPanModalShadow shadowConfig;
+    shadowConfig.shadowColor = shadowColor;
+    shadowConfig.shadowRadius = shadowRadius;
+    shadowConfig.shadowOffset = shadowOffset;
+    shadowConfig.shadowOpacity = shadowOpacity;
+    return shadowConfig;
+}
+
 static inline BOOL HW_FLOAT_IS_ZERO(CGFloat value) {
     return (value > -FLT_EPSILON) && (value < FLT_EPSILON);
 }

diff --git a/Sources/Presentable/HWPanModalPresentable.h b/Sources/Presentable/HWPanModalPresentable.h
@@ -63,10 +63,10 @@ typedef NS_ENUM(NSInteger, PresentingViewControllerAnimationStyle) {
 - (UIEdgeInsets)scrollIndicatorInsets;
 
 /**
- * A Boolean value that controls whether the scrollable horizontal scroll indicator is visible.
+ * A Boolean value that controls whether the scrollable vertical scroll indicator is visible.
  * default is YES.
  */
-- (BOOL)showsScrollableHorizontalScrollIndicator;
+- (BOOL)showsScrollableVerticalScrollIndicator;
 
 /**
  * 是否允许拖动额外拖动，如果panScrollable存在，且scrollView contentSize > (size + bottomLayoutOffset),返回YES
@@ -244,6 +244,12 @@ typedef NS_ENUM(NSInteger, PresentingViewControllerAnimationStyle) {
  */
 - (CGFloat)cornerRadius;
 
+/**
+* presented content shadow
+* Default is None config
+*/
+- (HWPanModalShadow)contentShadow;
+
 #pragma mark - Indicator config
 
 /**

diff --git a/Sources/Presentable/UIViewController+PanModalDefault.m b/Sources/Presentable/UIViewController+PanModalDefault.m
@@ -64,7 +64,7 @@ - (UIEdgeInsets)scrollIndicatorInsets {
 	return UIEdgeInsetsMake(top, 0, self.bottomLayoutOffset, 0);
 }
 
-- (BOOL)showsScrollableHorizontalScrollIndicator {
+- (BOOL)showsScrollableVerticalScrollIndicator {
 	return YES;
 }
 
@@ -134,6 +134,10 @@ - (CGFloat)cornerRadius {
 	return 8;
 }
 
+- (HWPanModalShadow)contentShadow {
+    return PanModalShadowMake(nil, 0, CGSizeZero, 0);
+}
+
 - (BOOL)showDragIndicator {
     if ([self allowsTouchEventsPassingThroughTransitionView]) {
         return NO;

diff --git a/Sources/View/HWPanContainerView.h b/Sources/View/HWPanContainerView.h
@@ -15,6 +15,12 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, readonly) UIView *contentView;
 
 - (instancetype)initWithPresentedView:(UIView *)presentedView frame:(CGRect)frame;
+
+- (void)updateShadow:(UIColor *)shadowColor
+        shadowRadius:(CGFloat)shadowRadius
+        shadowOffset:(CGSize)shadowOffset
+       shadowOpacity:(float)shadowOpacity;
+
 @end
 
 @interface UIView (PanContainer)

diff --git a/Sources/View/HWPanContainerView.m b/Sources/View/HWPanContainerView.m
@@ -10,6 +10,7 @@
 @interface HWPanContainerView ()
 
 @property (nonatomic, strong) UIView *contentView;
+
 @end
 
 @implementation HWPanContainerView
@@ -18,15 +19,23 @@ - (instancetype)initWithPresentedView:(UIView *)presentedView frame:(CGRect)fram
 	self = [super initWithFrame:frame];
     if (self) {
     	_contentView = [UIView new];
+
     	_contentView.frame = self.bounds;
 		[self addSubview:_contentView];
-
 		[_contentView addSubview:presentedView];
     }
 
     return self;
 }
 
+- (void)updateShadow:(UIColor *)shadowColor shadowRadius:(CGFloat)shadowRadius shadowOffset:(CGSize)shadowOffset shadowOpacity:(float)shadowOpacity {
+
+    self.layer.shadowColor = shadowColor.CGColor;
+    self.layer.shadowRadius = shadowRadius;
+    self.layer.shadowOffset = shadowOffset;
+    self.layer.shadowOpacity = shadowOpacity;
+}
+
 @end
 
 @implementation UIView (PanContainer)

diff --git a/Sources/View/PanModal/HWPanModalContainerView.h b/Sources/View/PanModal/HWPanModalContainerView.h
@@ -16,6 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)initWithPresentingView:(UIView *)presentingView contentView:(HWPanModalContentView<HWPanModalPresentable> *)contentView;
 
+- (void)show;
+
 - (void)setNeedsLayoutUpdate;
 
 - (void)transitionToState:(PresentationState)state;

diff --git a/Sources/View/PanModal/HWPanModalContainerView.m b/Sources/View/PanModal/HWPanModalContainerView.m
@@ -43,15 +43,17 @@ - (instancetype)initWithPresentingView:(UIView *)presentingView contentView:(HWP
     if (self) {
         _presentingView = presentingView;
         _contentView = contentView;
-
-        [self prepare];
-        [self presentAnimationWillBegin];
-        [self beginPresentAnimation];
     }
 
     return self;
 }
 
+- (void)show {
+    [self prepare];
+    [self presentAnimationWillBegin];
+    [self beginPresentAnimation];
+}
+
 - (void)prepare {
     [self.presentingView addSubview:self];
     self.frame = self.presentingView.bounds;
@@ -290,20 +292,10 @@ - (void)dismiss:(BOOL)isInteractive mode:(PanModalInteractiveMode)mode {
 
     [[self presentable] panModalWillDismiss];
 
-    CGFloat indicatorHeight = 0;
-    if ([[self presentable] showDragIndicator]) {
-        indicatorHeight += kIndicatorYOffset;
-        if ([[self presentable] customIndicatorView]) {
-            UIView<HWPanModalIndicatorProtocol> *customIndicator = [[self presentable] customIndicatorView];
-            indicatorHeight += [customIndicator indicatorSize].height;
-        } else {
-            indicatorHeight += 13;
-        }
-    }
-
     [HWPanModalAnimator animate:^{
-        self.panContainerView.hw_top = CGRectGetHeight(self.bounds) + indicatorHeight;
+        self.panContainerView.hw_top = CGRectGetHeight(self.bounds);
         self.backgroundView.dimState = DimStateOff;
+        self.dragIndicatorView.alpha = 0;
     } config:[self presentable] completion:^(BOOL completion) {
         [self removeFromSuperview];
         [[self presentable] panModalDidDismissed];

diff --git a/Sources/View/PanModal/HWPanModalContentView.h b/Sources/View/PanModal/HWPanModalContentView.h
@@ -14,6 +14,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+/// when use `HWPanModalContentView`, you should take care of the safe area by yourself.
 @interface HWPanModalContentView : UIView <HWPanModalPresentable, HWPanModalPresentationUpdateProtocol, HWPanModalPresentableLayoutProtocol>
 
 /**

diff --git a/Sources/View/PanModal/HWPanModalContentView.m b/Sources/View/PanModal/HWPanModalContentView.m
@@ -23,6 +23,7 @@ - (void)presentInView:(UIView *)view {
         view = [UIApplication sharedApplication].keyWindow;
     }
     HWPanModalContainerView *containerView = [[HWPanModalContainerView alloc] initWithPresentingView:view contentView:self];
+    [containerView show];
 }
 
 #pragma mark - HWPanModalPresentationUpdateProtocol
@@ -95,7 +96,7 @@ - (UIEdgeInsets)scrollIndicatorInsets {
     return UIEdgeInsetsMake(top, 0, self.bottomLayoutOffset, 0);
 }
 
-- (BOOL)showsScrollableHorizontalScrollIndicator {
+- (BOOL)showsScrollableVerticalScrollIndicator {
     return YES;
 }
 
@@ -165,6 +166,10 @@ - (CGFloat)cornerRadius {
     return 8;
 }
 
+- (HWPanModalShadow)contentShadow {
+    return PanModalShadowMake(nil, 0, CGSizeZero, 0);
+}
+
 - (BOOL)showDragIndicator {
     if ([self allowsTouchEventsPassingThroughTransitionView]) {
         return NO;
@@ -219,11 +224,11 @@ - (void)panModalDidDismissed {
 #pragma mark - HWPanModalPresentableLayoutProtocol
 
 - (CGFloat)topLayoutOffset {
-    return [UIApplication sharedApplication].keyWindow.rootViewController.topLayoutGuide.length;
+    return 0;
 }
 
 - (CGFloat)bottomLayoutOffset {
-    return [UIApplication sharedApplication].keyWindow.rootViewController.bottomLayoutGuide.length;
+    return 0;
 }
 
 - (CGFloat)shortFormYPos {
@@ -271,7 +276,7 @@ - (HWPanModalContainerView *)containerView {
     UIView *fatherView = self.superview;
     while (fatherView) {
         if ([fatherView isKindOfClass:HWPanModalContainerView.class]) {
-            return (HWPanModalContentView *) fatherView;
+            return (HWPanModalContainerView *) fatherView;
         }
         fatherView = fatherView.superview;
     }