Upgrade for iOS 14

README.md

@@ -1,12 +1,12 @@
 # UIKit Catalog: Creating and Customizing Views and Controls
 
-Customize the user interface of your iOS apps and Mac apps built with Mac Catalyst by using views and controls in UIKit.
+Customize your app's user interface with views and controls in UIKit.
 
 ## Overview
 
-This sample guides you through several types of customizations that you can apply in your iOS apps and Mac apps built using Mac Catalyst. The sample uses a split view controller architecture for navigating UIKit views and controls. The primary view controller (`MasterViewController`) shows the available views and controls. Selecting one shows the secondary view controller associated with it.
+This sample guides you through several types of customizations that you can make in your iOS app. The sample uses a split view controller architecture for navigating UIKit views and controls. The primary view controller (`MasterViewController`) shows the available views and controls. Selecting one shows the secondary view controller associated with it.
 
-The name of each secondary view controller reflects its *target item*. For example, the `AlertControllerViewController` class shows how to use a `UIAlertController` object. The only exceptions to this rule are `UISearchBar` and `UIToolbar`; the sample demonstrates these APIs in multiple view controllers to explain how their controls function and how to customize them. To demonstrate how to manage the complexity of your storyboards, all view controllers are hosted in a separate storyboard and loaded when needed.
+The name of each secondary view controller reflects its *target item*. For example, the `AlertControllerViewController` class shows how to use a `UIAlertController` object. The only exceptions to this rule are `UISearchBar` and `UIToolbar`; the sample demonstrates these APIs in multiple view controllers to explain how their controls function and how to customize them. To demonstrate how to manage the complexity of your storyboards, the app hosts all view controllers in a separate storyboard and loaded when needed.
 
 This sample demonstrates the following views and controls (several of which are referenced in the sections below):
 
@@ -14,9 +14,12 @@ This sample demonstrates the following views and controls (several of which are
 * [`UIAlertController`](https://developer.apple.com/documentation/uikit/uialertcontroller)
 * [`UIButton`](https://developer.apple.com/documentation/uikit/uibutton)
 * [`UIDatePicker`](https://developer.apple.com/documentation/uikit/uidatepicker)
+* [`UIPickerView`](https://developer.apple.com/documentation/uikit/uipickerview)
+* [`UIColorPickerViewController`](https://developer.apple.com/documentation/uikit/uicolorpickerviewcontroller)
+* [`UIFontPickerViewController`](https://developer.apple.com/documentation/uikit/uifontpickerviewcontroller)
+* [`UIImagePickerViewController`](https://developer.apple.com/documentation/uikit/uiimagepickercontroller)
 * [`UIImageView`](https://developer.apple.com/documentation/uikit/uiimageview)
 * [`UIPageControl`](https://developer.apple.com/documentation/uikit/uipagecontrol)
-* [`UIPickerView`](https://developer.apple.com/documentation/uikit/uipickerview)
 * [`UIProgressView`](https://developer.apple.com/documentation/uikit/uiprogressview)
 * [`UISearchBar`](https://developer.apple.com/documentation/uikit/uisearchbar)
 * [`UISegmentedControl`](https://developer.apple.com/documentation/uikit/uisegmentedcontrol)
@@ -60,7 +63,7 @@ func pickerView(_ pickerView: UIPickerView, accessibilityLabelForComponent compo
 3. Add handlers for actions that the user may take.
 4. Present the alert controller.
 
-The `showSimpleAlert` function uses the `NSLocalizedString` function to retrieve the alert messages in the user’s preferred language. This function uses those strings to create and configure the `UIAlertController` object. Although the button in the alert has the title OK, the sample uses a cancel action to ensure that the alert controller applies the proper styling to the button:
+The `showSimpleAlert` function uses the `NSLocalizedString` function to retrieve the alert messages in the user’s preferred language. The `showSimpleAlert` function uses those strings to create and configure the `UIAlertController` object. Although the button in the alert has the title OK, the sample uses a cancel action to ensure that the alert controller applies the proper styling to the button:
 
 ``` swift
 func showSimpleAlert() {
@@ -84,7 +87,7 @@ func showSimpleAlert() {
 
 ## Customize the Appearance of Sliders
 
-This sample demonstrates different ways to display a `UISlider`, a control used to select a single value from a continuous range of values. You customize the appearance of a slider by assigning stretchable images for left-side tracking, right-side tracking, and the thumb. In this example, the track image is stretchable and is one pixel wide. Make the track images wider to provide rounded corners, but be sure to set these images' `capInsets` property to allow room for the corners.
+This sample demonstrates different ways to display a `UISlider`, a control used to select a single value from a continuous range of values. You customize the appearance of a slider by assigning stretchable images for left-side tracking, right-side tracking, and the thumb. In this example, the track image is stretchable and is one pixel wide. Make the track images wider to provide rounded corners, but be sure to set these images' `capInsets` property to allow for the corners.
 
 The `configureCustomSlider` function sets up a custom slider:
 
@@ -200,7 +203,40 @@ func configurePageControl() {
 
     pageControl.pageIndicatorTintColor = UIColor.systemGreen
     pageControl.currentPageIndicatorTintColor = UIColor.systemPurple
-
+    
     pageControl.addTarget(self, action: #selector(PageControlViewController.pageControlValueDidChange), for: .valueChanged)
 }
 ```
+
+## Add Menus to Your Controls
+
+You can attach menus to controls like `UIButton` and `UIBarButtonItem`. Create menus with the [`UIAction`](https://developer.apple.com/documentation/uikit/uiaction) class, and attach a menu to each control by setting the [`UIMenu`](https://developer.apple.com/documentation/uikit/uimenu) property.
+
+Attach a menu to a `UIButton` as shown here:
+
+``` swift
+func configureMenuButton() {
+    let buttonTitle = NSLocalizedString("Button", comment: "")
+    menuButton.setTitle(buttonTitle, for: .normal)
+
+    let items = (1...5).map {
+        UIAction(title: String(format: NSLocalizedString("ItemTitle", comment: ""), $0.description), handler: menuHandler)
+    }
+    menuButton.menu = UIMenu(title: NSLocalizedString("ChooseItemTitle", comment: ""), children: items)
+    menuButton.showsMenuAsPrimaryAction = true
+}
+```
+
+Create a `UIBarButtonItem` with a menu attached as shown here:
+
+``` swift
+var customTitleBarButtonItem: UIBarButtonItem {
+    let buttonMenu = UIMenu(title: "",
+                            children: (1...5).map {
+                               UIAction(title: "Option \($0)", handler: menuHandler)
+                            })
+    return UIBarButtonItem(image: UIImage(systemName: "list.number"), menu: buttonMenu)
+}
+```
+
+

UIKitCatalog.xcodeproj/project.pbxproj

@@ -17,8 +17,7 @@
 		2200542B18BC54EC002A6E8B /* DefaultSearchBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2200542518BC54EC002A6E8B /* DefaultSearchBarViewController.swift */; };
 		2200542C18BC54EC002A6E8B /* DefaultToolbarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2200542618BC54EC002A6E8B /* DefaultToolbarViewController.swift */; };
 		2200543C18BC54F5002A6E8B /* ImageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2200542D18BC54F5002A6E8B /* ImageViewController.swift */; };
-		2200543F18BC54F5002A6E8B /* PageControlViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2200543018BC54F5002A6E8B /* PageControlViewController.swift */; };
-		2200544018BC54F5002A6E8B /* PickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2200543118BC54F5002A6E8B /* PickerViewController.swift */; };
+		2200543F18BC54F5002A6E8B /* DefaultPageControlViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2200543018BC54F5002A6E8B /* DefaultPageControlViewController.swift */; };
 		2200544118BC54F5002A6E8B /* ProgressViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2200543218BC54F5002A6E8B /* ProgressViewController.swift */; };
 		2200544218BC54F5002A6E8B /* SegmentedControlViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2200543318BC54F5002A6E8B /* SegmentedControlViewController.swift */; };
 		2200544318BC54F5002A6E8B /* SliderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2200543418BC54F5002A6E8B /* SliderViewController.swift */; };
@@ -31,27 +30,35 @@
 		228DBA0818BC53F1002BA12A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 228DBA0718BC53F1002BA12A /* Assets.xcassets */; };
 		3E5C084E1974991E00969DD7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3E5C08501974991E00969DD7 /* Main.storyboard */; };
 		5312D0F222848B0200048DE2 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 5312D0F022848B0200048DE2 /* Credits.rtf */; };
-		533BD78D1F8BE1A6007D5C3B /* DetailViewManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 533BD78C1F8BE1A6007D5C3B /* DetailViewManager.swift */; };
-		533BD7951F8BF6A4007D5C3B /* UIViewController+SizeChange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 533BD7941F8BF6A4007D5C3B /* UIViewController+SizeChange.swift */; };
-		533BD7971F8BF8B0007D5C3B /* BaseTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 533BD7961F8BF8B0007D5C3B /* BaseTableViewController.swift */; };
-		533BD7BC1F8D2B08007D5C3B /* SearchBarsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 533BD7BA1F8D2B07007D5C3B /* SearchBarsTableViewController.swift */; };
-		533BD7BD1F8D2B08007D5C3B /* ToolbarsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 533BD7BB1F8D2B07007D5C3B /* ToolbarsTableViewController.swift */; };
-		5341627C1F291F310007BCCA /* ToolbarViewControllers.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5341627A1F291F310007BCCA /* ToolbarViewControllers.storyboard */; };
+		5340A1B62496CF64004F3666 /* DefaultToolbarViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5340A1B02496CF64004F3666 /* DefaultToolbarViewController.storyboard */; };
+		5340A1B72496CF64004F3666 /* CustomToolbarViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5340A1B22496CF64004F3666 /* CustomToolbarViewController.storyboard */; };
+		5340A1B82496CF64004F3666 /* TintedToolbarViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5340A1B42496CF64004F3666 /* TintedToolbarViewController.storyboard */; };
+		5340A1B92496D670004F3666 /* PickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2200543118BC54F5002A6E8B /* PickerViewController.swift */; };
+		535D32B224970EF10011E153 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 535D32B124970EF10011E153 /* SceneDelegate.swift */; };
+		5364C08C249696D7009A9A52 /* OutlineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5364C08A249696D7009A9A52 /* OutlineViewController.swift */; };
+		5364C0922496BEFD009A9A52 /* DefaultSearchBarViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5364C08E2496BEFD009A9A52 /* DefaultSearchBarViewController.storyboard */; };
+		5364C0932496BEFD009A9A52 /* CustomSearchBarViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5364C0902496BEFD009A9A52 /* CustomSearchBarViewController.storyboard */; };
+		5364C0992496C2B3009A9A52 /* DefaultPageControlViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5364C0952496C2B3009A9A52 /* DefaultPageControlViewController.storyboard */; };
+		5364C09A2496C2B3009A9A52 /* CustomPageControlViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5364C0972496C2B3009A9A52 /* CustomPageControlViewController.storyboard */; };
 		53654E232298881200B999C7 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53654E222298881200B999C7 /* WebKit.framework */; };
