diff --git a/NavigationStackDemo.xcodeproj/project.pbxproj b/NavigationStackDemo.xcodeproj/project.pbxproj index 81f3f27..eb834c6 100644 --- a/NavigationStackDemo.xcodeproj/project.pbxproj +++ b/NavigationStackDemo.xcodeproj/project.pbxproj @@ -26,6 +26,7 @@ 84500F2A1C87045400B0550E /* CollectionViewStackFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8444B1221C80250A00B53B4E /* CollectionViewStackFlowLayout.swift */; }; 84500F2C1C87045700B0550E /* CollectionStackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8444B1231C80250A00B53B4E /* CollectionStackViewController.swift */; }; 84500F2E1C87045B00B0550E /* NavigationStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8444B1261C80250A00B53B4E /* NavigationStack.swift */; }; + 846302891C8ABC340015CD81 /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 846302881C8ABC340015CD81 /* OpenSans-Regular.ttf */; }; 8479994C1C870EB50050D164 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8444B0F31C80238500B53B4E /* Main.storyboard */; }; 847B0FA91C846B8100E2C54D /* FifthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 847B0FA81C846B8100E2C54D /* FifthViewController.swift */; }; 847B0FAD1C846B9200E2C54D /* ThirdViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 847B0FAC1C846B9200E2C54D /* ThirdViewController.swift */; }; @@ -58,6 +59,7 @@ 8444B1221C80250A00B53B4E /* CollectionViewStackFlowLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewStackFlowLayout.swift; sourceTree = ""; }; 8444B1231C80250A00B53B4E /* CollectionStackViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionStackViewController.swift; sourceTree = ""; }; 8444B1261C80250A00B53B4E /* NavigationStack.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationStack.swift; sourceTree = ""; }; + 846302881C8ABC340015CD81 /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Regular.ttf"; sourceTree = ""; }; 847B0FA81C846B8100E2C54D /* FifthViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FifthViewController.swift; sourceTree = ""; }; 847B0FAC1C846B9200E2C54D /* ThirdViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThirdViewController.swift; sourceTree = ""; }; 847B0FB01C846C6100E2C54D /* SecondViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecondViewController.swift; sourceTree = ""; }; @@ -206,6 +208,7 @@ 84E8E5A41C89D28C00A8B640 /* Fonts */ = { isa = PBXGroup; children = ( + 846302881C8ABC340015CD81 /* OpenSans-Regular.ttf */, 84E8E5A51C89D2C800A8B640 /* OpenSans-Light.ttf */, ); path = Fonts; @@ -293,6 +296,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 846302891C8ABC340015CD81 /* OpenSans-Regular.ttf in Resources */, 8444B0FA1C80238500B53B4E /* LaunchScreen.storyboard in Resources */, 8444B0F71C80238500B53B4E /* Assets.xcassets in Resources */, 84E8E5A61C89D2C800A8B640 /* OpenSans-Light.ttf in Resources */, diff --git a/NavigationStackDemo/Assets.xcassets/Second/BridgeImage.imageset/BridgeImage.png b/NavigationStackDemo/Assets.xcassets/Second/BridgeImage.imageset/BridgeImage.png new file mode 100644 index 0000000..53f4701 Binary files /dev/null and b/NavigationStackDemo/Assets.xcassets/Second/BridgeImage.imageset/BridgeImage.png differ diff --git a/NavigationStackDemo/Assets.xcassets/Second/BridgeImage.imageset/Contents.json b/NavigationStackDemo/Assets.xcassets/Second/BridgeImage.imageset/Contents.json new file mode 100644 index 0000000..254990f --- /dev/null +++ b/NavigationStackDemo/Assets.xcassets/Second/BridgeImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "BridgeImage.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NavigationStackDemo/Assets.xcassets/Second/Contents.json b/NavigationStackDemo/Assets.xcassets/Second/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/NavigationStackDemo/Assets.xcassets/Second/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NavigationStackDemo/Assets.xcassets/Second/DotsIcon.imageset/Contents.json b/NavigationStackDemo/Assets.xcassets/Second/DotsIcon.imageset/Contents.json new file mode 100644 index 0000000..368d585 --- /dev/null +++ b/NavigationStackDemo/Assets.xcassets/Second/DotsIcon.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal" + }, + { + "idiom" : "universal", + "filename" : "DotsIcon.pdf", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NavigationStackDemo/Assets.xcassets/Second/DotsIcon.imageset/DotsIcon.pdf b/NavigationStackDemo/Assets.xcassets/Second/DotsIcon.imageset/DotsIcon.pdf new file mode 100644 index 0000000..2ae26b0 Binary files /dev/null and b/NavigationStackDemo/Assets.xcassets/Second/DotsIcon.imageset/DotsIcon.pdf differ diff --git a/NavigationStackDemo/Assets.xcassets/Second/HeadnImage.imageset/Contents.json b/NavigationStackDemo/Assets.xcassets/Second/HeadnImage.imageset/Contents.json new file mode 100644 index 0000000..b026dbb --- /dev/null +++ b/NavigationStackDemo/Assets.xcassets/Second/HeadnImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "HeadnImage.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NavigationStackDemo/Assets.xcassets/Second/HeadnImage.imageset/HeadnImage.png b/NavigationStackDemo/Assets.xcassets/Second/HeadnImage.imageset/HeadnImage.png new file mode 100644 index 0000000..5003694 Binary files /dev/null and b/NavigationStackDemo/Assets.xcassets/Second/HeadnImage.imageset/HeadnImage.png differ diff --git a/NavigationStackDemo/Assets.xcassets/Second/PCImage.imageset/Contents.json b/NavigationStackDemo/Assets.xcassets/Second/PCImage.imageset/Contents.json new file mode 100644 index 0000000..1e72338 --- /dev/null +++ b/NavigationStackDemo/Assets.xcassets/Second/PCImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "PCImage.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NavigationStackDemo/Assets.xcassets/Second/PCImage.imageset/PCImage.png b/NavigationStackDemo/Assets.xcassets/Second/PCImage.imageset/PCImage.png new file mode 100644 index 0000000..88853d6 Binary files /dev/null and b/NavigationStackDemo/Assets.xcassets/Second/PCImage.imageset/PCImage.png differ diff --git a/NavigationStackDemo/Assets.xcassets/Second/PersonIcon.imageset/Contents.json b/NavigationStackDemo/Assets.xcassets/Second/PersonIcon.imageset/Contents.json new file mode 100644 index 0000000..7fc95d3 --- /dev/null +++ b/NavigationStackDemo/Assets.xcassets/Second/PersonIcon.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal" + }, + { + "idiom" : "universal", + "filename" : "PersonIcon.pdf", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NavigationStackDemo/Assets.xcassets/Second/PersonIcon.imageset/PersonIcon.pdf b/NavigationStackDemo/Assets.xcassets/Second/PersonIcon.imageset/PersonIcon.pdf new file mode 100644 index 0000000..d2b54ca Binary files /dev/null and b/NavigationStackDemo/Assets.xcassets/Second/PersonIcon.imageset/PersonIcon.pdf differ diff --git a/NavigationStackDemo/Assets.xcassets/Second/PinIcon.imageset/Contents.json b/NavigationStackDemo/Assets.xcassets/Second/PinIcon.imageset/Contents.json new file mode 100644 index 0000000..70d76fc --- /dev/null +++ b/NavigationStackDemo/Assets.xcassets/Second/PinIcon.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal" + }, + { + "idiom" : "universal", + "filename" : "PinIcon.pdf", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NavigationStackDemo/Assets.xcassets/Second/PinIcon.imageset/PinIcon.pdf b/NavigationStackDemo/Assets.xcassets/Second/PinIcon.imageset/PinIcon.pdf new file mode 100644 index 0000000..572db2f Binary files /dev/null and b/NavigationStackDemo/Assets.xcassets/Second/PinIcon.imageset/PinIcon.pdf differ diff --git a/NavigationStackDemo/Assets.xcassets/Second/RamotionBig.imageset/Contents.json b/NavigationStackDemo/Assets.xcassets/Second/RamotionBig.imageset/Contents.json new file mode 100644 index 0000000..d7bca97 --- /dev/null +++ b/NavigationStackDemo/Assets.xcassets/Second/RamotionBig.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal" + }, + { + "idiom" : "universal", + "filename" : "RamotionBig.pdf", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NavigationStackDemo/Assets.xcassets/Second/RamotionBig.imageset/RamotionBig.pdf b/NavigationStackDemo/Assets.xcassets/Second/RamotionBig.imageset/RamotionBig.pdf new file mode 100644 index 0000000..cd21253 Binary files /dev/null and b/NavigationStackDemo/Assets.xcassets/Second/RamotionBig.imageset/RamotionBig.pdf differ diff --git a/NavigationStackDemo/Assets.xcassets/Second/backButton.imageset/Contents.json b/NavigationStackDemo/Assets.xcassets/Second/backButton.imageset/Contents.json new file mode 100644 index 0000000..aaa4bd0 --- /dev/null +++ b/NavigationStackDemo/Assets.xcassets/Second/backButton.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal" + }, + { + "idiom" : "universal", + "filename" : "backButton.pdf", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NavigationStackDemo/Assets.xcassets/Second/backButton.imageset/backButton.pdf b/NavigationStackDemo/Assets.xcassets/Second/backButton.imageset/backButton.pdf new file mode 100644 index 0000000..26d122b Binary files /dev/null and b/NavigationStackDemo/Assets.xcassets/Second/backButton.imageset/backButton.pdf differ diff --git a/NavigationStackDemo/Base.lproj/Main.storyboard b/NavigationStackDemo/Base.lproj/Main.storyboard index adb794b..388f9e0 100644 --- a/NavigationStackDemo/Base.lproj/Main.storyboard +++ b/NavigationStackDemo/Base.lproj/Main.storyboard @@ -11,6 +11,16 @@ OpenSans-Light OpenSans-Light OpenSans-Light + OpenSans-Light + OpenSans-Light + OpenSans-Light + + + OpenSans + OpenSans + OpenSans + OpenSans + OpenSans @@ -533,7 +543,7 @@ - + @@ -543,510 +553,214 @@ - - + + - + + + + - + - - - + + - - + + - - - - - - - - - + + + + - - + + - - - - - - - - - + + + - - + + - - - - - - - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - + + + + + + + + - - - - + + + + - - - - - + + + + + - + - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - + + + + + + + + + + - - + + - + - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - + + + + + + + + + + - - + + - + - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - + + + + + + + + + + @@ -1059,7 +773,8 @@ - + + @@ -1078,6 +793,7 @@ + @@ -2356,7 +2072,14 @@ + + + + + + + diff --git a/NavigationStackDemo/ViewControllers/SecondViewController/SecondViewController.swift b/NavigationStackDemo/ViewControllers/SecondViewController/SecondViewController.swift index f77786a..0e33c82 100644 --- a/NavigationStackDemo/ViewControllers/SecondViewController/SecondViewController.swift +++ b/NavigationStackDemo/ViewControllers/SecondViewController/SecondViewController.swift @@ -13,9 +13,11 @@ class SecondViewController: UITableViewController { override func viewWillAppear(animated: Bool) { super.viewWillAppear(animated) - if let navigationController = navigationController { - navigationController.navigationBar.barTintColor = UIColor(red:0.61, green:0.86, blue:0.87, alpha:1) - } +// if let navigationController = navigationController { +//// navigationController.navigationBar.barTintColor = UIColor(red:0.61, green:0.86, blue:0.87, alpha:1) +//// tableView.contentOffset = CGPoint(x: 0, y: -44) +//// navigationController.navigationBar.translucent = true +// } } diff --git a/Source/Fonts/OpenSans-Regular.ttf b/Source/Fonts/OpenSans-Regular.ttf new file mode 100755 index 0000000..db43334 Binary files /dev/null and b/Source/Fonts/OpenSans-Regular.ttf differ