diff --git a/FilterLayer/Assets.xcassets/AppIcon.appiconset/Contents.json b/FilterLayer/Assets.xcassets/AppIcon.appiconset/Contents.json index eeea76c..d8db8d6 100644 --- a/FilterLayer/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/FilterLayer/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "29x29", @@ -30,6 +40,16 @@ "size" : "60x60", "scale" : "3x" }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, { "idiom" : "ipad", "size" : "29x29", @@ -64,6 +84,11 @@ "idiom" : "ipad", "size" : "83.5x83.5", "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { diff --git a/FilterLayer/BKFilter/BKFilterView.swift b/FilterLayer/BKFilter/BKFilterView.swift index 5880034..b30259d 100644 --- a/FilterLayer/BKFilter/BKFilterView.swift +++ b/FilterLayer/BKFilter/BKFilterView.swift @@ -106,12 +106,12 @@ class BKFilterView: UIView { //MARK:- Control functions - internal func setExcludedViews(views: [UIView]?) + func setExcludedViews(views: [UIView]?) { presetExcludedViews = views } - internal func revealCircular(duration: CFTimeInterval = 0.3, completion: (() -> Void)?) + func revealCircular(duration: CFTimeInterval = 0.3, completion: (() -> Void)?) { self.isUserInteractionEnabled = false @@ -149,7 +149,7 @@ class BKFilterView: UIView { CATransaction.commit() } - internal func hideCircular(duration: CFTimeInterval = 0.3, completion: (() -> Void)?) + func hideCircular(duration: CFTimeInterval = 0.3, completion: (() -> Void)?) { self.isUserInteractionEnabled = false diff --git a/FilterLayer/FilterDemonstationViewController.swift b/FilterLayer/FilterDemonstationViewController.swift index f95ef7b..f5dfd45 100644 --- a/FilterLayer/FilterDemonstationViewController.swift +++ b/FilterLayer/FilterDemonstationViewController.swift @@ -54,7 +54,7 @@ class FilterDemonstationViewController: UIViewController, BKFilterViewDelegate { //MARK:- Control functions - internal func setFiltertype(type: BKFilterType) { + func setFiltertype(type: BKFilterType) { self.title = type.rawValue filterType = type @@ -67,7 +67,7 @@ class FilterDemonstationViewController: UIViewController, BKFilterViewDelegate { filterView.autoresizingMask = [UIView.AutoresizingMask.flexibleLeftMargin, .flexibleRightMargin, .flexibleTopMargin ,.flexibleBottomMargin] self.view.addSubview(filterView) - let gesture = UIPanGestureRecognizer(target: self, action: Selector(("viewDragged:"))) + let gesture = UIPanGestureRecognizer(target: self, action: #selector((viewDragged(gesture:)))) gesture.cancelsTouchesInView = false filterView.addGestureRecognizer(gesture) @@ -78,12 +78,12 @@ class FilterDemonstationViewController: UIViewController, BKFilterViewDelegate { //MARK:- BKFilterViewDelegate - internal func exculdedViews() -> [UIView]? + func exculdedViews() -> [UIView]? { return nil } - internal func manipulateFilterContext( context: inout CGContext, rect: CGRect) { + func manipulateFilterContext( context: inout CGContext, rect: CGRect) { var filterValues = [String: AnyObject?]() let centerVector = CIVector(x: rect.size.width*1.5, y: rect.size.height*1.5) @@ -109,7 +109,7 @@ class FilterDemonstationViewController: UIViewController, BKFilterViewDelegate { //MARK:- Private functions - internal func viewDragged(gesture: UIPanGestureRecognizer) + @objc func viewDragged(gesture: UIPanGestureRecognizer) { let filterView = gesture.view as! BKFilterView let translation = gesture.translation(in: filterView) as CGPoint @@ -146,7 +146,7 @@ class FilterDemonstationViewController: UIViewController, BKFilterViewDelegate { //MARK:- Button actions - @objc internal func leftMenuButtonAction(button: UIButton) + @objc func leftMenuButtonAction(button: UIButton) { self.navigationController?.dismiss(animated: true, completion: { () -> Void in })