Merge pull request #3 from OpenCraft/feature-add-navigation-mixins

Feature add navigation mixins
OpenCraft · Mar 9, 2017 · a8374c7 · a8374c7
2 parents 2fc601f + b31d484
commit a8374c7
Show file tree

Hide file tree

Showing 6 changed files with 208 additions and 29 deletions.
diff --git a/Example/OCMixins.xcodeproj/project.pbxproj b/Example/OCMixins.xcodeproj/project.pbxproj
@@ -11,6 +11,7 @@
 		2D1FD4791D59234B00D4F69C /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D1FD4781D59234B00D4F69C /* DetailViewController.swift */; };
 		2D1FD47B1D59255B00D4F69C /* ModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D1FD47A1D59255B00D4F69C /* ModalViewController.swift */; };
 		3F3C29DB1341F5620CDC790C /* Pods_OCMixins_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA3A014EEA2D5F87EC09B819 /* Pods_OCMixins_Example.framework */; };
+		4E9752471E70C6200025E1D2 /* GradientViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E9752461E70C6200025E1D2 /* GradientViewController.swift */; };
 		607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
 		607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; };
 		607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
@@ -35,6 +36,7 @@
 		2D1FD47A1D59255B00D4F69C /* ModalViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ModalViewController.swift; sourceTree = "<group>"; };
 		2D583C7B1E073BD0002A11C0 /* Fastlane */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Fastlane; sourceTree = "<group>"; };
 		34666CD856F155217640F3C5 /* Pods-OCMixins_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OCMixins_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OCMixins_Tests/Pods-OCMixins_Tests.debug.xcconfig"; sourceTree = "<group>"; };
+		4E9752461E70C6200025E1D2 /* GradientViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GradientViewController.swift; sourceTree = "<group>"; };
 		566C07F1099D220E8E0583AA /* Pods-OCMixins_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OCMixins_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-OCMixins_Tests/Pods-OCMixins_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		607FACD01AFB9204008FA782 /* OCMixins_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OCMixins_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -110,6 +112,7 @@
 			isa = PBXGroup;
 			children = (
 				607FACD51AFB9204008FA782 /* AppDelegate.swift */,
+				4E9752461E70C6200025E1D2 /* GradientViewController.swift */,
 				607FACD71AFB9204008FA782 /* ViewController.swift */,
 				2D1FD4781D59234B00D4F69C /* DetailViewController.swift */,
 				2D1FD47A1D59255B00D4F69C /* ModalViewController.swift */,
@@ -375,6 +378,7 @@
 			files = (
 				2D1FD47B1D59255B00D4F69C /* ModalViewController.swift in Sources */,
 				2D1FD4791D59234B00D4F69C /* DetailViewController.swift in Sources */,
+				4E9752471E70C6200025E1D2 /* GradientViewController.swift in Sources */,
 				607FACD81AFB9204008FA782 /* ViewController.swift in Sources */,
 				607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */,
 			);