diff --git a/MAF/MAF/Images.xcassets/buttons/btn_close_gray_up.imageset/Contents.json b/MAF/MAF/Images.xcassets/buttons/btn_close_gray_up.imageset/Contents.json new file mode 100644 index 0000000..8865f68 --- /dev/null +++ b/MAF/MAF/Images.xcassets/buttons/btn_close_gray_up.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x", + "filename" : "btn_close_gray_up.png" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "btn_close_gray_up@2x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/MAF/MAF/Images.xcassets/buttons/btn_close_gray_up.imageset/btn_close_gray_up.png b/MAF/MAF/Images.xcassets/buttons/btn_close_gray_up.imageset/btn_close_gray_up.png new file mode 100644 index 0000000..1d87f38 Binary files /dev/null and b/MAF/MAF/Images.xcassets/buttons/btn_close_gray_up.imageset/btn_close_gray_up.png differ diff --git a/MAF/MAF/Images.xcassets/buttons/btn_close_gray_up.imageset/btn_close_gray_up@2x.png b/MAF/MAF/Images.xcassets/buttons/btn_close_gray_up.imageset/btn_close_gray_up@2x.png new file mode 100644 index 0000000..1e4a5fc Binary files /dev/null and b/MAF/MAF/Images.xcassets/buttons/btn_close_gray_up.imageset/btn_close_gray_up@2x.png differ diff --git a/MAF/MAF/PostDetailViewController.m b/MAF/MAF/PostDetailViewController.m index 93e918a..cb4b1a8 100644 --- a/MAF/MAF/PostDetailViewController.m +++ b/MAF/MAF/PostDetailViewController.m @@ -19,6 +19,9 @@ @interface PostDetailViewController () - + - + - + + - + + + @@ -101,6 +109,6 @@ - + diff --git a/MAF/MAF/PresentingAnimator.m b/MAF/MAF/PresentingAnimator.m index 6bdd23a..6843719 100644 --- a/MAF/MAF/PresentingAnimator.m +++ b/MAF/MAF/PresentingAnimator.m @@ -24,15 +24,16 @@ - (void)animateTransition:(id )transitionC fromView.userInteractionEnabled = NO; UIView *dimmingView = [[UIView alloc] initWithFrame:fromView.bounds]; - dimmingView.backgroundColor = [UIColor customGrayColor]; + dimmingView.backgroundColor = [UIColor blackColor]; dimmingView.layer.opacity = 0.0; UIView *toView = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey].view; - CGFloat sizeReductionRatio = (float)3/7; + CGFloat heightRatio = (float)4/7; +// CGFloat widthRatio = (float)6/7; toView.frame = CGRectMake(0, 0, CGRectGetWidth(transitionContext.containerView.bounds), - sizeReductionRatio*CGRectGetHeight(transitionContext.containerView.bounds)); + heightRatio*CGRectGetHeight(transitionContext.containerView.bounds)); toView.center = CGPointMake(transitionContext.containerView.center.x, -transitionContext.containerView.center.y); [transitionContext.containerView addSubview:dimmingView];