From ecd9d30f576fb424bef298b10e3baba4c79238bd Mon Sep 17 00:00:00 2001 From: WillJonesMagic Date: Wed, 14 Sep 2016 16:53:48 +0100 Subject: [PATCH 1/2] Update WLActivityViewController.m --- .../WLActivityViewController.m | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/WLActivityViewController/WLActivityViewController.m b/WLActivityViewController/WLActivityViewController.m index bef8da1..e3959d5 100644 --- a/WLActivityViewController/WLActivityViewController.m +++ b/WLActivityViewController/WLActivityViewController.m @@ -183,18 +183,36 @@ - (void)showTitleView:(BOOL)animated { } _titleView.title = self.title; _titleView.translatesAutoresizingMaskIntoConstraints = NO; - [containerView addSubview:_titleView]; + if ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){.majorVersion = 10}]) { + [contentView setContentInset:UIEdgeInsetsMake(50, 0, 0, 0)]; + [contentView addSubview:_titleView]; + } + else + { + [containerView addSubview:_titleView]; + } NSDictionary *viewDict = NSDictionaryOfVariableBindings(_titleView, contentView); [containerView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"|[_titleView]|" options:kNilOptions metrics:nil views:viewDict]]; if (self.popoverPresentationController != nil && self.popoverPresentationController.arrowDirection == UIPopoverArrowDirectionUp) { - [containerView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[contentView]-[_titleView]" options:kNilOptions metrics:nil views:viewDict]]; + if ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){.majorVersion = 10}]) + [contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[contentView]-[_titleView]" options:kNilOptions metrics:nil views:viewDict]]; + else + [containerView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[contentView]-[_titleView]" options:kNilOptions metrics:nil views:viewDict]]; } else { - [containerView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[_titleView]-[contentView]" options:kNilOptions metrics:nil views:viewDict]]; + if ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){.majorVersion = 10}]) + [contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[_titleView]-[contentView]" options:kNilOptions metrics:nil views:viewDict]]; + else + [containerView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[_titleView]-[contentView]" options:kNilOptions metrics:nil views:viewDict]]; + } + if ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){.majorVersion = 10}]) + [contentView addConstraint:[NSLayoutConstraint constraintWithItem:_titleView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:contentView attribute:NSLayoutAttributeWidth multiplier:1 constant:0]]; + else + [containerView addConstraint:[NSLayoutConstraint constraintWithItem:_titleView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:contentView attribute:NSLayoutAttributeWidth multiplier:1 constant:0]]; + if (![[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){.majorVersion = 10}]) + { + [transitionView addConstraint:[NSLayoutConstraint constraintWithItem:_titleView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:transitionView attribute:NSLayoutAttributeTop multiplier:1 constant:20]]; + [transitionView addConstraint:[NSLayoutConstraint constraintWithItem:_titleView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationLessThanOrEqual toItem:transitionView attribute:NSLayoutAttributeBottom multiplier:1 constant:-20]]; } - [containerView addConstraint:[NSLayoutConstraint constraintWithItem:_titleView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:contentView attribute:NSLayoutAttributeWidth multiplier:1 constant:0]]; - [transitionView addConstraint:[NSLayoutConstraint constraintWithItem:_titleView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:transitionView attribute:NSLayoutAttributeTop multiplier:1 constant:20]]; - [transitionView addConstraint:[NSLayoutConstraint constraintWithItem:_titleView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationLessThanOrEqual toItem:transitionView attribute:NSLayoutAttributeBottom multiplier:1 constant:-20]]; - if (animated) { _titleView.alpha = 0; [UIView animateWithDuration:0.3 animations:^{ @@ -207,6 +225,8 @@ - (void)showTitleView:(BOOL)animated { } - (void)hideTitleView:(BOOL)animated { + if ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){.majorVersion = 10}]) + [((UICollectionView*)_titleView.superview) setContentInset:UIEdgeInsetsZero]; [_titleView removeFromSuperview]; _titleView = nil; From d2896c8fba7391a72380f60a1682b06068bc9063 Mon Sep 17 00:00:00 2001 From: Will Jones Date: Thu, 15 Sep 2016 11:21:56 +0100 Subject: [PATCH 2/2] Update WLActivityViewController.m Missed a cast. --- WLActivityViewController/WLActivityViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WLActivityViewController/WLActivityViewController.m b/WLActivityViewController/WLActivityViewController.m index e3959d5..1153e35 100644 --- a/WLActivityViewController/WLActivityViewController.m +++ b/WLActivityViewController/WLActivityViewController.m @@ -184,7 +184,7 @@ - (void)showTitleView:(BOOL)animated { _titleView.title = self.title; _titleView.translatesAutoresizingMaskIntoConstraints = NO; if ([[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){.majorVersion = 10}]) { - [contentView setContentInset:UIEdgeInsetsMake(50, 0, 0, 0)]; + [((UICollectionView*) contentView) setContentInset:UIEdgeInsetsMake(50, 0, 0, 0)]; [contentView addSubview:_titleView]; } else