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

Prefetches CheatBase cheats + disables “Search CheatBase” option if there aren’t any

Browse Source
This commit is contained in:
Riley Testut 2023-01-31 14:28:24 -06:00
parent 74ccf1a246
commit 041cce64b0
2 changed files with 82 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Delta/Database/Cheats/CheatBaseView.swift
View File

@ -14,10 +14,17 @@ extension CheatBaseView
private class ViewModel: ObservableObject private class ViewModel: ObservableObject
{ {
@Published @Published
private(set) var database: CheatBase? var allCheats: [CheatMetadata]? {
didSet {
@Published guard let cheats = allCheats else {
private(set) var allCheats: [CheatMetadata]? self.cheatsByCategory = nil
return
}
let cheatsByCategory = Dictionary(grouping: cheats, by: { $0.category }).sorted { $0.key.id < $1.key.id }
self.cheatsByCategory = cheatsByCategory
}
}
@Published @Published
private(set) var cheatsByCategory: [(CheatCategory, [CheatMetadata])]? private(set) var cheatsByCategory: [(CheatCategory, [CheatMetadata])]?
@ -42,14 +49,9 @@ extension CheatBaseView
do do
{ {
let database = try CheatBase() let database = try CheatBase()
self.database = database
let cheats = try await database.cheats(for: game) ?? [] let cheats = try await database.cheats(for: game) ?? []
self.allCheats = cheats self.allCheats = cheats
let cheatsByCategory = Dictionary(grouping: cheats, by: { $0.category }).sorted { $0.key.id < $1.key.id }
self.cheatsByCategory = cheatsByCategory
} }
catch catch
{ {
@ -239,6 +241,15 @@ struct CheatBaseView: View
.foregroundColor(.gray) .foregroundColor(.gray)
.padding() .padding()
} }
init(game: Game, cheats: [CheatMetadata]? = nil)
{
self.game = game
let viewModel = ViewModel()
viewModel.allCheats = cheats
self._viewModel = StateObject(wrappedValue: viewModel)
}
} }
@available(iOS 14, *) @available(iOS 14, *)

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

@ -31,6 +31,8 @@ class CheatsViewController: UITableViewController
weak var delegate: CheatsViewControllerDelegate? weak var delegate: CheatsViewControllerDelegate?
private let dataSource = RSTFetchedResultsTableViewDataSource<Cheat>(fetchedResultsController: NSFetchedResultsController()) private let dataSource = RSTFetchedResultsTableViewDataSource<Cheat>(fetchedResultsController: NSFetchedResultsController())
private var cheatBaseCheats: [CheatMetadata]?
} }
extension CheatsViewController extension CheatsViewController
@ -65,20 +67,17 @@ extension CheatsViewController
if #available(iOS 14, *) if #available(iOS 14, *)
{ {
let addCheatMenu = UIMenu(children: [ self.updateAddCheatMenu()
UIAction(title: NSLocalizedString("New Cheat Code", comment: ""), image: UIImage(systemName: "square.and.pencil")) { [weak self] _ in }
self?.addCheat() }
},
override func viewWillAppear(_ animated: Bool)
UIAction(title: NSLocalizedString("Search CheatBase", comment: ""), image: UIImage(systemName: "magnifyingglass")) { [weak self] _ in {
self?.searchCheatBase() super.viewWillAppear(animated)
},
]) if #available(iOS 14, *), self.cheatBaseCheats == nil
{
self.navigationItem.rightBarButtonItem?.target = nil self.fetchCheatBaseCheats()
self.navigationItem.rightBarButtonItem?.action = nil
self.navigationItem.rightBarButtonItem?.menu = addCheatMenu
} }
} }
@ -110,6 +109,34 @@ private extension CheatsViewController
self.dataSource.fetchedResultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext, sectionNameKeyPath: nil, cacheName: nil) self.dataSource.fetchedResultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext, sectionNameKeyPath: nil, cacheName: nil)
} }
@available(iOS 14, *) @MainActor
func updateAddCheatMenu()
{
var searchCheatBaseTitle = NSLocalizedString("Search CheatBase", comment: "")
var attributes: UIMenuElement.Attributes = []
if let cheats = self.cheatBaseCheats, cheats.isEmpty
{
searchCheatBaseTitle = NSLocalizedString("No Cheats in CheatBase", comment: "")
attributes = [.disabled]
}
let addCheatMenu = UIMenu(children: [
UIAction(title: NSLocalizedString("New Cheat Code", comment: ""), image: UIImage(systemName: "square.and.pencil")) { [weak self] _ in
self?.addCheat()
},
UIAction(title: searchCheatBaseTitle, image: UIImage(systemName: "magnifyingglass"), attributes: attributes) { [weak self] _ in
self?.searchCheatBase()
},
])
self.navigationItem.rightBarButtonItem?.target = nil
self.navigationItem.rightBarButtonItem?.action = nil
self.navigationItem.rightBarButtonItem?.menu = addCheatMenu
}
} }
//MARK: - Managing Cheats - //MARK: - Managing Cheats -
@ -122,10 +149,29 @@ private extension CheatsViewController
editCheatViewController.presentWithPresentingViewController(self) editCheatViewController.presentWithPresentingViewController(self)
} }
@available(iOS 14, *)
func fetchCheatBaseCheats()
{
Task {
do
{
let cheatBase = try CheatBase()
let cheats = try await cheatBase.cheats(for: self.game) ?? []
self.cheatBaseCheats = cheats
self.updateAddCheatMenu()
}
catch
{
print("[RSTLog] Failed to prefetch cheats from CheatBase:", error)
}
}
}
@available(iOS 14, *) @available(iOS 14, *)
func searchCheatBase() func searchCheatBase()
{ {
var rootView = CheatBaseView(game: self.game) var rootView = CheatBaseView(game: self.game, cheats: self.cheatBaseCheats)
rootView.cancellationHandler = { [weak self] in rootView.cancellationHandler = { [weak self] in
self?.presentedViewController?.dismiss(animated: true) self?.presentedViewController?.dismiss(animated: true)
} }