-		537357141F291E6700FAB742 /* SearchViewControllers.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 537357121F291E6700FAB742 /* SearchViewControllers.storyboard */; };
 		538B36F41F2A8E06002AE100 /* DatePickerController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 538B36F21F2A8D97002AE100 /* DatePickerController.storyboard */; };
 		538B36F71F2A8E8A002AE100 /* TextViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 538B36F51F2A8E66002AE100 /* TextViewController.storyboard */; };
 		539029FF1F2A53AD009775E3 /* AlertControllerViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 539029FD1F2A53AD009775E3 /* AlertControllerViewController.storyboard */; };
 		539C6BAE1F27F4980006C5A9 /* ActivityIndicatorViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 539C6BA81F27F4980006C5A9 /* ActivityIndicatorViewController.storyboard */; };
 		539C6BAF1F27F4980006C5A9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 539C6BAA1F27F4980006C5A9 /* LaunchScreen.storyboard */; };
 		539C6BB01F27F4980006C5A9 /* WebViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 539C6BAC1F27F4980006C5A9 /* WebViewController.storyboard */; };
-		539C6BB21F27F4A70006C5A9 /* MasterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 539C6BB11F27F4A70006C5A9 /* MasterViewController.swift */; };
+		53A266B52491ED77008EADBB /* ImagePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53A266AE2491ED77008EADBB /* ImagePickerViewController.swift */; };
+		53A266B62491ED77008EADBB /* CustomPageControlViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53A266AF2491ED77008EADBB /* CustomPageControlViewController.swift */; };
+		53A266B82491ED77008EADBB /* ColorPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53A266B12491ED77008EADBB /* ColorPickerViewController.swift */; };
+		53A266B92491ED77008EADBB /* FontPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53A266B22491ED77008EADBB /* FontPickerViewController.swift */; };
+		53A266C22491ED9E008EADBB /* ImagePickerViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 53A266BA2491ED9E008EADBB /* ImagePickerViewController.storyboard */; };
+		53A266C42491ED9E008EADBB /* ColorPickerViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 53A266BE2491ED9E008EADBB /* ColorPickerViewController.storyboard */; };
+		53A266C52491ED9E008EADBB /* FontPickerViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 53A266C02491ED9E008EADBB /* FontPickerViewController.storyboard */; };
 		53B791DA1F85505400AB2FA6 /* content.html in Resources */ = {isa = PBXBuildFile; fileRef = 53B791D41F854B4700AB2FA6 /* content.html */; };
 		53B791DB1F85505700AB2FA6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 53B791D61F854B4700AB2FA6 /* InfoPlist.strings */; };
 		53B791DC1F85505A00AB2FA6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 53B791D81F854B4800AB2FA6 /* Localizable.strings */; };
 		53CE5AD81F2A89E500D8A656 /* ButtonViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 53CE5AD61F2A89E500D8A656 /* ButtonViewController.storyboard */; };
 		53CE5ADE1F2A8A3D00D8A656 /* ImageViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 53CE5ADC1F2A8A3D00D8A656 /* ImageViewController.storyboard */; };
-		53CE5AE31F2A8AD200D8A656 /* PageControlViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 53CE5AE11F2A8AD200D8A656 /* PageControlViewController.storyboard */; };
 		53CE5AE61F2A8AEF00D8A656 /* PickerViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 53CE5AE41F2A8AEF00D8A656 /* PickerViewController.storyboard */; };
 		53CE5AE91F2A8B1000D8A656 /* ProgressViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 53CE5AE71F2A8B1000D8A656 /* ProgressViewController.storyboard */; };
 		53CE5AEC1F2A8B2F00D8A656 /* SegmentedControlViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 53CE5AEA1F2A8B2F00D8A656 /* SegmentedControlViewController.storyboard */; };
@@ -74,7 +81,7 @@
 		2200542518BC54EC002A6E8B /* DefaultSearchBarViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultSearchBarViewController.swift; sourceTree = "<group>"; };
 		2200542618BC54EC002A6E8B /* DefaultToolbarViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = DefaultToolbarViewController.swift; sourceTree = "<group>"; };
 		2200542D18BC54F5002A6E8B /* ImageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = ImageViewController.swift; sourceTree = "<group>"; };
-		2200543018BC54F5002A6E8B /* PageControlViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = PageControlViewController.swift; sourceTree = "<group>"; };
+		2200543018BC54F5002A6E8B /* DefaultPageControlViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = DefaultPageControlViewController.swift; sourceTree = "<group>"; };
 		2200543118BC54F5002A6E8B /* PickerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = PickerViewController.swift; sourceTree = "<group>"; };
 		2200543218BC54F5002A6E8B /* ProgressViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = ProgressViewController.swift; sourceTree = "<group>"; };
 		2200543318BC54F5002A6E8B /* SegmentedControlViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = SegmentedControlViewController.swift; sourceTree = "<group>"; };
@@ -90,28 +97,35 @@
 		228DBA0718BC53F1002BA12A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		3E5C084F1974991E00969DD7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		5312D0F122848B0200048DE2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Base; path = Base.lproj/Credits.rtf; sourceTree = "<group>"; };
-		533BD78C1F8BE1A6007D5C3B /* DetailViewManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewManager.swift; sourceTree = "<group>"; };
-		533BD7941F8BF6A4007D5C3B /* UIViewController+SizeChange.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+SizeChange.swift"; sourceTree = "<group>"; };
-		533BD7961F8BF8B0007D5C3B /* BaseTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseTableViewController.swift; sourceTree = "<group>"; };
-		533BD7BA1F8D2B07007D5C3B /* SearchBarsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchBarsTableViewController.swift; sourceTree = "<group>"; };
-		533BD7BB1F8D2B07007D5C3B /* ToolbarsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarsTableViewController.swift; sourceTree = "<group>"; };
-		5341627B1F291F310007BCCA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ToolbarViewControllers.storyboard; sourceTree = "<group>"; };
+		5340A1B12496CF64004F3666 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/DefaultToolbarViewController.storyboard; sourceTree = "<group>"; };
+		5340A1B32496CF64004F3666 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/CustomToolbarViewController.storyboard; sourceTree = "<group>"; };
+		5340A1B52496CF64004F3666 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/TintedToolbarViewController.storyboard; sourceTree = "<group>"; };
 		5359C3081F194CF0007F0EC7 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
+		535D32B124970EF10011E153 /* SceneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
+		5364C08A249696D7009A9A52 /* OutlineViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OutlineViewController.swift; sourceTree = "<group>"; };
+		5364C08F2496BEFD009A9A52 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/DefaultSearchBarViewController.storyboard; sourceTree = "<group>"; };
+		5364C0912496BEFD009A9A52 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/CustomSearchBarViewController.storyboard; sourceTree = "<group>"; };
+		5364C0962496C2B3009A9A52 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/DefaultPageControlViewController.storyboard; sourceTree = "<group>"; };
+		5364C0982496C2B3009A9A52 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/CustomPageControlViewController.storyboard; sourceTree = "<group>"; };
 		53654E222298881200B999C7 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
-		537357131F291E6700FAB742 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/SearchViewControllers.storyboard; sourceTree = "<group>"; };
 		538B36F31F2A8D97002AE100 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/DatePickerController.storyboard; sourceTree = "<group>"; };
 		538B36F61F2A8E66002AE100 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/TextViewController.storyboard; sourceTree = "<group>"; };
 		539029FE1F2A53AD009775E3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/AlertControllerViewController.storyboard; sourceTree = "<group>"; };
 		539C6BA91F27F4980006C5A9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ActivityIndicatorViewController.storyboard; sourceTree = "<group>"; };
 		539C6BAB1F27F4980006C5A9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		539C6BAD1F27F4980006C5A9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/WebViewController.storyboard; sourceTree = "<group>"; };
-		539C6BB11F27F4A70006C5A9 /* MasterViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MasterViewController.swift; sourceTree = "<group>"; };
+		53A266AE2491ED77008EADBB /* ImagePickerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImagePickerViewController.swift; sourceTree = "<group>"; };
+		53A266AF2491ED77008EADBB /* CustomPageControlViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomPageControlViewController.swift; sourceTree = "<group>"; };
+		53A266B12491ED77008EADBB /* ColorPickerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorPickerViewController.swift; sourceTree = "<group>"; };
+		53A266B22491ED77008EADBB /* FontPickerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FontPickerViewController.swift; sourceTree = "<group>"; };
+		53A266BB2491ED9E008EADBB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ImagePickerViewController.storyboard; sourceTree = "<group>"; };
+		53A266BF2491ED9E008EADBB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ColorPickerViewController.storyboard; sourceTree = "<group>"; };
+		53A266C12491ED9E008EADBB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/FontPickerViewController.storyboard; sourceTree = "<group>"; };
 		53B791D51F854B4700AB2FA6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = Base; path = Base.lproj/content.html; sourceTree = "<group>"; };
 		53B791D71F854B4700AB2FA6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		53B791D91F854B4800AB2FA6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = "<group>"; };
 		53CE5AD71F2A89E500D8A656 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ButtonViewController.storyboard; sourceTree = "<group>"; };
 		53CE5ADD1F2A8A3D00D8A656 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ImageViewController.storyboard; sourceTree = "<group>"; };
-		53CE5AE21F2A8AD200D8A656 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/PageControlViewController.storyboard; sourceTree = "<group>"; };
 		53CE5AE51F2A8AEF00D8A656 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/PickerViewController.storyboard; sourceTree = "<group>"; };
 		53CE5AE81F2A8B1000D8A656 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ProgressViewController.storyboard; sourceTree = "<group>"; };
 		53CE5AEB1F2A8B2F00D8A656 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/SegmentedControlViewController.storyboard; sourceTree = "<group>"; };
@@ -171,7 +185,9 @@
 			children = (
 				53DDE73C22776382000006CF /* UIKitCatalog.entitlements */,
 				3E2459D41931CCB5002D3369 /* Application */,
-				3E1DA7601931CC99000114A9 /* View Controllers */,
+				3E1DA7601931CC99000114A9 /* Controls */,
+				539383DE2492800100A489A9 /* Views */,
+				539383DF2492801000A489A9 /* Pickers */,
 				228DBA0718BC53F1002BA12A /* Assets.xcassets */,
 				228DB9F618BC53F1002BA12A /* Supporting Files */,
 			);
@@ -195,9 +211,10 @@
 		22B7BB9718BC601D006C4AD5 /* Search */ = {
 			isa = PBXGroup;
 			children = (
-				533BD7BA1F8D2B07007D5C3B /* SearchBarsTableViewController.swift */,
-				3E6AE84D196B1FC10062A3E1 /* Search Bar */,
-				537357121F291E6700FAB742 /* SearchViewControllers.storyboard */,
+				2200542518BC54EC002A6E8B /* DefaultSearchBarViewController.swift */,
+				2200542218BC54EC002A6E8B /* CustomSearchBarViewController.swift */,
+				5364C0902496BEFD009A9A52 /* CustomSearchBarViewController.storyboard */,
+				5364C08E2496BEFD009A9A52 /* DefaultSearchBarViewController.storyboard */,
 			);
 			name = Search;
 			sourceTree = "<group>";
@@ -205,75 +222,56 @@
 		22B7BB9818BC6024006C4AD5 /* Toolbar */ = {
 			isa = PBXGroup;
 			children = (
-				533BD7BB1F8D2B07007D5C3B /* ToolbarsTableViewController.swift */,
 				2200542618BC54EC002A6E8B /* DefaultToolbarViewController.swift */,
 				2200543A18BC54F5002A6E8B /* TintedToolbarViewController.swift */,
 				2200542318BC54EC002A6E8B /* CustomToolbarViewController.swift */,
-				5341627A1F291F310007BCCA /* ToolbarViewControllers.storyboard */,
+				5340A1B22496CF64004F3666 /* CustomToolbarViewController.storyboard */,
+				5340A1B02496CF64004F3666 /* DefaultToolbarViewController.storyboard */,
+				5340A1B42496CF64004F3666 /* TintedToolbarViewController.storyboard */,
 			);
 			name = Toolbar;
 			sourceTree = "<group>";
 		};
-		3E1DA7601931CC99000114A9 /* View Controllers */ = {
+		3E1DA7601931CC99000114A9 /* Controls */ = {
 			isa = PBXGroup;
 			children = (
-				2200541A18BC54E8002A6E8B /* ActivityIndicatorViewController.swift */,
-				539C6BA81F27F4980006C5A9 /* ActivityIndicatorViewController.storyboard */,
-				2200541B18BC54E8002A6E8B /* AlertControllerViewController.swift */,
-				539029FD1F2A53AD009775E3 /* AlertControllerViewController.storyboard */,
 				2200542118BC54EC002A6E8B /* ButtonViewController.swift */,
 				53CE5AD61F2A89E500D8A656 /* ButtonViewController.storyboard */,
-				2200542418BC54EC002A6E8B /* DatePickerController.swift */,
-				538B36F21F2A8D97002AE100 /* DatePickerController.storyboard */,
-				2200542D18BC54F5002A6E8B /* ImageViewController.swift */,
-				53CE5ADC1F2A8A3D00D8A656 /* ImageViewController.storyboard */,
-				2200543018BC54F5002A6E8B /* PageControlViewController.swift */,
-				53CE5AE11F2A8AD200D8A656 /* PageControlViewController.storyboard */,
-				2200543118BC54F5002A6E8B /* PickerViewController.swift */,
-				53CE5AE41F2A8AEF00D8A656 /* PickerViewController.storyboard */,
-				2200543218BC54F5002A6E8B /* ProgressViewController.swift */,
-				53CE5AE71F2A8B1000D8A656 /* ProgressViewController.storyboard */,
+				5364C0942496C22D009A9A52 /* Page Control */,
+				22B7BB9718BC601D006C4AD5 /* Search */,
 				2200543318BC54F5002A6E8B /* SegmentedControlViewController.swift */,
 				53CE5AEA1F2A8B2F00D8A656 /* SegmentedControlViewController.storyboard */,
 				2200543418BC54F5002A6E8B /* SliderViewController.swift */,
 				53CE5AED1F2A8B4F00D8A656 /* SliderViewController.storyboard */,
-				B50F41071B1D284700E5147D /* StackViewController.swift */,
-				53CE5AF01F2A8B8300D8A656 /* StackViewController.storyboard */,
 				2200543618BC54F5002A6E8B /* StepperViewController.swift */,
 				53CE5AF31F2A8BB000D8A656 /* StepperViewController.storyboard */,
 				2200543718BC54F5002A6E8B /* SwitchViewController.swift */,
 				53CE5AF61F2A8BD000D8A656 /* SwitchViewController.storyboard */,
 				2200543818BC54F5002A6E8B /* TextFieldViewController.swift */,
 				53CE5AF91F2A8BEB00D8A656 /* TextFieldViewController.storyboard */,
-				2200543918BC54F5002A6E8B /* TextViewController.swift */,
-				538B36F51F2A8E66002AE100 /* TextViewController.storyboard */,
-				2200543B18BC54F5002A6E8B /* WebViewController.swift */,
-				539C6BAC1F27F4980006C5A9 /* WebViewController.storyboard */,
-				22B7BB9718BC601D006C4AD5 /* Search */,
-				22B7BB9818BC6024006C4AD5 /* Toolbar */,
 			);
-			name = "View Controllers";
+			name = Controls;
 			sourceTree = "<group>";
 		};
 		3E2459D41931CCB5002D3369 /* Application */ = {
 			isa = PBXGroup;
 			children = (
 				2200541C18BC54E8002A6E8B /* AppDelegate.swift */,
-				533BD78C1F8BE1A6007D5C3B /* DetailViewManager.swift */,
-				539C6BB11F27F4A70006C5A9 /* MasterViewController.swift */,
-				533BD7941F8BF6A4007D5C3B /* UIViewController+SizeChange.swift */,
-				533BD7961F8BF8B0007D5C3B /* BaseTableViewController.swift */,
+				535D32B124970EF10011E153 /* SceneDelegate.swift */,
+				5364C08A249696D7009A9A52 /* OutlineViewController.swift */,
 			);
 			name = Application;
 			sourceTree = "<group>";
 		};
-		3E6AE84D196B1FC10062A3E1 /* Search Bar */ = {
+		5364C0942496C22D009A9A52 /* Page Control */ = {
 			isa = PBXGroup;
 			children = (
-				2200542518BC54EC002A6E8B /* DefaultSearchBarViewController.swift */,
-				2200542218BC54EC002A6E8B /* CustomSearchBarViewController.swift */,
+				2200543018BC54F5002A6E8B /* DefaultPageControlViewController.swift */,
+				53A266AF2491ED77008EADBB /* CustomPageControlViewController.swift */,
+				5364C0972496C2B3009A9A52 /* CustomPageControlViewController.storyboard */,
+				5364C0952496C2B3009A9A52 /* DefaultPageControlViewController.storyboard */,
 			);
-			name = "Search Bar";
+			name = "Page Control";
 			sourceTree = "<group>";
 		};
 		53654E212298881100B999C7 /* Frameworks */ = {
@@ -284,6 +282,45 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		539383DE2492800100A489A9 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				2200541A18BC54E8002A6E8B /* ActivityIndicatorViewController.swift */,
+				539C6BA81F27F4980006C5A9 /* ActivityIndicatorViewController.storyboard */,
+				2200541B18BC54E8002A6E8B /* AlertControllerViewController.swift */,
+				539029FD1F2A53AD009775E3 /* AlertControllerViewController.storyboard */,
+				2200542D18BC54F5002A6E8B /* ImageViewController.swift */,
+				53CE5ADC1F2A8A3D00D8A656 /* ImageViewController.storyboard */,
+				2200543218BC54F5002A6E8B /* ProgressViewController.swift */,
+				53CE5AE71F2A8B1000D8A656 /* ProgressViewController.storyboard */,
+				B50F41071B1D284700E5147D /* StackViewController.swift */,
+				53CE5AF01F2A8B8300D8A656 /* StackViewController.storyboard */,
+				2200543918BC54F5002A6E8B /* TextViewController.swift */,
+				538B36F51F2A8E66002AE100 /* TextViewController.storyboard */,
+				22B7BB9818BC6024006C4AD5 /* Toolbar */,
+				2200543B18BC54F5002A6E8B /* WebViewController.swift */,
+				539C6BAC1F27F4980006C5A9 /* WebViewController.storyboard */,
+			);
+			name = Views;
+			sourceTree = "<group>";
+		};
+		539383DF2492801000A489A9 /* Pickers */ = {
+			isa = PBXGroup;
+			children = (
+				2200542418BC54EC002A6E8B /* DatePickerController.swift */,
+				538B36F21F2A8D97002AE100 /* DatePickerController.storyboard */,
+				2200543118BC54F5002A6E8B /* PickerViewController.swift */,
+				53CE5AE41F2A8AEF00D8A656 /* PickerViewController.storyboard */,
+				53A266B12491ED77008EADBB /* ColorPickerViewController.swift */,
+				53A266BE2491ED9E008EADBB /* ColorPickerViewController.storyboard */,
+				53A266B22491ED77008EADBB /* FontPickerViewController.swift */,
+				53A266C02491ED9E008EADBB /* FontPickerViewController.storyboard */,
+				53A266AE2491ED77008EADBB /* ImagePickerViewController.swift */,
+				53A266BA2491ED9E008EADBB /* ImagePickerViewController.storyboard */,
+			);
+			name = Pickers;
+			sourceTree = "<group>";
+		};
 		D9361AEE59ED9397893793F6 /* LICENSE */ = {
 			isa = PBXGroup;
 			children = (
@@ -320,7 +357,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = Apple;
 				TargetAttributes = {
 					228DB9F218BC53F1002BA12A = {
@@ -352,29 +389,36 @@
 			buildActionMask = 2147483647;
 			files = (
 				539C6BB01F27F4980006C5A9 /* WebViewController.storyboard in Resources */,
+				5364C09A2496C2B3009A9A52 /* CustomPageControlViewController.storyboard in Resources */,
 				53CE5AD81F2A89E500D8A656 /* ButtonViewController.storyboard in Resources */,
+				53A266C42491ED9E008EADBB /* ColorPickerViewController.storyboard in Resources */,
 				53CE5AEF1F2A8B4F00D8A656 /* SliderViewController.storyboard in Resources */,
-				537357141F291E6700FAB742 /* SearchViewControllers.storyboard in Resources */,
+				53A266C52491ED9E008EADBB /* FontPickerViewController.storyboard in Resources */,
+				5364C0922496BEFD009A9A52 /* DefaultSearchBarViewController.storyboard in Resources */,
 				53CE5AE91F2A8B1000D8A656 /* ProgressViewController.storyboard in Resources */,
+				53A266C22491ED9E008EADBB /* ImagePickerViewController.storyboard in Resources */,
+				5364C0992496C2B3009A9A52 /* DefaultPageControlViewController.storyboard in Resources */,
+				5340A1B72496CF64004F3666 /* CustomToolbarViewController.storyboard in Resources */,
 				53CE5AE61F2A8AEF00D8A656 /* PickerViewController.storyboard in Resources */,
 				53B791DA1F85505400AB2FA6 /* content.html in Resources */,
 				3E5C084E1974991E00969DD7 /* Main.storyboard in Resources */,
 				53CE5AEC1F2A8B2F00D8A656 /* SegmentedControlViewController.storyboard in Resources */,
+				5364C0932496BEFD009A9A52 /* CustomSearchBarViewController.storyboard in Resources */,
 				53B791DB1F85505700AB2FA6 /* InfoPlist.strings in Resources */,
 				539C6BAE1F27F4980006C5A9 /* ActivityIndicatorViewController.storyboard in Resources */,
 				53CE5AFB1F2A8BEB00D8A656 /* TextFieldViewController.storyboard in Resources */,
-				5341627C1F291F310007BCCA /* ToolbarViewControllers.storyboard in Resources */,
 				53B791DC1F85505A00AB2FA6 /* Localizable.strings in Resources */,
 				228DBA0818BC53F1002BA12A /* Assets.xcassets in Resources */,
 				538B36F41F2A8E06002AE100 /* DatePickerController.storyboard in Resources */,
-				53CE5AE31F2A8AD200D8A656 /* PageControlViewController.storyboard in Resources */,
 				53CE5AF21F2A8B8300D8A656 /* StackViewController.storyboard in Resources */,
+				5340A1B82496CF64004F3666 /* TintedToolbarViewController.storyboard in Resources */,
 				538B36F71F2A8E8A002AE100 /* TextViewController.storyboard in Resources */,
 				539C6BAF1F27F4980006C5A9 /* LaunchScreen.storyboard in Resources */,
 				5312D0F222848B0200048DE2 /* Credits.rtf in Resources */,
 				539029FF1F2A53AD009775E3 /* AlertControllerViewController.storyboard in Resources */,
 				53CE5AF51F2A8BB000D8A656 /* StepperViewController.storyboard in Resources */,
 				53CE5AF81F2A8BD000D8A656 /* SwitchViewController.storyboard in Resources */,
+				5340A1B62496CF64004F3666 /* DefaultToolbarViewController.storyboard in Resources */,
 				53CE5ADE1F2A8A3D00D8A656 /* ImageViewController.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -386,34 +430,34 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2200544018BC54F5002A6E8B /* PickerViewController.swift in Sources */,
-				2200543F18BC54F5002A6E8B /* PageControlViewController.swift in Sources */,
-				533BD7951F8BF6A4007D5C3B /* UIViewController+SizeChange.swift in Sources */,
+				2200543F18BC54F5002A6E8B /* DefaultPageControlViewController.swift in Sources */,
 				2200544918BC54F5002A6E8B /* TintedToolbarViewController.swift in Sources */,
+				5364C08C249696D7009A9A52 /* OutlineViewController.swift in Sources */,
 				2200544318BC54F5002A6E8B /* SliderViewController.swift in Sources */,
 				2200544218BC54F5002A6E8B /* SegmentedControlViewController.swift in Sources */,
 				2200544A18BC54F5002A6E8B /* WebViewController.swift in Sources */,
 				2200542018BC54E8002A6E8B /* AppDelegate.swift in Sources */,
-				539C6BB21F27F4A70006C5A9 /* MasterViewController.swift in Sources */,
+				5340A1B92496D670004F3666 /* PickerViewController.swift in Sources */,
+				53A266B92491ED77008EADBB /* FontPickerViewController.swift in Sources */,
 				2200541F18BC54E8002A6E8B /* AlertControllerViewController.swift in Sources */,
 				2200542C18BC54EC002A6E8B /* DefaultToolbarViewController.swift in Sources */,
 				2200543C18BC54F5002A6E8B /* ImageViewController.swift in Sources */,
 				2200541E18BC54E8002A6E8B /* ActivityIndicatorViewController.swift in Sources */,
-				533BD7BD1F8D2B08007D5C3B /* ToolbarsTableViewController.swift in Sources */,
 				2200544618BC54F5002A6E8B /* SwitchViewController.swift in Sources */,
-				533BD7971F8BF8B0007D5C3B /* BaseTableViewController.swift in Sources */,
 				B50F41081B1D284700E5147D /* StackViewController.swift in Sources */,
+				535D32B224970EF10011E153 /* SceneDelegate.swift in Sources */,
 				2200544118BC54F5002A6E8B /* ProgressViewController.swift in Sources */,
 				2200544718BC54F5002A6E8B /* TextFieldViewController.swift in Sources */,
 				2200544818BC54F5002A6E8B /* TextViewController.swift in Sources */,
 				2200542B18BC54EC002A6E8B /* DefaultSearchBarViewController.swift in Sources */,
 				2200544518BC54F5002A6E8B /* StepperViewController.swift in Sources */,
+				53A266B62491ED77008EADBB /* CustomPageControlViewController.swift in Sources */,
+				53A266B82491ED77008EADBB /* ColorPickerViewController.swift in Sources */,
 				2200542818BC54EC002A6E8B /* CustomSearchBarViewController.swift in Sources */,
-				533BD7BC1F8D2B08007D5C3B /* SearchBarsTableViewController.swift in Sources */,
+				53A266B52491ED77008EADBB /* ImagePickerViewController.swift in Sources */,
 				2200542918BC54EC002A6E8B /* CustomToolbarViewController.swift in Sources */,
 				2200542A18BC54EC002A6E8B /* DatePickerController.swift in Sources */,
 				2200542718BC54EC002A6E8B /* ButtonViewController.swift in Sources */,
-				533BD78D1F8BE1A6007D5C3B /* DetailViewManager.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -436,20 +480,60 @@
 			name = Credits.rtf;
 			sourceTree = "<group>";
 		};
-		5341627A1F291F310007BCCA /* ToolbarViewControllers.storyboard */ = {
+		5340A1B02496CF64004F3666 /* DefaultToolbarViewController.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
-				5341627B1F291F310007BCCA /* Base */,
+				5340A1B12496CF64004F3666 /* Base */,
 			);
-			name = ToolbarViewControllers.storyboard;
+			name = DefaultToolbarViewController.storyboard;
 			sourceTree = "<group>";
 		};
-		537357121F291E6700FAB742 /* SearchViewControllers.storyboard */ = {
+		5340A1B22496CF64004F3666 /* CustomToolbarViewController.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
-				537357131F291E6700FAB742 /* Base */,
+				5340A1B32496CF64004F3666 /* Base */,
 			);
-			name = SearchViewControllers.storyboard;
+			name = CustomToolbarViewController.storyboard;
+			sourceTree = "<group>";
+		};
+		5340A1B42496CF64004F3666 /* TintedToolbarViewController.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				5340A1B52496CF64004F3666 /* Base */,
+			);
+			name = TintedToolbarViewController.storyboard;
+			sourceTree = "<group>";
+		};
+		5364C08E2496BEFD009A9A52 /* DefaultSearchBarViewController.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				5364C08F2496BEFD009A9A52 /* Base */,
+			);
+			name = DefaultSearchBarViewController.storyboard;
+			sourceTree = "<group>";
+		};
+		5364C0902496BEFD009A9A52 /* CustomSearchBarViewController.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				5364C0912496BEFD009A9A52 /* Base */,
+			);
+			name = CustomSearchBarViewController.storyboard;
+			sourceTree = "<group>";
+		};
+		5364C0952496C2B3009A9A52 /* DefaultPageControlViewController.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				5364C0962496C2B3009A9A52 /* Base */,
+			);
+			name = DefaultPageControlViewController.storyboard;
+			sourceTree = "<group>";
+		};
+		5364C0972496C2B3009A9A52 /* CustomPageControlViewController.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				5364C0982496C2B3009A9A52 /* Base */,
+			);
+			name = CustomPageControlViewController.storyboard;
 			sourceTree = "<group>";
 		};
 		538B36F21F2A8D97002AE100 /* DatePickerController.storyboard */ = {
@@ -500,6 +584,30 @@
 			name = WebViewController.storyboard;
 			sourceTree = "<group>";
 		};
+		53A266BA2491ED9E008EADBB /* ImagePickerViewController.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				53A266BB2491ED9E008EADBB /* Base */,
+			);
+			name = ImagePickerViewController.storyboard;
+			sourceTree = "<group>";
+		};
+		53A266BE2491ED9E008EADBB /* ColorPickerViewController.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				53A266BF2491ED9E008EADBB /* Base */,
+			);
+			name = ColorPickerViewController.storyboard;
+			sourceTree = "<group>";
+		};
+		53A266C02491ED9E008EADBB /* FontPickerViewController.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				53A266C12491ED9E008EADBB /* Base */,
+			);
+			name = FontPickerViewController.storyboard;
+			sourceTree = "<group>";
+		};
 		53B791D41F854B4700AB2FA6 /* content.html */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -540,14 +648,6 @@
 			name = ImageViewController.storyboard;
 			sourceTree = "<group>";
 		};
-		53CE5AE11F2A8AD200D8A656 /* PageControlViewController.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				53CE5AE21F2A8AD200D8A656 /* Base */,
-			);
-			name = PageControlViewController.storyboard;
-			sourceTree = "<group>";
-		};
 		53CE5AE41F2A8AEF00D8A656 /* PickerViewController.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -639,6 +739,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -663,7 +764,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = "";
@@ -695,6 +796,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -712,7 +814,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = "";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -729,8 +831,9 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "$(SRCROOT)/UIKitCatalog/UIKitCatalog-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
+				MARKETING_VERSION = 16;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.example.apple-samplecode.${PRODUCT_NAME:rfc1034identifier}${SAMPLE_CODE_DISAMBIGUATOR}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -750,8 +853,9 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "$(SRCROOT)/UIKitCatalog/UIKitCatalog-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
+				MARKETING_VERSION = 16;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.example.apple-samplecode.${PRODUCT_NAME:rfc1034identifier}${SAMPLE_CODE_DISAMBIGUATOR}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

UIKitCatalog/AppDelegate.swift

@@ -8,29 +8,11 @@ The application-specific delegate class.
 import UIKit
 
 @UIApplicationMain
-class AppDelegate: NSObject, UIApplicationDelegate, UISplitViewControllerDelegate {
-    // MARK: - Properties
-
-    var window: UIWindow?
-	
-	/** The detailViewManager is responsible for maintaining the UISplitViewController delegation
-		and for managing the detail view controller of the split view.
-	*/
-	var detailViewManager = DetailViewManager()
-	
-    // MARK: - UIApplicationDelegate
+class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-		if let splitViewController = window!.rootViewController as? UISplitViewController {
-            splitViewController.preferredDisplayMode = .allVisible
-			splitViewController.delegate = detailViewManager
-			detailViewManager.splitViewController = splitViewController
-            
-            // Set the master view controller table view with translucent background.
-            splitViewController.primaryBackgroundStyle = .sidebar
-        }
-        
         return true
     }
 
 }
+

UIKitCatalog/Base.lproj/ButtonViewController.storyboard

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.11" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="gl0-hM-EWg">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="gl0-hM-EWg">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.13"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -13,7 +14,7 @@
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="gDs-OX-aHt">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                        <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                         <sections>
                             <tableViewSection headerTitle="System (Text)" id="ZP1-Vp-Dmj">
                                 <cells>
@@ -24,7 +25,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Kt-uW-BR1">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Kt-uW-BR1">
                                                     <rect key="frame" x="164.5" y="7" width="46" height="30"/>
                                                     <state key="normal" title="Button"/>
                                                 </button>
@@ -88,7 +89,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tGF-rn-9B7">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tGF-rn-9B7">
                                                     <rect key="frame" x="146.5" y="7" width="82" height="30"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="30" id="3yG-gd-js4"/>
@@ -114,7 +115,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ynp-Un-3Nj">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ynp-Un-3Nj">
                                                     <rect key="frame" x="164.5" y="7" width="46" height="30"/>
                                                     <state key="normal" title="Button"/>
                                                 </button>
@@ -136,7 +137,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QwT-La-9Hy">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QwT-La-9Hy">
                                                     <rect key="frame" x="172.5" y="7" width="30" height="30"/>
                                                 </button>
                                             </subviews>
@@ -157,7 +158,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oaQ-1y-atp">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oaQ-1y-atp">
                                                     <rect key="frame" x="164.5" y="7" width="46" height="30"/>
                                                     <state key="normal" title="Button"/>
                                                 </button>
@@ -170,6 +171,28 @@
                                     </tableViewCell>
                                 </cells>
                             </tableViewSection>
+                            <tableViewSection headerTitle="System (Menu)" id="JI3-Nv-lhU" userLabel="System (Menu)">
+                                <cells>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="5do-Y4-XZ3">
+                                        <rect key="frame" x="0.0" y="699.5" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5do-Y4-XZ3" id="SkS-Fh-7aO">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e8l-iZ-Xgp">
+                                                    <rect key="frame" x="164.5" y="7" width="46" height="30"/>
+                                                    <state key="normal" title="Button"/>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="centerY" secondItem="e8l-iZ-Xgp" secondAttribute="centerY" id="TJT-8l-A9J"/>
+                                                <constraint firstAttribute="centerX" secondItem="e8l-iZ-Xgp" secondAttribute="centerX" id="j0q-Fg-J0m"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
                         </sections>
                         <connections>
                             <outlet property="dataSource" destination="gl0-hM-EWg" id="CGJ-ZK-3Nr"/>
@@ -181,6 +204,7 @@
                     <connections>
                         <outlet property="attributedTextButton" destination="ynp-Un-3Nj" id="GnF-wA-dTM"/>
                         <outlet property="imageButton" destination="tGF-rn-9B7" id="TOD-ga-eqT"/>
+                        <outlet property="menuButton" destination="e8l-iZ-Xgp" id="QPX-YE-FIT"/>
                         <outlet property="symbolButton" destination="QwT-La-9Hy" id="sIN-Di-Y0D"/>
                         <outlet property="symbolTextButton" destination="oaQ-1y-atp" id="Xem-ED-whh"/>
                         <outlet property="systemContactAddButton" destination="Kaz-JT-zT4" id="U38-FM-tgn"/>
@@ -193,4 +217,9 @@
             <point key="canvasLocation" x="-2593" y="3368"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="groupTableViewBackgroundColor">
+            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
 </document>

UIKitCatalog/Base.lproj/ColorPickerViewController.storyboard

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="hIc-I2-PiV">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Color Picker-->
+        <scene sceneID="gkd-fd-9L5">
+            <objects>
+                <viewController storyboardIdentifier="ColorPickerViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="hIc-I2-PiV" customClass="ColorPickerViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="EB5-Ny-mbq">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TH8-Ct-wSJ">
+                                <rect key="frame" x="134.5" y="61" width="106" height="30"/>
+                                <state key="normal" title="Choose a Color"/>
+                                <connections>
+                                    <action selector="presentColorPicker:" destination="hIc-I2-PiV" eventType="touchUpInside" id="iGk-NE-lKX"/>
+                                </connections>
+                            </button>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jh0-Q9-KCm">
+                                <rect key="frame" x="124.5" y="108" width="126" height="98"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="98" id="6aO-dy-av9"/>
+                                    <constraint firstAttribute="width" constant="126" id="TyY-A7-xPQ"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="4kY-K9-p6O"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="jh0-Q9-KCm" firstAttribute="top" secondItem="TH8-Ct-wSJ" secondAttribute="bottom" constant="17" id="N8H-6M-FNl"/>
+                            <constraint firstItem="TH8-Ct-wSJ" firstAttribute="top" secondItem="4kY-K9-p6O" secondAttribute="top" constant="17" id="at2-nG-mUW"/>
+                            <constraint firstItem="jh0-Q9-KCm" firstAttribute="centerX" secondItem="4kY-K9-p6O" secondAttribute="centerX" id="kdQ-0C-0zo"/>
+                            <constraint firstItem="TH8-Ct-wSJ" firstAttribute="centerX" secondItem="4kY-K9-p6O" secondAttribute="centerX" id="w18-a2-nCa"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Color Picker" id="dbS-ug-Aqt"/>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
+                    <connections>
+                        <outlet property="colorView" destination="jh0-Q9-KCm" id="2zU-fc-9B4"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="TYZ-t7-BMO" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1224.8" y="3367.4662668665669"/>
+        </scene>
+    </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

UIKitCatalog/Base.lproj/Credits.rtf

@@ -1,9 +1,9 @@
-{\rtf1\ansi\ansicpg1252\cocoartf2467
+{\rtf1\ansi\ansicpg1252\cocoartf2513
 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red0\green0\blue0;}
 {\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;}
 \vieww9000\viewh8400\viewkind0
 \pard\tx960\tx1920\tx2880\tx3840\tx4800\tx5760\tx6720\tx7680\tx8640\tx9600\qc\partightenfactor0
 
-\f0\fs20 \cf2 Demonstrates how to use UIKit's views and controls.\
+\f0\fs20 \cf2 Demonstrates how to use UIKit's views, controls and pickers.\
 }

UIKitCatalog/Base.lproj/CustomPageControlViewController.storyboard

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="u2L-Jd-VCE">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Custom Page Control-->
+        <scene sceneID="udW-QU-LPM">
+            <objects>
+                <viewController storyboardIdentifier="CustomPageControlViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="u2L-Jd-VCE" userLabel="Custom Page Control" customClass="CustomPageControlViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="t2L-wD-sqn">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <pageControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="3" translatesAutoresizingMaskIntoConstraints="NO" id="Gh3-95-IbM">
+                                <rect key="frame" x="16" y="639.5" width="343" height="27.5"/>
+                                <color key="pageIndicatorTintColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="currentPageIndicatorTintColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </pageControl>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TvB-mq-DIF">
+                                <rect key="frame" x="40" y="79" width="295" height="548"/>
+                            </view>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="isq-DF-MTA"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="isq-DF-MTA" firstAttribute="centerX" secondItem="TvB-mq-DIF" secondAttribute="centerX" id="K2i-tf-9HR"/>
+                            <constraint firstItem="TvB-mq-DIF" firstAttribute="leading" secondItem="isq-DF-MTA" secondAttribute="leading" constant="40" id="Mbc-UO-sjJ"/>
+                            <constraint firstItem="isq-DF-MTA" firstAttribute="bottom" secondItem="TvB-mq-DIF" secondAttribute="bottom" constant="40" id="NqT-rO-cvE"/>
+                            <constraint firstItem="Gh3-95-IbM" firstAttribute="leading" secondItem="t2L-wD-sqn" secondAttribute="leadingMargin" id="RLd-Lf-yhf"/>
+                            <constraint firstItem="Gh3-95-IbM" firstAttribute="trailing" secondItem="t2L-wD-sqn" secondAttribute="trailingMargin" id="SZA-VK-daz"/>
+                            <constraint firstItem="isq-DF-MTA" firstAttribute="trailing" secondItem="TvB-mq-DIF" secondAttribute="trailing" constant="40" id="X85-IY-Q9v"/>
+                            <constraint firstItem="isq-DF-MTA" firstAttribute="bottom" secondItem="Gh3-95-IbM" secondAttribute="bottom" id="YPt-UX-jw9"/>
+                            <constraint firstItem="TvB-mq-DIF" firstAttribute="centerX" secondItem="Gh3-95-IbM" secondAttribute="centerX" id="x8V-ZY-UeU"/>
+                            <constraint firstItem="TvB-mq-DIF" firstAttribute="top" secondItem="isq-DF-MTA" secondAttribute="top" constant="35" id="xNz-ju-prT"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Custom Page Control" id="PbU-Bl-SQ6"/>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
+                    <connections>
+                        <outlet property="colorView" destination="TvB-mq-DIF" id="GTB-y8-Ldh"/>
+                        <outlet property="pageControl" destination="Gh3-95-IbM" id="MFl-im-vCD"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="L6J-BU-x8U" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="10410" y="4180"/>
+        </scene>
+    </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

UIKitCatalog/Base.lproj/CustomSearchBarViewController.storyboard

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Mhd-Bs-sIn">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Custom Search Bar-->
+        <scene sceneID="dd9-nR-VNk">
+            <objects>
+                <viewController storyboardIdentifier="CustomSearchBarViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Mhd-Bs-sIn" customClass="CustomSearchBarViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="YVy-et-UAQ">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="d4g-eI-DIw">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
+                                <textInputTraits key="textInputTraits"/>
+                                <connections>
+                                    <outlet property="delegate" destination="Mhd-Bs-sIn" id="fpK-JW-vvF"/>
+                                </connections>
+                            </searchBar>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="rtX-bw-2xb"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="rtX-bw-2xb" firstAttribute="trailing" secondItem="d4g-eI-DIw" secondAttribute="trailing" id="ROc-RY-l7C"/>
+                            <constraint firstItem="d4g-eI-DIw" firstAttribute="top" secondItem="rtX-bw-2xb" secondAttribute="top" id="dkH-R8-Hqu"/>
+                            <constraint firstItem="d4g-eI-DIw" firstAttribute="leading" secondItem="rtX-bw-2xb" secondAttribute="leading" id="vxX-VT-mrY"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Custom Search Bar" id="hvS-xa-PyN"/>
+                    <connections>
+                        <outlet property="searchBar" destination="d4g-eI-DIw" id="T7j-hM-2Yj"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="2tu-qT-QdC" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="10566" y="4140"/>
+        </scene>
+    </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

UIKitCatalog/Base.lproj/CustomToolbarViewController.storyboard

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="cTo-Y6-RL4">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Custom Toolbar-->
+        <scene sceneID="WJu-sj-7Ti">
+            <objects>
+                <viewController storyboardIdentifier="CustomToolbarViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="cTo-Y6-RL4" customClass="CustomToolbarViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="YY9-uv-rey">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="I9n-Qd-HUD">
+                                <rect key="frame" x="0.0" y="623" width="375" height="44"/>
+                                <items>
+                                    <barButtonItem title="Item" id="viJ-v6-2TV"/>
+                                </items>
+                            </toolbar>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="DmS-O1-ZiW"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="I9n-Qd-HUD" firstAttribute="leading" secondItem="YY9-uv-rey" secondAttribute="leading" id="B3z-kQ-j9a"/>
+                            <constraint firstAttribute="trailing" secondItem="I9n-Qd-HUD" secondAttribute="trailing" id="oAs-UM-W27"/>
+                            <constraint firstItem="DmS-O1-ZiW" firstAttribute="bottom" secondItem="I9n-Qd-HUD" secondAttribute="bottom" id="ucB-kc-MOE"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Custom Toolbar" id="zZI-0G-SN0"/>
+                    <connections>
+                        <outlet property="toolbar" destination="I9n-Qd-HUD" id="nLt-aO-KWI"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="3hH-GP-gUk" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="10070" y="3898"/>
+        </scene>
+    </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

UIKitCatalog/Base.lproj/DatePickerController.storyboard

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.12" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="7Xn-ho-KP8">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="7Xn-ho-KP8">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.15"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Date Picker-->
         <scene sceneID="zWi-9k-VNG">
             <objects>
-                <viewController id="7Xn-ho-KP8" customClass="DatePickerController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="DatePickerController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="7Xn-ho-KP8" customClass="DatePickerController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="LFl-gd-u3P">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -19,21 +20,21 @@
                                 <rect key="frame" x="27.5" y="225.5" width="320" height="216"/>
                             </datePicker>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="02B-Y8-Hxk">
-                                <rect key="frame" x="16" y="441.5" width="343" height="20.5"/>
+                                <rect key="frame" x="16" y="460.5" width="343" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
+                                <color key="textColor" systemColor="secondaryLabelColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="qI8-L8-DCK"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="02B-Y8-Hxk" firstAttribute="top" secondItem="ebB-3n-o8C" secondAttribute="bottom" id="An0-A4-IS5"/>
+                            <constraint firstItem="02B-Y8-Hxk" firstAttribute="top" secondItem="ebB-3n-o8C" secondAttribute="bottom" constant="19" id="An0-A4-IS5"/>
                             <constraint firstAttribute="leadingMargin" secondItem="02B-Y8-Hxk" secondAttribute="leading" id="Gik-bp-oJf"/>
                             <constraint firstAttribute="trailingMargin" secondItem="02B-Y8-Hxk" secondAttribute="trailing" id="Mif-nA-opd"/>
                             <constraint firstItem="ebB-3n-o8C" firstAttribute="centerY" secondItem="LFl-gd-u3P" secondAttribute="centerY" id="iLb-96-Kao"/>
                             <constraint firstItem="ebB-3n-o8C" firstAttribute="centerX" secondItem="qI8-L8-DCK" secondAttribute="centerX" id="tvU-Ae-9RL"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="qI8-L8-DCK"/>
                     </view>
                     <navigationItem key="navigationItem" title="Date Picker" id="ywp-Wr-kTt"/>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
@@ -47,4 +48,12 @@
             <point key="canvasLocation" x="-1639" y="3368"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="secondaryLabelColor">
+            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>

UIKitCatalog/Base.lproj/DefaultPageControlViewController.storyboard

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="srd-Os-5SR">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Page Control-->
+        <scene sceneID="dMs-Pg-XoX">
+            <objects>
+                <viewController storyboardIdentifier="PageControlViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="srd-Os-5SR" customClass="PageControlViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="KHl-03-rZm">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <pageControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="3" translatesAutoresizingMaskIntoConstraints="NO" id="iUb-xD-abW">
+                                <rect key="frame" x="16" y="639.5" width="343" height="27.5"/>
+                                <color key="pageIndicatorTintColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="currentPageIndicatorTintColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </pageControl>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GkA-xO-cxz">
+                                <rect key="frame" x="40" y="79" width="295" height="548"/>
+                            </view>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="F5O-8y-7mB"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="GkA-xO-cxz" firstAttribute="top" secondItem="F5O-8y-7mB" secondAttribute="top" constant="35" id="5Jn-ca-psu"/>
+                            <constraint firstItem="F5O-8y-7mB" firstAttribute="centerX" secondItem="GkA-xO-cxz" secondAttribute="centerX" id="6ww-c0-eQv"/>
+                            <constraint firstItem="GkA-xO-cxz" firstAttribute="centerX" secondItem="iUb-xD-abW" secondAttribute="centerX" id="Kaf-Dc-22V"/>
+                            <constraint firstItem="F5O-8y-7mB" firstAttribute="trailing" secondItem="GkA-xO-cxz" secondAttribute="trailing" constant="40" id="QY1-Gz-Dqb"/>
+                            <constraint firstItem="F5O-8y-7mB" firstAttribute="bottom" secondItem="GkA-xO-cxz" secondAttribute="bottom" constant="40" id="Ypi-w7-Fwd"/>
+                            <constraint firstItem="iUb-xD-abW" firstAttribute="leading" secondItem="KHl-03-rZm" secondAttribute="leadingMargin" id="aKA-0e-L9l"/>
+                            <constraint firstItem="iUb-xD-abW" firstAttribute="trailing" secondItem="KHl-03-rZm" secondAttribute="trailingMargin" id="l5n-Lq-4kr"/>
+                            <constraint firstItem="F5O-8y-7mB" firstAttribute="bottom" secondItem="iUb-xD-abW" secondAttribute="bottom" id="sMy-OH-NSQ"/>
+                            <constraint firstItem="GkA-xO-cxz" firstAttribute="leading" secondItem="F5O-8y-7mB" secondAttribute="leading" constant="40" id="vyK-81-yoh"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Page Control" id="GyX-to-cBo"/>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
+                    <connections>
+                        <outlet property="colorView" destination="GkA-xO-cxz" id="0dz-kC-PyW"/>
+                        <outlet property="pageControl" destination="iUb-xD-abW" id="vEu-qJ-hga"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="C3x-4E-BlE" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="9719" y="4180"/>
+        </scene>
+    </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

UIKitCatalog/Base.lproj/DefaultSearchBarViewController.storyboard

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="aTT-8g-UdL">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Default Search Bar-->
+        <scene sceneID="mvP-iV-Ror">
+            <objects>
+                <viewController storyboardIdentifier="DefaultSearchBarViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="aTT-8g-UdL" customClass="DefaultSearchBarViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="VZF-3b-rcm">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="wag-WL-u6e">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
+                                <textInputTraits key="textInputTraits"/>
+                                <scopeButtonTitles>
+                                    <string>Title</string>
+                                    <string>Title</string>
+                                </scopeButtonTitles>
+                                <connections>
+                                    <outlet property="delegate" destination="aTT-8g-UdL" id="Ixz-nw-Grc"/>
+                                </connections>
+                            </searchBar>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="xFq-dM-TAS"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="xFq-dM-TAS" firstAttribute="trailing" secondItem="wag-WL-u6e" secondAttribute="trailing" id="2FT-aX-eAh"/>
+                            <constraint firstItem="wag-WL-u6e" firstAttribute="top" secondItem="xFq-dM-TAS" secondAttribute="top" id="qYe-Wb-MuF"/>
+                            <constraint firstItem="wag-WL-u6e" firstAttribute="leading" secondItem="xFq-dM-TAS" secondAttribute="leading" id="vMl-TJ-bf9"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Default Search Bar" id="Dg6-3W-EW9"/>
+                    <connections>
+                        <outlet property="searchBar" destination="wag-WL-u6e" id="bq7-b9-vrt"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="i9P-Ig-Qfb" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="9126" y="4175"/>
+        </scene>
+    </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

UIKitCatalog/Base.lproj/DefaultToolbarViewController.storyboard

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="P5B-ej-GR8">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Default Toolbar-->
+        <scene sceneID="LI9-fK-d77">
+            <objects>
+                <viewController storyboardIdentifier="DefaultToolbarViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="P5B-ej-GR8" customClass="DefaultToolbarViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="lTJ-Dz-yrG">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7kf-gK-q2z">
+                                <rect key="frame" x="0.0" y="623" width="375" height="44"/>
+                                <items>
+                                    <barButtonItem title="Item" id="KAI-Q9-PUl"/>
+                                </items>
+                            </toolbar>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="YeH-Ql-GCY"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="7kf-gK-q2z" secondAttribute="trailing" id="6dJ-I0-xXQ"/>
+                            <constraint firstItem="7kf-gK-q2z" firstAttribute="leading" secondItem="lTJ-Dz-yrG" secondAttribute="leading" id="Yfg-8z-IMR"/>
+                            <constraint firstItem="YeH-Ql-GCY" firstAttribute="bottom" secondItem="7kf-gK-q2z" secondAttribute="bottom" id="vIm-xg-MqL"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Default Toolbar" id="OfO-j9-hRz"/>
+                    <connections>
+                        <outlet property="toolbar" destination="7kf-gK-q2z" id="WJf-5d-qCM"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="FD8-63-2qu" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="9583" y="4146"/>
+        </scene>
+    </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

UIKitCatalog/Base.lproj/FontPickerViewController.storyboard

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="hIc-I2-PiV">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Font Picker-->
+        <scene sceneID="gkd-fd-9L5">
+            <objects>
+                <viewController storyboardIdentifier="FontPickerViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="hIc-I2-PiV" customClass="FontPickerViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="EB5-Ny-mbq">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TH8-Ct-wSJ">
+                                <rect key="frame" x="137.5" y="61" width="100" height="30"/>
+                                <state key="normal" title="Choose a Font"/>
+                                <connections>
+                                    <action selector="presentFontPicker:" destination="hIc-I2-PiV" eventType="touchUpInside" id="czp-14-7Tz"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="f9m-D2-c8M">
+                                <rect key="frame" x="16" y="123" width="343" height="62"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="62" id="4CA-4b-9B5"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="4kY-K9-p6O"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="f9m-D2-c8M" firstAttribute="centerX" secondItem="TH8-Ct-wSJ" secondAttribute="centerX" id="9fN-ms-POu"/>
+                            <constraint firstItem="f9m-D2-c8M" firstAttribute="top" secondItem="TH8-Ct-wSJ" secondAttribute="bottom" constant="32" id="KAj-zo-YPU"/>
+                            <constraint firstItem="TH8-Ct-wSJ" firstAttribute="top" secondItem="4kY-K9-p6O" secondAttribute="top" constant="17" id="at2-nG-mUW"/>
+                            <constraint firstItem="TH8-Ct-wSJ" firstAttribute="centerX" secondItem="4kY-K9-p6O" secondAttribute="centerX" id="w18-a2-nCa"/>
+                            <constraint firstItem="f9m-D2-c8M" firstAttribute="leading" secondItem="EB5-Ny-mbq" secondAttribute="leadingMargin" id="yIz-ce-gY6"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Font Picker" id="dbS-ug-Aqt"/>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
+                    <connections>
+                        <outlet property="fontLabel" destination="f9m-D2-c8M" id="OJy-K9-zVC"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="TYZ-t7-BMO" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1224.8" y="3367.4662668665669"/>
+        </scene>
+    </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

UIKitCatalog/Base.lproj/ImagePickerViewController.storyboard

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="hIc-I2-PiV">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Image Picker-->
+        <scene sceneID="gkd-fd-9L5">
+            <objects>
+                <viewController useStoryboardIdentifierAsRestorationIdentifier="YES" id="hIc-I2-PiV" customClass="ImagePickerViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="EB5-Ny-mbq">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TH8-Ct-wSJ">
+                                <rect key="frame" x="128" y="61" width="119" height="30"/>
+                                <state key="normal" title="Choose an Image"/>
+                                <connections>
+                                    <action selector="presentImagePicker:" destination="hIc-I2-PiV" eventType="touchUpInside" id="372-Hq-1SZ"/>
+                                </connections>
+                            </button>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="vgj-aY-VbC">
+                                <rect key="frame" x="16" y="105" width="343" height="244"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="244" id="H88-3R-Ibl"/>
+                                    <constraint firstAttribute="width" constant="343" id="JVF-86-hlj"/>
+                                </constraints>
+                            </imageView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="4kY-K9-p6O"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="vgj-aY-VbC" firstAttribute="top" secondItem="TH8-Ct-wSJ" secondAttribute="bottom" constant="14" id="Lsh-je-UsZ"/>
+                            <constraint firstItem="TH8-Ct-wSJ" firstAttribute="top" secondItem="4kY-K9-p6O" secondAttribute="top" constant="17" id="oMl-2J-gVh"/>
+                            <constraint firstItem="TH8-Ct-wSJ" firstAttribute="centerX" secondItem="4kY-K9-p6O" secondAttribute="centerX" id="q5s-ft-qYw"/>
+                            <constraint firstItem="vgj-aY-VbC" firstAttribute="centerX" secondItem="4kY-K9-p6O" secondAttribute="centerX" id="x3m-TL-Rxa"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Image Picker" id="dbS-ug-Aqt"/>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
+                    <connections>
+                        <outlet property="imageView" destination="vgj-aY-VbC" id="TyW-lq-BM8"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="TYZ-t7-BMO" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1224.8" y="3367.4662668665669"/>
+        </scene>
+    </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>

UIKitCatalog/Base.lproj/InfoPlist.strings

@@ -5,5 +5,5 @@ Abstract:
 Localized versions of Info.plist keys.
 */
 
-CFBundleGetInfoString = "v15.0, Copyright 2008-2019, Apple Inc.";
-NSHumanReadableCopyright = "Copyright © 2008-2019, Apple Inc.";
+CFBundleGetInfoString = "v16.0, Copyright 2008-2020, Apple Inc.";
+NSHumanReadableCopyright = "Copyright © 2008-2020, Apple Inc.";

UIKitCatalog/Base.lproj/LaunchScreen.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.12" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="4yX-ry-qSy">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="4yX-ry-qSy">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.15"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -23,17 +23,17 @@
             </objects>
             <point key="canvasLocation" x="-351" y="313"/>
         </scene>
-        <!--UIKitCatalog-->
+        <!--View Controller-->
         <scene sceneID="OE7-kf-oQR">
             <objects>
                 <viewController id="Axx-hg-9Xm" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Bd8-dr-7ve">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <viewLayoutGuide key="safeArea" id="m5c-PM-dSX"/>
                     </view>
-                    <navigationItem key="navigationItem" title="UIKitCatalog" id="uDS-kc-Hwh"/>
+                    <navigationItem key="navigationItem" id="uDS-kc-Hwh"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="cS5-YB-Lx5" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>

UIKitCatalog/Base.lproj/Localizable.strings

@@ -17,7 +17,6 @@ Strings used across the application via the NSLocalizedString API.
 "Button" = "Button";
 "X Button" = "X Button";
 "Image" = "Image";
-"Action" = "Action";
 "bold" = "bold";
 "highlighted" = "highlighted";
 "underlined" = "underlined";
@@ -33,5 +32,49 @@ Strings used across the application via the NSLocalizedString API.
 "Gift" = "Gift";
 "Burst" = "Burst";
 
