3-group-ios/GBA002
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds support for Roxas’ refactored UITableView/UICollectionView data source logic

Browse Source
This commit is contained in:
Riley Testut 2017-02-20 20:46:10 -08:00
parent 34f277e1ac
commit 882c6e74e6
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Delta/Game Selection/GameCollectionViewController.swift
View File

@ -181,8 +181,7 @@ private extension GameCollectionViewController
fetchRequest.sortDescriptors = [NSSortDescriptor(key: #keyPath(Game.name), ascending: true)] fetchRequest.sortDescriptors = [NSSortDescriptor(key: #keyPath(Game.name), ascending: true)]
self.dataSource = RSTFetchedResultsCollectionViewDataSource(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext) self.dataSource = RSTFetchedResultsCollectionViewDataSource(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext)
self.dataSource.cellIdentifierHandler = { _ in RSTGenericCellIdentifier } self.dataSource.cellConfigurationHandler = { [unowned self] (cell, item, indexPath) in
self.dataSource.cellConfigurationHandler = { [unowned self] (cell, indexPath) in
self.configure(cell as! GridCollectionViewCell, for: indexPath) self.configure(cell as! GridCollectionViewCell, for: indexPath)
} }
} }

2
Delta/Pause Menu/Cheats/CheatsViewController.swift
View File

@ -180,7 +180,7 @@ extension CheatsViewController
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell
{ {
let cell = tableView.dequeueReusableCell(withIdentifier: RSTGenericCellIdentifier, for: indexPath) let cell = tableView.dequeueReusableCell(withIdentifier: RSTCellContentGenericCellIdentifier, for: indexPath)
self.configure(cell, forIndexPath: indexPath) self.configure(cell, forIndexPath: indexPath)
return cell return cell
} }

2
Delta/Pause Menu/PauseMenuViewController.swift
View File

@ -113,7 +113,7 @@ extension PauseMenuViewController
override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell
{ {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: RSTGenericCellIdentifier, for: indexPath) as! GridCollectionViewCell let cell = collectionView.dequeueReusableCell(withReuseIdentifier: RSTCellContentGenericCellIdentifier, for: indexPath) as! GridCollectionViewCell
self.configureCollectionViewCell(cell, forIndexPath: indexPath) self.configureCollectionViewCell(cell, forIndexPath: indexPath)
return cell return cell
} }

2
Delta/Pause Menu/Save States/SaveStatesViewController.swift
View File

@ -647,7 +647,7 @@ extension SaveStatesViewController
override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell
{ {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: RSTGenericCellIdentifier, for: indexPath) as! GridCollectionViewCell let cell = collectionView.dequeueReusableCell(withReuseIdentifier: RSTCellContentGenericCellIdentifier, for: indexPath) as! GridCollectionViewCell
self.configureCollectionViewCell(cell, forIndexPath: indexPath) self.configureCollectionViewCell(cell, forIndexPath: indexPath)
return cell return cell
} }

3
Delta/Settings/Controller Skins/ControllerSkinsViewController.swift
View File

@ -79,8 +79,7 @@ private extension ControllerSkinsViewController
let fetchedResultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext, sectionNameKeyPath: #keyPath(ControllerSkin.name), cacheName: nil) let fetchedResultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext, sectionNameKeyPath: #keyPath(ControllerSkin.name), cacheName: nil)
self.dataSource = RSTFetchedResultsTableViewDataSource(fetchedResultsController: fetchedResultsController) self.dataSource = RSTFetchedResultsTableViewDataSource(fetchedResultsController: fetchedResultsController)
self.dataSource.cellIdentifierHandler = { _ in RSTGenericCellIdentifier } self.dataSource.cellConfigurationHandler = { [unowned self] (cell, item, indexPath) in
self.dataSource.cellConfigurationHandler = { [unowned self] (cell, indexPath) in
self.configure(cell as! ControllerSkinTableViewCell, for: indexPath) self.configure(cell as! ControllerSkinTableViewCell, for: indexPath)
} }
} }

2
External/Roxas vendored

@ -1 +1 @@
Subproject commit 784b06e1249fae83d42d4bf62bc8350616c1059b Subproject commit ecb29e0050fe9335845698c896c4cd8ce60df0da