Skip to content

Commit 67fad2c

Browse files
committed
Use album class
1 parent a5f311a commit 67fad2c

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

TestSwift/Classes/DetailsViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import UIKit
1010

1111
class DetailsViewController: UIViewController {
1212

13-
var detailInfo: NSDictionary?
13+
var albumInfo: Album?
1414

1515
init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
1616
super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)

TestSwift/SearchResultsViewController.swift

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class SearchResultsViewController: UIViewController,/* UITableViewDataSource, UI
1414

1515
var api: APIController = APIController()
1616
@IBOutlet var appsTableView : UITableView
17+
var selectedAlbum: Album?
1718

1819
var albums: Album[] = []
1920
//var imageCache = NSMutableDictionary()
@@ -26,26 +27,6 @@ class SearchResultsViewController: UIViewController,/* UITableViewDataSource, UI
2627
api.searchItunesFor("Bob Dylan");
2728
}
2829

29-
override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject) {
30-
31-
32-
if segue.identifier == "Details" {
33-
//var detailsViewController: DetailsViewController? = segue.destinationViewController! as? DetailsViewController
34-
35-
var destinationViewController: UIViewController = segue.destinationViewController as UIViewController
36-
37-
// var detailsViewController: DetailsViewController = destinationViewController as DetailsViewController
38-
39-
40-
//var destinationViewController: UIViewController! = segue.destinationViewController as UIViewController!
41-
//var detailsViewController: DetailsViewController = destinationViewController as DetailsViewController
42-
/* var selectedIndexPathRow = appsTableView.indexPathForSelectedRow().row
43-
var selectedAppDetails: NSDictionary = self.tableData[selectedIndexPathRow] as NSDictionary
44-
45-
detailsViewController.detailInfo = selectedAppDetails*/
46-
}
47-
}
48-
4930
func tableView(tableView: UITableView!, numberOfRowsInSection section: Int) -> Int {
5031
return albums.count
5132
}
@@ -165,6 +146,25 @@ class SearchResultsViewController: UIViewController,/* UITableViewDataSource, UI
165146
func tableView(tableView: UITableView!, didSelectRowAtIndexPath indexPath: NSIndexPath!) {
166147
// Get the album for this row
167148
var album = albums[indexPath.row]
149+
self.selectedAlbum = album
150+
151+
var storyboard = UIStoryboard(name: "Main", bundle: NSBundle.mainBundle())
152+
// var viewController: UIViewController = storyboard.instantiateViewControllerWithIdentifier("Details") as UIViewController
153+
154+
let detailsVC = self.storyboard.instantiateViewControllerWithIdentifier("Details") as DetailsViewController
155+
self.navigationController.pushViewController(detailsVC, animated: true)
156+
157+
// self.navigationController.pushViewController(DetailsViewController(nibName: nil, bundle: nil), animated: true)
158+
/*
159+
let detailsVC: DetailsViewController? = viewController as? DetailsViewController
160+
if detailsVC? {
161+
//detailsVC?.albumInfo = self.selectedAlbum
162+
detailsVC!.albumInfo = self.selectedAlbum
163+
164+
println("Made detailsVC")
165+
}
166+
// detailsVC.albumInfo = self.selectedAlbum
167+
*/
168168
}
169169

170170
}

0 commit comments

Comments
 (0)