Skip to content

Commit

Permalink
Merge pull request #27 from ykyouhei/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@ykyouhei
ykyouhei committed Nov 8, 2015
2 parents 80733e6 + aed7855 commit 9796c44
Show file tree
Hide file tree
Showing 13 changed files with 581 additions and 118 deletions.
24 changes: 12 additions & 12 deletions Example/Code/Code.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
objects = {

/* Begin PBXBuildFile section */
411540941BEF3CEE00531D08 /* KYDrawerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 411540911BEF3CEE00531D08 /* KYDrawerController.swift */; };
411540951BEF3CEE00531D08 /* KYEmbedDrawerControllerSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 411540921BEF3CEE00531D08 /* KYEmbedDrawerControllerSegue.swift */; };
411540961BEF3CEE00531D08 /* KYEmbedMainControllerSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 411540931BEF3CEE00531D08 /* KYEmbedMainControllerSegue.swift */; };
41E2DB231B0641C80023FD9E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DB221B0641C80023FD9E /* AppDelegate.swift */; };
41E2DB2A1B0641C80023FD9E /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 41E2DB291B0641C80023FD9E /* Images.xcassets */; };
41E2DB2D1B0641C80023FD9E /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 41E2DB2B1B0641C80023FD9E /* LaunchScreen.xib */; };
41E2DB391B0641C80023FD9E /* CodeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DB381B0641C80023FD9E /* CodeTests.swift */; };
41E2DB4A1B06B45D0023FD9E /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DB491B06B45D0023FD9E /* MainViewController.swift */; };
41E2DB4C1B06B92E0023FD9E /* DrawerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DB4B1B06B92E0023FD9E /* DrawerViewController.swift */; };
41E2DB571B06C61A0023FD9E /* KYDrawerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DB541B06C61A0023FD9E /* KYDrawerController.swift */; };
41E2DB581B06C61A0023FD9E /* KYEmbedDrawerControllerSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DB551B06C61A0023FD9E /* KYEmbedDrawerControllerSegue.swift */; };
41E2DB591B06C61A0023FD9E /* KYEmbedMainControllerSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DB561B06C61A0023FD9E /* KYEmbedMainControllerSegue.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -29,6 +29,9 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
411540911BEF3CEE00531D08 /* KYDrawerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KYDrawerController.swift; path = ../../../KYDrawerController/Classes/KYDrawerController.swift; sourceTree = "<group>"; };
411540921BEF3CEE00531D08 /* KYEmbedDrawerControllerSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KYEmbedDrawerControllerSegue.swift; path = ../../../KYDrawerController/Classes/KYEmbedDrawerControllerSegue.swift; sourceTree = "<group>"; };
411540931BEF3CEE00531D08 /* KYEmbedMainControllerSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KYEmbedMainControllerSegue.swift; path = ../../../KYDrawerController/Classes/KYEmbedMainControllerSegue.swift; sourceTree = "<group>"; };
41E2DB1D1B0641C80023FD9E /* Code.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Code.app; sourceTree = BUILT_PRODUCTS_DIR; };
41E2DB211B0641C80023FD9E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
41E2DB221B0641C80023FD9E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -39,9 +42,6 @@
41E2DB381B0641C80023FD9E /* CodeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeTests.swift; sourceTree = "<group>"; };
41E2DB491B06B45D0023FD9E /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
41E2DB4B1B06B92E0023FD9E /* DrawerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DrawerViewController.swift; sourceTree = "<group>"; };
41E2DB541B06C61A0023FD9E /* KYDrawerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KYDrawerController.swift; path = ../../../Classes/KYDrawerController.swift; sourceTree = "<group>"; };
41E2DB551B06C61A0023FD9E /* KYEmbedDrawerControllerSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KYEmbedDrawerControllerSegue.swift; path = ../../../Classes/KYEmbedDrawerControllerSegue.swift; sourceTree = "<group>"; };
41E2DB561B06C61A0023FD9E /* KYEmbedMainControllerSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KYEmbedMainControllerSegue.swift; path = ../../../Classes/KYEmbedMainControllerSegue.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -122,9 +122,9 @@
41E2DB481B06B41E0023FD9E /* KYDrawerController */ = {
isa = PBXGroup;
children = (
41E2DB541B06C61A0023FD9E /* KYDrawerController.swift */,
41E2DB551B06C61A0023FD9E /* KYEmbedDrawerControllerSegue.swift */,
41E2DB561B06C61A0023FD9E /* KYEmbedMainControllerSegue.swift */,
411540911BEF3CEE00531D08 /* KYDrawerController.swift */,
411540921BEF3CEE00531D08 /* KYEmbedDrawerControllerSegue.swift */,
411540931BEF3CEE00531D08 /* KYEmbedMainControllerSegue.swift */,
);
name = KYDrawerController;
sourceTree = "<group>";
Expand Down Expand Up @@ -230,9 +230,9 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
41E2DB581B06C61A0023FD9E /* KYEmbedDrawerControllerSegue.swift in Sources */,
41E2DB571B06C61A0023FD9E /* KYDrawerController.swift in Sources */,
41E2DB591B06C61A0023FD9E /* KYEmbedMainControllerSegue.swift in Sources */,
411540951BEF3CEE00531D08 /* KYEmbedDrawerControllerSegue.swift in Sources */,
411540941BEF3CEE00531D08 /* KYDrawerController.swift in Sources */,
411540961BEF3CEE00531D08 /* KYEmbedMainControllerSegue.swift in Sources */,
41E2DB231B0641C80023FD9E /* AppDelegate.swift in Sources */,
41E2DB4A1B06B45D0023FD9E /* MainViewController.swift in Sources */,
41E2DB4C1B06B92E0023FD9E /* DrawerViewController.swift in Sources */,
Expand Down
3 changes: 1 addition & 2 deletions Example/Code/Code/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
)
drawerController.drawerViewController = drawerViewController

