Merge branch 'develop'

kawoou · Jan 8, 2018 · f867b95 · f867b95
2 parents c876b2b + 4466e58
commit f867b95
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 30 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.1.1
+4.0
diff --git a/DrawerController/Animator/DrawerAnimator.swift b/DrawerController/Animator/DrawerAnimator.swift
@@ -48,13 +48,9 @@ open class DrawerAnimator {
 
  // MARK: - Public
 
- public func animate(duration: TimeInterval, animations: @escaping (Float)->(), completion: @escaping ((Bool)->())) {
-
- }
+ public func animate(duration: TimeInterval, animations: @escaping (Float)->(), completion: @escaping ((Bool)->())) {}
 
- public func tick(delta: TimeInterval, duration: TimeInterval, animations: @escaping (Float)->()) {
-
- }
+ public func tick(delta: TimeInterval, duration: TimeInterval, animations: @escaping (Float)->()) {}
 
 
  // MARK: - Private

diff --git a/Example/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -84,6 +84,11 @@
  "idiom" : "ipad",
  "size" : "83.5x83.5",
  "scale" : "2x"
+ },
+ {
+ "idiom" : "ios-marketing",
+ "size" : "1024x1024",
+ "scale" : "1x"
  }
  ],
  "info" : {

diff --git a/Example/Conroller/LeftOptionViewController.swift b/Example/Conroller/LeftOptionViewController.swift
@@ -46,28 +46,28 @@ class LeftOptionViewController: UIViewController {
  // Dispose of any resources that can be recreated.
  }
 
- func absoluteDidTouched(_ sender: UISwitch) {
+ @objc func absoluteDidTouched(_ sender: UISwitch) {
  self.drawerController?.setAbsolute(isAbsolute: sender.isOn, side: .left)
  }
- func shadowDidTouched(_ sender: UISwitch) {
+ @objc func shadowDidTouched(_ sender: UISwitch) {
  self.drawerController?.getSideOption(side: .left)?.isShadow = sender.isOn
  }
- func fadeScreenDidTouched(_ sender: UISwitch) {
+ @objc func fadeScreenDidTouched(_ sender: UISwitch) {
  self.drawerController?.getSideOption(side: .left)?.isFadeScreen = sender.isOn
  }
- func blurScreenDidTouched(_ sender: UISwitch) {
+ @objc func blurScreenDidTouched(_ sender: UISwitch) {
  self.drawerController?.getSideOption(side: .left)?.isBlur = sender.isOn
  }
- func overflowAnimationDidTouched(_ sender: UISwitch) {
+ @objc func overflowAnimationDidTouched(_ sender: UISwitch) {
  self.drawerController?.getSideOption(side: .left)?.isOverflowAnimation = sender.isOn
  }
- func gestureDidTouched(_ sender: UISwitch) {
+ @objc func gestureDidTouched(_ sender: UISwitch) {
  self.drawerController?.getSideOption(side: .left)?.isGesture = sender.isOn
  }
- func tapToCloseDidTouched(_ sender: UISwitch) {
+ @objc func tapToCloseDidTouched(_ sender: UISwitch) {
  self.drawerController?.getSideOption(side: .left)?.isTapToClose = sender.isOn
  }
- func bringToFrontDidTouched(_ sender: UISwitch) {
+ @objc func bringToFrontDidTouched(_ sender: UISwitch) {
  self.drawerController?.setBringToFront(isBringToFront: sender.isOn, side: .left)
  }
 

diff --git a/Example/Conroller/RightOptionViewController.swift b/Example/Conroller/RightOptionViewController.swift
@@ -46,28 +46,28 @@ class RightOptionViewController: UIViewController {
  // Dispose of any resources that can be recreated.
  }
 
- func absoluteDidTouched(_ sender: UISwitch) {
+ @objc func absoluteDidTouched(_ sender: UISwitch) {
  self.drawerController?.setAbsolute(isAbsolute: sender.isOn, side: .right)
  }
- func shadowDidTouched(_ sender: UISwitch) {
+ @objc func shadowDidTouched(_ sender: UISwitch) {
  self.drawerController?.getSideOption(side: .right)?.isShadow = sender.isOn
  }
- func fadeScreenDidTouched(_ sender: UISwitch) {
+ @objc func fadeScreenDidTouched(_ sender: UISwitch) {
  self.drawerController?.getSideOption(side: .right)?.isFadeScreen = sender.isOn
  }
- func blurScreenDidTouched(_ sender: UISwitch) {
+ @objc func blurScreenDidTouched(_ sender: UISwitch) {
  self.drawerController?.getSideOption(side: .right)?.isBlur = sender.isOn
  }
- func overflowAnimationDidTouched(_ sender: UISwitch) {
+ @objc func overflowAnimationDidTouched(_ sender: UISwitch) {
  self.drawerController?.getSideOption(side: .right)?.isOverflowAnimation = sender.isOn
  }
- func gestureDidTouched(_ sender: UISwitch) {
+ @objc func gestureDidTouched(_ sender: UISwitch) {
  self.drawerController?.getSideOption(side: .right)?.isGesture = sender.isOn
  }
- func tapToCloseDidTouched(_ sender: UISwitch) {
+ @objc func tapToCloseDidTouched(_ sender: UISwitch) {
  self.drawerController?.getSideOption(side: .right)?.isTapToClose = sender.isOn
  }
- func bringToFrontDidTouched(_ sender: UISwitch) {
+ @objc func bringToFrontDidTouched(_ sender: UISwitch) {
  self.drawerController?.setBringToFront(isBringToFront: sender.isOn, side: .right)
  }
 

diff --git a/Example/KWDrawerController-Example.xcodeproj/project.pbxproj b/Example/KWDrawerController-Example.xcodeproj/project.pbxproj
@@ -476,7 +476,7 @@
  PRODUCT_BUNDLE_IDENTIFIER = com.kawoou.library.drawer.example;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_VERSION = 3.0;
+ SWIFT_VERSION = 4.0;
  };
  name = Debug;
  };
@@ -490,7 +490,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.kawoou.library.drawer.example;
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
+ SWIFT_VERSION = 4.0;
  };
  name = Release;
  };

diff --git a/KWDrawerController.podspec b/KWDrawerController.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
  s.name = 'KWDrawerController'
- s.version = '3.7'
+ s.version = '4.0'
  s.summary = 'Drawer view controller that easy to use!'
  s.license = { :type => 'MIT', :file => 'LICENSE' }
  s.homepage = 'https://github.com/kawoou/KWDrawerController'

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Kawoou (Jungwon An)
+Copyright (c) 2018 Kawoou (Jungwon An)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ KWDrawerController
 [![Pod Version](http://img.shields.io/cocoapods/v/KWDrawerController.svg?style=flat)](http://cocoadocs.org/docsets/KWDrawerController)
 [![Pod Platform](http://img.shields.io/cocoapods/p/KWDrawerController.svg?style=flat)](http://cocoadocs.org/docsets/KWDrawerController)
 [![Pod License](http://img.shields.io/cocoapods/l/KWDrawerController.svg?style=flat)](https://github.com/kawoou/KWDrawerController/blob/master/LICENSE)
-![Swift](https://img.shields.io/badge/Swift-3.0-orange.svg)
+![Swift](https://img.shields.io/badge/Swift-4.0-orange.svg)
 
 Drawer view controller that easy to use!
 
@@ -17,7 +17,11 @@ Installation
 KWDrawerController is available on [CocoaPods](https://github.com/cocoapods/cocoapods). Add the following to your Podfile:
 
 ```ruby
+// Swift 3.x
 pod 'KWDrawerController', '~> 3.7'
+
+// Swift 4
+pod 'KWDrawerController', '~> 4.0'
 ```
 
 
@@ -231,12 +235,12 @@ Changelog
 + 3.6 Fixed an occurs issue while the drawer was open and layout changing.
 + 3.6.1 Fixed layout issue when rotate device.
 + 3.7 Fixed not updating issues on properties.
++ 4.0 Support Swift 4.
 
 ⚠️ Requirements
 --------------
 
- - iOS 7.1+
- - Xcode 8.1+
+ - iOS 8.0+
  - Swift 3.0+