diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj index ea17a05..0b3a4a0 100644 --- a/VDSSample.xcodeproj/project.pbxproj +++ b/VDSSample.xcodeproj/project.pbxproj @@ -122,10 +122,10 @@ EAF7F0792899698800B287F5 /* Resources */ = { isa = PBXGroup; children = ( - EA3C3BA2289966EF000CA526 /* Main.storyboard */, - EA3C3BA7289966F1000CA526 /* LaunchScreen.storyboard */, - EAF7F07A2899698800B287F5 /* Components.storyboard */, EAF7F07B2899698800B287F5 /* Assets.xcassets */, + EAF7F07A2899698800B287F5 /* Components.storyboard */, + EA3C3BA7289966F1000CA526 /* LaunchScreen.storyboard */, + EA3C3BA2289966EF000CA526 /* Main.storyboard */, ); path = Resources; sourceTree = ""; diff --git a/VDSSample/Protocols/StoryboardInitable.swift b/VDSSample/Protocols/StoryboardInitable.swift index 0d1468f..a7ee52b 100644 --- a/VDSSample/Protocols/StoryboardInitable.swift +++ b/VDSSample/Protocols/StoryboardInitable.swift @@ -10,10 +10,11 @@ import UIKit protocol StoryboardInitable { static var storyboardId: String { get } + static var storyboardName: String { get } } extension StoryboardInitable { static func instantiate() -> UIViewController { - return UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: Self.storyboardId) + return UIStoryboard(name: Self.storyboardName, bundle: nil).instantiateViewController(withIdentifier: Self.storyboardId) } } diff --git a/VDSSample/Resources/Components.storyboard b/VDSSample/Resources/Components.storyboard index dd79351..8faef35 100644 --- a/VDSSample/Resources/Components.storyboard +++ b/VDSSample/Resources/Components.storyboard @@ -1,25 +1,288 @@ - + + - + + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift index cb6849f..c793f3b 100644 --- a/VDSSample/ViewControllers/ToggleViewController.swift +++ b/VDSSample/ViewControllers/ToggleViewController.swift @@ -15,7 +15,8 @@ class ToggleViewController: UIViewController, StoryboardInitable { case surface, textSize, textPosition, fontWeight } static var storyboardId: String = "toggle" - + static var storyboardName: String = "Components" + @IBOutlet weak var toggleContainerView: UIView! @IBOutlet weak var picker: UIPickerView! @IBOutlet weak var surfaceLabel: UILabel!