diff --git a/Seasonizer/CanvasViewController.swift b/Seasonizer/CanvasViewController.swift index c8cebcb..bb31b87 100644 --- a/Seasonizer/CanvasViewController.swift +++ b/Seasonizer/CanvasViewController.swift @@ -120,6 +120,8 @@ class CanvasViewController: UIViewController, UINavigationControllerDelegate, UI // TODO: Implement `prepareForSegue(_:sender:)` to pass `allAccessories` on to `AccessoryListViewController`. + + /* HINT: The `AccessoryListViewController` should be embedded in a `UINavigationController`: @@ -130,7 +132,9 @@ class CanvasViewController: UIViewController, UINavigationControllerDelegate, UI // TODO: Implement an `@IBAction func unwindToCanvas(segue: UIStoryboardSegue)` Unwing Segue that the `AccessoryListViewController` can exit to. - + @IBAction func unwindToCanvas(segue: UIStoryboardSegue){ + dismissViewControllerAnimated(true, completion: nil) + } // TODO: For the "selectedAccessory" segue, obtain the selected accessory and add it to the canvas. /* HINTS: diff --git a/Seasonizer/Launch Screen.storyboard b/Seasonizer/Launch Screen.storyboard index a84d201..a84f37b 100644 --- a/Seasonizer/Launch Screen.storyboard +++ b/Seasonizer/Launch Screen.storyboard @@ -1,5 +1,5 @@ - + diff --git a/Seasonizer/Main.storyboard b/Seasonizer/Main.storyboard index 926189e..80dbb17 100644 --- a/Seasonizer/Main.storyboard +++ b/Seasonizer/Main.storyboard @@ -1,5 +1,5 @@ - + @@ -15,14 +15,88 @@ + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +