I made some changes
This commit is contained in:
Alexsander Khitev
parent
a6faf17120
commit
d96d70c791
|
|
@ -244,7 +244,7 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
public override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
|
||||
view.backgroundColor = UIColor.blackColor()
|
||||
view.backgroundColor = .blackColor()
|
||||
view.clipsToBounds = true
|
||||
view.opaque = false
|
||||
|
||||
|
|
@ -298,10 +298,10 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
|
||||
toolCounterLabel = UILabel(frame: CGRect(x: 0, y: 0, width: 95, height: 40))
|
||||
toolCounterLabel.textAlignment = .Center
|
||||
toolCounterLabel.backgroundColor = UIColor.clearColor()
|
||||
toolCounterLabel.backgroundColor = .clearColor()
|
||||
toolCounterLabel.font = UIFont(name: "Helvetica", size: 16.0)
|
||||
toolCounterLabel.textColor = UIColor.whiteColor()
|
||||
toolCounterLabel.shadowColor = UIColor.darkTextColor()
|
||||
toolCounterLabel.textColor = .whiteColor()
|
||||
toolCounterLabel.shadowColor = .darkTextColor()
|
||||
toolCounterLabel.shadowOffset = CGSize(width: 0.0, height: 1.0)
|
||||
|
||||
toolCounterButton = UIBarButtonItem(customView: toolCounterLabel)
|
||||
|
|
@ -503,7 +503,6 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
}
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), {
|
||||
|
||||
let page = self.pageDisplayingAtPhoto(photo)
|
||||
if page.photo == nil {
|
||||
return
|
||||
|
|
@ -591,7 +590,6 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
if !disableVerticalSwipe {
|
||||
view.addGestureRecognizer(panGesture)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public func prepareForClosePhotoBrowser() {
|
||||
|
|
@ -614,7 +612,6 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
if UIInterfaceOrientationIsLandscape(currentOrientation) {
|
||||
height = 32
|
||||
}
|
||||
|
||||
return CGRect(x: 0, y: view.bounds.size.height - height, width: view.bounds.size.width, height: height)
|
||||
}
|
||||
|
||||
|
|
@ -624,7 +621,6 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
if UIInterfaceOrientationIsLandscape(currentOrientation) {
|
||||
height = 32
|
||||
}
|
||||
|
||||
return CGRect(x: 0, y: view.bounds.size.height + height, width: view.bounds.size.width, height: height)
|
||||
}
|
||||
|
||||
|
|
@ -632,7 +628,6 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
let pageFrame = frameForPageAtIndex(index)
|
||||
let captionSize = captionView.sizeThatFits(CGSize(width: pageFrame.size.width, height: 0))
|
||||
let navHeight = navigationController?.navigationBar.frame.size.height ?? 44
|
||||
|
||||
return CGRect(x: pageFrame.origin.x, y: pageFrame.size.height - captionSize.height - navHeight,
|
||||
width: pageFrame.size.width, height: captionSize.height)
|
||||
}
|
||||
|
|
@ -737,13 +732,10 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
// gesture end
|
||||
if sender.state == .Ended {
|
||||
if scrollView.center.y > viewHalfHeight + minOffset || scrollView.center.y < viewHalfHeight - minOffset {
|
||||
|
||||
backgroundView.backgroundColor = self.view.backgroundColor
|
||||
determineAndClose()
|
||||
return
|
||||
|
||||
} else {
|
||||
|
||||
// Continue Showing View
|
||||
isDraggingPhoto = false
|
||||
setNeedsStatusBarAppearanceUpdate()
|
||||
|
|
@ -771,7 +763,6 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
backgroundView.alpha = 0
|
||||
|
||||
if let sender = delegate?.viewForPhoto?(self, index: initialPageIndex) ?? senderViewForAnimation {
|
||||
|
||||
senderViewOriginalFrame = (sender.superview?.convertRect(sender.frame, toView:nil))!
|
||||
sender.hidden = true
|
||||
|
||||
|
|
@ -831,10 +822,8 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
self.pagingScrollView.alpha = 1.0
|
||||
self.resizableImageView.alpha = 0.0
|
||||
})
|
||||
|
||||
} else {
|
||||
UIView.animateWithDuration(animationDuration, delay:0, usingSpringWithDamping:animationDamping, initialSpringVelocity:0, options:.CurveEaseInOut, animations: { () -> Void in
|
||||
|
||||
self.backgroundView.alpha = 1.0
|
||||
if self.displayCloseButton == true {
|
||||
self.closeButton.alpha = 1.0
|
||||
|
|
@ -924,7 +913,6 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
performCloseAnimationWithScrollView(scrollView)
|
||||
return
|
||||
} else if let sender = delegate?.viewForPhoto?(self, index: currentPageIndex), image = photoAtIndex(currentPageIndex).underlyingImage {
|
||||
|
||||
senderViewForAnimation = sender
|
||||
resizableImageView.image = image
|
||||
performCloseAnimationWithScrollView(scrollView)
|
||||
|
|
@ -932,7 +920,6 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
} else {
|
||||
dismissPhotoBrowser()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//MARK: - image
|
||||
|
|
@ -944,7 +931,6 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
return result
|
||||
}
|
||||
|
||||
|
||||
// MARK: - paging
|
||||
public func initializePageIndex(index: Int) {
|
||||
var i = index
|
||||
|
|
@ -1102,7 +1088,6 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
cancelControlHiding()
|
||||
// start
|
||||
controlVisibilityTimer = NSTimer.scheduledTimerWithTimeInterval(4.0, target: self, selector: #selector(SKPhotoBrowser.hideControls(_:)), userInfo: nil, repeats: false)
|
||||
|
||||
}
|
||||
|
||||
public func hideControls(timer: NSTimer) {
|
||||
|
|
@ -1143,8 +1128,8 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
self.customDeleteButton.alpha = alpha
|
||||
self.customDeleteButton.frame = hidden ? self.customDeleteButtonHideFrame : self.customDeleteButtonShowFrame
|
||||
}
|
||||
for v in captionViews {
|
||||
v.alpha = alpha
|
||||
for captionView in captionViews {
|
||||
captionView.alpha = alpha
|
||||
}
|
||||
},
|
||||
completion: { (Bool) -> Void in
|
||||
|
|
@ -1153,7 +1138,6 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
if !permanent {
|
||||
hideControlsAfterDelay()
|
||||
}
|
||||
|
||||
setNeedsStatusBarAppearanceUpdate()
|
||||
}
|
||||
|
||||
|
|
@ -1190,7 +1174,6 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
let popoverController = actionSheetController.popoverPresentationController!
|
||||
popoverController.barButtonItem = toolActionButton
|
||||
presentViewController(actionSheetController, animated: true, completion: { () -> Void in
|
||||
|
||||
})
|
||||
}
|
||||
} else {
|
||||
|
|
@ -1218,7 +1201,6 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// MARK: - UIScrollView Delegate
|
||||
|
|
|
|||
Loading…
Reference in New Issue