-"UIKitCatalog" = "UIKitCatalog";
 "An error occurred:" = "An error occurred:";
+
+"ButtonsTitle" = "Buttons";
+"PageControlTitle" = "Page Controls";
+"SearchBarsTitle" = "Search Bars";
+"SegmentedControlsTitle" = "Segmented Controls";
+"SlidersTitle" = "Sliders";
+"SteppersTitle" = "Steppers";
+"SwitchesTitle" = "Switches";
+"TextFieldsTitle" = "Text Fields";
+
+"ActivityIndicatorsTitle" = "Activity Indicators";
+"AlertControllersTitle" = "Alert Controllers";
+"ImageViewTitle" = "Image View";
+"ProgressViewsTitle" = "Progress Views";
+"StackViewsTitle" = "Stack Views";
+"TextViewTitle" = "Text View";
+"ToolbarsTitle" = "Toolbars";
+"WebViewTitle" = "Web View";
+
+"DatePickerTitle" = "Date Picker";
+"PickerViewTitle" = "Picker View";
+"ColorPickerTitle" = "Color Picker";
+"FontPickerTitle" = "Font Picker";
+"ImagePickerTitle" = "Image Picker";
+
+"DefaultSearchBarTitle" = "Default Search Bar";
+"CustomSearchBarTitle" = "Custom Search Bar";
+
+"DefaultToolBarTitle" = "Default Toolbar";
+"TintedToolbarTitle" = "Tinted Toolbar";
+"CustomToolbarBarTitle" = "Custom Toolbar";
+
+"ChooseItemTitle" = "Choose an item:";
+"ItemTitle" = "Item %@";
+
+"SampleFontTitle" = "Sample Font";
+
+"CheckTitle" = "Check";
+"SearchTitle" = "Search";
+"ToolsTitle" = "Tools";
+
+"DefaultPageControlTitle" = "Page Control";
+"CustomPageControlTitle" = "Custom Page Control";
+
+

UIKitCatalog/Base.lproj/Main.storyboard

@@ -1,149 +1,105 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.12" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="5de-VV-J0Y">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Q5k-7y-PTc">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.15"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Initial Detail Scene-->
-        <scene sceneID="Zsb-4L-mhy">
+        <!--Navigation Controller-->
+        <scene sceneID="UvQ-Ss-pLz">
             <objects>
-                <viewController storyboardIdentifier="initialDetail" useStoryboardIdentifierAsRestorationIdentifier="YES" id="GgB-cT-22O" userLabel="Initial Detail Scene" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="L7D-qO-Tdw"/>
-                        <viewControllerLayoutGuide type="bottom" id="WJL-lv-axD"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="aE8-Eb-ul8">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <navigationController storyboardIdentifier="navInitialDetail" useStoryboardIdentifierAsRestorationIdentifier="YES" id="TZt-fA-39O" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="sV0-xf-XLx">
+                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="UIY-fN-QHD" kind="relationship" relationship="rootViewController" id="Gqu-rG-Jnv"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="W9p-gw-54N" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-2475" y="-315"/>
+        </scene>
+        <!--View Controller-->
+        <scene sceneID="MbY-D0-3yr">
+            <objects>
+                <viewController storyboardIdentifier="initialDetail" useStoryboardIdentifierAsRestorationIdentifier="YES" id="UIY-fN-QHD" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="mzj-Jg-kag">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="UIKitCatalog" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I3S-QC-tTb">
-                                <rect key="frame" x="116" y="96" width="143" height="31.5"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="UIKitCatalog" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m5D-3A-LEm">
+                                <rect key="frame" x="135.5" y="459" width="143" height="32"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="26"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" layoutMarginsFollowReadableWidth="YES" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="580" translatesAutoresizingMaskIntoConstraints="NO" id="zUx-Gt-OuD">
-                                <rect key="frame" x="16" y="144.5" width="343" height="85"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="85" id="L8k-5D-pvH"/>
-                                </constraints>
-                                <string key="text">Explore UIKit controls as you navigate UIKitCatalog. For more information on how UIKitCatalog is structured, consult the ReadMe.</string>
-                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="4Yr-lc-WYJ"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="I3S-QC-tTb" firstAttribute="centerX" secondItem="aE8-Eb-ul8" secondAttribute="centerX" id="8O2-AB-2HE"/>
-                            <constraint firstItem="zUx-Gt-OuD" firstAttribute="top" secondItem="I3S-QC-tTb" secondAttribute="bottom" constant="17" id="awm-Nl-NcA"/>
-                            <constraint firstItem="I3S-QC-tTb" firstAttribute="top" secondItem="L7D-qO-Tdw" secondAttribute="bottom" constant="52" id="bG3-Id-DT5"/>
-                            <constraint firstAttribute="trailing" secondItem="zUx-Gt-OuD" secondAttribute="trailing" constant="16" id="bhI-uG-tO8"/>
-                            <constraint firstItem="zUx-Gt-OuD" firstAttribute="leading" secondItem="aE8-Eb-ul8" secondAttribute="leading" constant="16" id="yPU-HJ-IlM"/>
+                            <constraint firstItem="m5D-3A-LEm" firstAttribute="centerX" secondItem="4Yr-lc-WYJ" secondAttribute="centerX" id="UQl-Gp-iuS"/>
+                            <constraint firstItem="m5D-3A-LEm" firstAttribute="centerY" secondItem="4Yr-lc-WYJ" secondAttribute="centerY" id="hFD-WQ-ez2"/>
                         </constraints>
                     </view>
-                    <navigationItem key="navigationItem" id="25K-sB-iDR"/>
-                    <connections>
-                        <outlet property="view" destination="aE8-Eb-ul8" id="qJ2-J3-hAw"/>
-                    </connections>
+                    <navigationItem key="navigationItem" id="dgm-gK-38R"/>
                 </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="i3l-nl-e81" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="9Ff-f0-0hE" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-2247.1999999999998" y="1900.2998500749627"/>
+            <point key="canvasLocation" x="-1733" y="-315"/>
         </scene>
-        <!--Initial Detail Nav Scene-->
-        <scene sceneID="zP1-T7-wZz">
+        <!--Navigation Controller-->
+        <scene sceneID="rqW-Ie-8hq">
             <objects>
-                <navigationController storyboardIdentifier="navInitialDetail" useStoryboardIdentifierAsRestorationIdentifier="YES" id="yxm-l2-50f" userLabel="Initial Detail Nav Scene" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="gd7-D0-3wT">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                <navigationController id="EaT-6K-bcl" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="dAl-nZ-Pyq">
+                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
-                        <segue destination="GgB-cT-22O" kind="relationship" relationship="rootViewController" id="jBL-Ja-mkS"/>
+                        <segue destination="voO-Ai-mPL" kind="relationship" relationship="rootViewController" id="Esd-sm-YBJ"/>
                     </connections>
                 </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="UXt-ks-Cd9" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="C0k-LZ-gWo" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-2247" y="1101"/>
+            <point key="canvasLocation" x="-1733" y="-1019"/>
+        </scene>
+        <!--UIKitCatalog-->
+        <scene sceneID="hcu-07-1H7">
+            <objects>
+                <viewController storyboardIdentifier="OutlineViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="voO-Ai-mPL" customClass="OutlineViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="716-hQ-1AE">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <viewLayoutGuide key="safeArea" id="ifo-zU-2W9"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    </view>
+                    <navigationItem key="navigationItem" title="UIKitCatalog" id="VuM-5y-jZB"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="noe-Tv-lwb" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-951" y="-1019"/>
         </scene>
         <!--Split View Controller-->
-        <scene sceneID="lKg-zh-O6J">
+        <scene sceneID="Gcq-1L-4zA">
             <objects>
-                <splitViewController storyboardIdentifier="splitView" useStoryboardIdentifierAsRestorationIdentifier="YES" id="5de-VV-J0Y" sceneMemberID="viewController">
-                    <toolbarItems/>
+                <splitViewController storyboardIdentifier="SplitViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Q5k-7y-PTc" sceneMemberID="viewController">
                     <connections>
-                        <segue destination="m1c-Zd-x2H" kind="relationship" relationship="masterViewController" id="BE5-FN-hnF"/>
-                        <segue destination="yxm-l2-50f" kind="relationship" relationship="detailViewController" id="aSL-iG-tIS"/>
+                        <segue destination="EaT-6K-bcl" kind="relationship" relationship="masterViewController" id="oIB-IV-bsO"/>
+                        <segue destination="TZt-fA-39O" kind="relationship" relationship="detailViewController" id="mju-NL-Hfj"/>
                     </connections>
                 </splitViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="uGj-iy-BUo" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="OiZ-in-3wZ" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-2247" y="301"/>
-        </scene>
-        <!--Main Nav-->
-        <scene sceneID="rki-8S-yQj">
-            <objects>
-                <navigationController id="m1c-Zd-x2H" userLabel="Main Nav" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="aLv-tg-Oaf">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <connections>
-                        <segue destination="ioe-is-9Fo" kind="relationship" relationship="rootViewController" id="EI2-dZ-G7b"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="2jm-Ou-heY" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-1378" y="301"/>
-        </scene>
-        <!--Main-->
-        <scene sceneID="k55-9b-JBl">
-            <objects>
-                <tableViewController storyboardIdentifier="MasterViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="ioe-is-9Fo" userLabel="Main" customClass="MasterViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Ie1-Wu-iah">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="bs1-7b-LnM" detailTextLabel="PRn-mr-nfN" style="IBUITableViewCellStyleSubtitle" id="aFI-1w-10l">
-                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="aFI-1w-10l" id="XTv-m2-AJj">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bs1-7b-LnM">
-                                            <rect key="frame" x="16" y="5" width="33.5" height="20.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                            <nil key="textColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="PRn-mr-nfN">
-                                            <rect key="frame" x="16" y="25.5" width="44" height="14.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                            <nil key="textColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                </tableViewCellContentView>
-                            </tableViewCell>
-                        </prototypes>
-                        <sections/>
-                        <connections>
-                            <outlet property="dataSource" destination="ioe-is-9Fo" id="GDa-jQ-pLQ"/>
-                            <outlet property="delegate" destination="ioe-is-9Fo" id="xMZ-Cn-pFg"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" title="UIKitCatalog" id="vq5-2j-dSd"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="IfR-rq-5xW" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-521" y="301"/>
+            <point key="canvasLocation" x="-2474" y="-1019"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>