/* Customize
/* Customize */
drawerController.drawerDirection = .Right
drawerController.drawerWidth = 300
*/

window = UIWindow(frame: UIScreen.mainScreen().bounds)
window?.rootViewController = drawerController
Expand Down
24 changes: 12 additions & 12 deletions Example/Storyboard/Storyboard.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
objects = {

/* Begin PBXBuildFile section */
4115409A1BEF3D8600531D08 /* KYDrawerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 411540971BEF3D8600531D08 /* KYDrawerController.swift */; };
4115409B1BEF3D8600531D08 /* KYEmbedDrawerControllerSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 411540981BEF3D8600531D08 /* KYEmbedDrawerControllerSegue.swift */; };
4115409C1BEF3D8600531D08 /* KYEmbedMainControllerSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 411540991BEF3D8600531D08 /* KYEmbedMainControllerSegue.swift */; };
41E2DAEF1B063C880023FD9E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DAEE1B063C880023FD9E /* AppDelegate.swift */; };
41E2DAF41B063C880023FD9E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 41E2DAF21B063C880023FD9E /* Main.storyboard */; };
41E2DAF61B063C880023FD9E /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 41E2DAF51B063C880023FD9E /* Images.xcassets */; };
41E2DAF91B063C880023FD9E /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 41E2DAF71B063C880023FD9E /* LaunchScreen.xib */; };
41E2DB051B063C880023FD9E /* StoryboardTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DB041B063C880023FD9E /* StoryboardTests.swift */; };
41E2DB4F1B06BE850023FD9E /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DB4E1B06BE850023FD9E /* MainViewController.swift */; };
41E2DB531B06BEB60023FD9E /* DrawerTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DB521B06BEB60023FD9E /* DrawerTableViewController.swift */; };
41E2DB5D1B06C64B0023FD9E /* KYDrawerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DB5A1B06C64B0023FD9E /* KYDrawerController.swift */; };
41E2DB5E1B06C64B0023FD9E /* KYEmbedDrawerControllerSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DB5B1B06C64B0023FD9E /* KYEmbedDrawerControllerSegue.swift */; };
41E2DB5F1B06C64B0023FD9E /* KYEmbedMainControllerSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E2DB5C1B06C64B0023FD9E /* KYEmbedMainControllerSegue.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -30,6 +30,9 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
411540971BEF3D8600531D08 /* KYDrawerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KYDrawerController.swift; path = ../../../KYDrawerController/Classes/KYDrawerController.swift; sourceTree = "<group>"; };
411540981BEF3D8600531D08 /* KYEmbedDrawerControllerSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KYEmbedDrawerControllerSegue.swift; path = ../../../KYDrawerController/Classes/KYEmbedDrawerControllerSegue.swift; sourceTree = "<group>"; };
411540991BEF3D8600531D08 /* KYEmbedMainControllerSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KYEmbedMainControllerSegue.swift; path = ../../../KYDrawerController/Classes/KYEmbedMainControllerSegue.swift; sourceTree = "<group>"; };
41E2DAE91B063C880023FD9E /* Storyboard.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Storyboard.app; sourceTree = BUILT_PRODUCTS_DIR; };
41E2DAED1B063C880023FD9E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
41E2DAEE1B063C880023FD9E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -41,9 +44,6 @@
41E2DB041B063C880023FD9E /* StoryboardTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryboardTests.swift; sourceTree = "<group>"; };
41E2DB4E1B06BE850023FD9E /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
41E2DB521B06BEB60023FD9E /* DrawerTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DrawerTableViewController.swift; sourceTree = "<group>"; };
41E2DB5A1B06C64B0023FD9E /* KYDrawerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KYDrawerController.swift; path = ../../../Classes/KYDrawerController.swift; sourceTree = "<group>"; };
41E2DB5B1B06C64B0023FD9E /* KYEmbedDrawerControllerSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KYEmbedDrawerControllerSegue.swift; path = ../../../Classes/KYEmbedDrawerControllerSegue.swift; sourceTree = "<group>"; };
41E2DB5C1B06C64B0023FD9E /* KYEmbedMainControllerSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = KYEmbedMainControllerSegue.swift; path = ../../../Classes/KYEmbedMainControllerSegue.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -125,9 +125,9 @@
41E2DB4D1B06BD580023FD9E /* KYDrawerController */ = {
isa = PBXGroup;
children = (
41E2DB5A1B06C64B0023FD9E /* KYDrawerController.swift */,
41E2DB5B1B06C64B0023FD9E /* KYEmbedDrawerControllerSegue.swift */,
41E2DB5C1B06C64B0023FD9E /* KYEmbedMainControllerSegue.swift */,
411540971BEF3D8600531D08 /* KYDrawerController.swift */,
411540981BEF3D8600531D08 /* KYEmbedDrawerControllerSegue.swift */,
411540991BEF3D8600531D08 /* KYEmbedMainControllerSegue.swift */,
);
name = KYDrawerController;
sourceTree = "<group>";
Expand Down Expand Up @@ -233,9 +233,9 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
41E2DB5E1B06C64B0023FD9E /* KYEmbedDrawerControllerSegue.swift in Sources */,
41E2DB5D1B06C64B0023FD9E /* KYDrawerController.swift in Sources */,
41E2DB5F1B06C64B0023FD9E /* KYEmbedMainControllerSegue.swift in Sources */,
4115409B1BEF3D8600531D08 /* KYEmbedDrawerControllerSegue.swift in Sources */,
4115409A1BEF3D8600531D08 /* KYDrawerController.swift in Sources */,
4115409C1BEF3D8600531D08 /* KYEmbedMainControllerSegue.swift in Sources */,
41E2DB531B06BEB60023FD9E /* DrawerTableViewController.swift in Sources */,
41E2DAEF1B063C880023FD9E /* AppDelegate.swift in Sources */,
41E2DB4F1B06BE850023FD9E /* MainViewController.swift in Sources */,
Expand Down
4 changes: 2 additions & 2 deletions KYDrawerController.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Pod::Spec.new do |s|
s.name = "KYDrawerController"
s.version = "1.1.1"
s.version = "1.1.2"
s.summary = "KYDrawerController is a side drawer navigation container view controller."
s.homepage = "https://github.com/ykyouhei/KYDrawerController"
s.license = "MIT"
s.author = { "Kyohei Yamaguchi" => "kyouhei.lab@gmail.com" }
s.social_media_url = "https://twitter.com/kyo__hei"
s.platform = :ios
s.source = { :git => "https://github.com/ykyouhei/KYDrawerController.git", :tag => s.version.to_s }
s.source_files = "Classes/*.swift"
s.source_files = "KYDrawerController/Classes/*.swift"
s.requires_arc = true
s.ios.deployment_target = '8.0'
end
Loading

0 comments on commit 9796c44

Please sign in to comment.