UIKitCatalog/Base.lproj/PageControlViewController.storyboard

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.12" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ZSF-lM-gQa">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.15"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--Page Control-->
-        <scene sceneID="eth-bz-h7N">
-            <objects>
-                <viewController id="ZSF-lM-gQa" customClass="PageControlViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="1Df-6J-Q8v">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <pageControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="3" translatesAutoresizingMaskIntoConstraints="NO" id="vYI-31-hYo">
-                                <rect key="frame" x="16" y="630" width="343" height="37"/>
-                                <color key="pageIndicatorTintColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <color key="currentPageIndicatorTintColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            </pageControl>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="utF-re-9KT">
-                                <rect key="frame" x="40" y="79" width="295" height="548"/>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <constraints>
-                            <constraint firstItem="5Qq-SM-uLH" firstAttribute="bottom" secondItem="utF-re-9KT" secondAttribute="bottom" constant="40" id="CJN-Da-IOG"/>
-                            <constraint firstItem="vYI-31-hYo" firstAttribute="leading" secondItem="1Df-6J-Q8v" secondAttribute="leadingMargin" id="GCu-9h-pRg"/>
-                            <constraint firstItem="5Qq-SM-uLH" firstAttribute="bottom" secondItem="vYI-31-hYo" secondAttribute="bottom" id="S9q-pM-bAC"/>
-                            <constraint firstItem="5Qq-SM-uLH" firstAttribute="centerX" secondItem="utF-re-9KT" secondAttribute="centerX" id="WTf-ZT-aB4"/>
-                            <constraint firstItem="utF-re-9KT" firstAttribute="top" secondItem="5Qq-SM-uLH" secondAttribute="top" constant="35" id="cR2-Mv-wG0"/>
-                            <constraint firstItem="utF-re-9KT" firstAttribute="leading" secondItem="5Qq-SM-uLH" secondAttribute="leading" constant="40" id="eQF-AE-6Hc"/>
-                            <constraint firstItem="utF-re-9KT" firstAttribute="centerX" secondItem="vYI-31-hYo" secondAttribute="centerX" id="fH9-0V-Zcb"/>
-                            <constraint firstItem="vYI-31-hYo" firstAttribute="trailing" secondItem="1Df-6J-Q8v" secondAttribute="trailingMargin" id="hzD-5j-Isu"/>
-                            <constraint firstItem="5Qq-SM-uLH" firstAttribute="trailing" secondItem="utF-re-9KT" secondAttribute="trailing" constant="40" id="y6s-mz-18p"/>
-                        </constraints>
-                        <viewLayoutGuide key="safeArea" id="5Qq-SM-uLH"/>
-                    </view>
-                    <navigationItem key="navigationItem" title="Page Control" id="BMt-yu-jqx"/>
-                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
-                    <connections>
-                        <outlet property="colorView" destination="utF-re-9KT" id="mGK-o8-Ff3"/>
-                        <outlet property="pageControl" destination="vYI-31-hYo" id="fK9-c0-hB8"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="5oZ-EJ-Grm" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="282" y="3368"/>
-        </scene>
-    </scenes>
-</document>

UIKitCatalog/Base.lproj/PickerViewController.storyboard

@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.12" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="hIc-I2-PiV">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="hIc-I2-PiV">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.15"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Picker View-->
         <scene sceneID="gkd-fd-9L5">
             <objects>
-                <viewController id="hIc-I2-PiV" customClass="PickerViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
+                <placeholder placeholderIdentifier="IBFirstResponder" id="TYZ-t7-BMO" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <viewController storyboardIdentifier="PickerViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="hIc-I2-PiV" customClass="PickerViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="EB5-Ny-mbq">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -29,7 +31,8 @@
                                 <rect key="frame" x="20" y="255" width="335" height="392"/>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="4kY-K9-p6O"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="4kY-K9-p6O" firstAttribute="trailing" secondItem="J93-zx-EMb" secondAttribute="trailing" constant="20" id="7Rf-B1-Bit"/>
                             <constraint firstItem="J93-zx-EMb" firstAttribute="top" secondItem="cg8-rc-3S1" secondAttribute="bottom" constant="8" id="Jtc-3w-c4S"/>
@@ -38,18 +41,21 @@
                             <constraint firstItem="4kY-K9-p6O" firstAttribute="top" secondItem="cg8-rc-3S1" secondAttribute="top" constant="13" id="ZKM-Nq-hlH"/>
                             <constraint firstItem="J93-zx-EMb" firstAttribute="leading" secondItem="4kY-K9-p6O" secondAttribute="leading" constant="20" id="nDF-gQ-SPP"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="4kY-K9-p6O"/>
                     </view>
                     <navigationItem key="navigationItem" title="Picker View" id="dbS-ug-Aqt"/>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
                     <connections>
-                        <outlet property="colorSwatchView" destination="J93-zx-EMb" id="RbW-5c-x35"/>
+                        <outlet property="colorSwatchView" destination="J93-zx-EMb" id="1mE-yC-giv"/>
                         <outlet property="pickerView" destination="cg8-rc-3S1" id="EWd-rS-iAP"/>
                     </connections>
                 </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="TYZ-t7-BMO" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1225" y="3368"/>
+            <point key="canvasLocation" x="620" y="3288"/>
         </scene>
     </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>

UIKitCatalog/Base.lproj/SearchViewControllers.storyboard

@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14810.12" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="v21-vF-FLh">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14766.15"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--Search-->
-        <scene sceneID="tfo-x9-bup">
-            <objects>
-                <tableViewController storyboardIdentifier="Search" id="v21-vF-FLh" customClass="SearchBarsTableViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="d2N-kr-XWw">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <sections>
-                            <tableViewSection headerTitle="Search Bars" id="1Pr-U6-zci">
-                                <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="J7w-dm-KuG" detailTextLabel="C7Y-NY-GyP" style="IBUITableViewCellStyleSubtitle" id="td3-Jx-XEj">
-                                        <rect key="frame" x="0.0" y="28" width="375" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="td3-Jx-XEj" id="LZu-Ux-UPp">
-                                            <rect key="frame" x="0.0" y="0.0" width="347.5" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Default" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="J7w-dm-KuG">
-                                                    <rect key="frame" x="16" y="6" width="52.5" height="19.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="DefaultSearchBarViewController" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="C7Y-NY-GyP">
-                                                    <rect key="frame" x="16" y="25.5" width="169.5" height="13.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="CUN-ll-i8J" detailTextLabel="y7q-CG-m74" style="IBUITableViewCellStyleSubtitle" id="Ijh-SG-gIM">
-                                        <rect key="frame" x="0.0" y="72" width="375" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Ijh-SG-gIM" id="5qL-RQ-3wJ">
-                                            <rect key="frame" x="0.0" y="0.0" width="347.5" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Custom" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="CUN-ll-i8J">
-                                                    <rect key="frame" x="16" y="6" width="56.5" height="19.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="CustomSearchBarViewController" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="y7q-CG-m74">
-                                                    <rect key="frame" x="16" y="25.5" width="172" height="13.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
-                        </sections>
-                        <connections>
-                            <outlet property="dataSource" destination="v21-vF-FLh" id="342-lQ-GNG"/>
-                            <outlet property="delegate" destination="v21-vF-FLh" id="XRP-hW-Yzr"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" title="Search" id="CVr-W2-LTY"/>
-                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="9KL-jZ-IEF" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="9947" y="3368"/>
-        </scene>
-        <!--Default Search Bar-->
-        <scene sceneID="mvP-iV-Ror">
-            <objects>
-                <viewController storyboardIdentifier="DefaultSearchBarViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="aTT-8g-UdL" customClass="DefaultSearchBarViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="VZF-3b-rcm">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="wag-WL-u6e">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
-                                <textInputTraits key="textInputTraits"/>
-                                <scopeButtonTitles>
-                                    <string>Title</string>
-                                    <string>Title</string>
-                                </scopeButtonTitles>
-                                <connections>
-                                    <outlet property="delegate" destination="aTT-8g-UdL" id="Ixz-nw-Grc"/>
-                                </connections>
-                            </searchBar>
-                        </subviews>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <constraints>
-                            <constraint firstItem="xFq-dM-TAS" firstAttribute="trailing" secondItem="wag-WL-u6e" secondAttribute="trailing" id="2FT-aX-eAh"/>
-                            <constraint firstItem="wag-WL-u6e" firstAttribute="top" secondItem="xFq-dM-TAS" secondAttribute="top" id="qYe-Wb-MuF"/>
-                            <constraint firstItem="wag-WL-u6e" firstAttribute="leading" secondItem="xFq-dM-TAS" secondAttribute="leading" id="vMl-TJ-bf9"/>
-                        </constraints>
-                        <viewLayoutGuide key="safeArea" id="xFq-dM-TAS"/>
-                    </view>
-                    <navigationItem key="navigationItem" title="Default Search Bar" id="Dg6-3W-EW9"/>
-                    <connections>
-                        <outlet property="searchBar" destination="wag-WL-u6e" id="bq7-b9-vrt"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="i9P-Ig-Qfb" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="9126" y="4175"/>
-        </scene>
-        <!--Custom Search Bar-->
-        <scene sceneID="dd9-nR-VNk">
-            <objects>
-                <viewController storyboardIdentifier="CustomSearchBarViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Mhd-Bs-sIn" customClass="CustomSearchBarViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="YVy-et-UAQ">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="d4g-eI-DIw">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
-                                <textInputTraits key="textInputTraits"/>
-                                <connections>
-                                    <outlet property="delegate" destination="Mhd-Bs-sIn" id="fpK-JW-vvF"/>
-                                </connections>
-                            </searchBar>
-                        </subviews>
-                        <color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <constraints>
-                            <constraint firstItem="rtX-bw-2xb" firstAttribute="trailing" secondItem="d4g-eI-DIw" secondAttribute="trailing" id="ROc-RY-l7C"/>
-                            <constraint firstItem="d4g-eI-DIw" firstAttribute="top" secondItem="rtX-bw-2xb" secondAttribute="top" id="dkH-R8-Hqu"/>
-                            <constraint firstItem="d4g-eI-DIw" firstAttribute="leading" secondItem="rtX-bw-2xb" secondAttribute="leading" id="vxX-VT-mrY"/>
-                        </constraints>
-                        <viewLayoutGuide key="safeArea" id="rtX-bw-2xb"/>
-                    </view>
-                    <navigationItem key="navigationItem" title="Custom Search Bar" id="hvS-xa-PyN"/>
-                    <connections>
-                        <outlet property="searchBar" destination="d4g-eI-DIw" id="T7j-hM-2Yj"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="2tu-qT-QdC" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="9947" y="4177"/>
-        </scene>
-        <!--Search Bar Embedded in Navigation Bar-->
-        <scene sceneID="VrA-x5-JBW">
-            <objects>
-                <tableViewController storyboardIdentifier="SearchBarEmbedInNavBarViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="aRM-gX-SK9" customClass="SearchBarEmbedInNavBarViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="1PE-AW-QJq">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="searchResultsCell" textLabel="rIb-i6-JL6" style="IBUITableViewCellStyleDefault" id="hOY-Jy-ScI">
-                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hOY-Jy-ScI" id="WCi-bR-TE7">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Search results cell" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rIb-i6-JL6">
-                                            <rect key="frame" x="16" y="0.0" width="343" height="44"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                </tableViewCellContentView>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="aRM-gX-SK9" id="RTW-Qn-wym"/>
-                            <outlet property="delegate" destination="aRM-gX-SK9" id="rqO-Dm-Uud"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" title="Search Bar Embedded in Navigation Bar" id="3Xg-Jh-bT4"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="uvk-RY-aRG" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="10862" y="4176"/>
-        </scene>
-        <!--Search Results View Controller-->
-        <scene sceneID="EW7-qW-Fsk">
-            <objects>
-                <tableViewController storyboardIdentifier="SearchResultsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Thx-B6-QkK" customClass="SearchResultsViewController" customModule="UIKitCatalog" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="QvM-3S-GbD">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="searchResultsCell" textLabel="Fze-SS-t1Y" style="IBUITableViewCellStyleDefault" id="Z89-zd-E8L">
-                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Z89-zd-E8L" id="OXE-Q3-c2v">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Search results cell" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Fze-SS-t1Y">
-                                            <rect key="frame" x="16" y="0.0" width="343" height="44"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                            <nil key="textColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                </tableViewCellContentView>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="Thx-B6-QkK" id="4ft-LK-cmP"/>
-                            <outlet property="delegate" destination="Thx-B6-QkK" id="eFu-D2-OUn"/>
-                        </connections>
-                    </tableView>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="66R-Lv-wkk" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="11687" y="4176"/>
-        </scene>
-    </scenes>
-</document>