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

Replaces fileprivate with private. THANK FUCKING GOD.

Browse Source
This commit is contained in:
Riley Testut 2017-10-12 15:33:16 -07:00
parent 090c84df61
commit fb11f6dec7
34 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cores/DeltaCore

@ -1 +1 @@
Subproject commit f47ad929fc234a771b639ba307c57f084235eda2 Subproject commit 4854926b2a21fe0c6e652dc1ccb4e7abdef3dcb6

2
Delta/AppDelegate.swift
View File

@ -90,7 +90,7 @@ extension AppDelegate
return self.openURL(url) return self.openURL(url)
} }
@discardableResult fileprivate func openURL(_ url: URL) -> Bool @discardableResult private func openURL(_ url: URL) -> Bool
{ {
guard url.isFileURL else { return false } guard url.isFileURL else { return false }

12
Delta/Components/Collection View/GridCollectionViewCell.swift
View File

@ -45,15 +45,15 @@ class GridCollectionViewCell: UICollectionViewCell
} }
} }
fileprivate var vibrancyView = UIVisualEffectView(effect: UIVibrancyEffect(blurEffect: UIBlurEffect(style: .dark))) private var vibrancyView = UIVisualEffectView(effect: UIVibrancyEffect(blurEffect: UIBlurEffect(style: .dark)))
fileprivate var imageViewWidthConstraint: NSLayoutConstraint! private var imageViewWidthConstraint: NSLayoutConstraint!
fileprivate var imageViewHeightConstraint: NSLayoutConstraint! private var imageViewHeightConstraint: NSLayoutConstraint!
fileprivate var textLabelBottomAnchorConstraint: NSLayoutConstraint! private var textLabelBottomAnchorConstraint: NSLayoutConstraint!
fileprivate var textLabelVerticalSpacingConstraint: NSLayoutConstraint! private var textLabelVerticalSpacingConstraint: NSLayoutConstraint!
fileprivate var textLabelFocusedVerticalSpacingConstraint: NSLayoutConstraint? private var textLabelFocusedVerticalSpacingConstraint: NSLayoutConstraint?
override init(frame: CGRect) override init(frame: CGRect)
{ {

2
Delta/Components/Popover Menu/ListMenuViewController.swift
View File

@ -17,7 +17,7 @@ class ListMenuViewController: UITableViewController
set { self.dataSource.items = newValue } set { self.dataSource.items = newValue }
} }
fileprivate let dataSource = RSTArrayTableViewDataSource<MenuItem>(items: []) private let dataSource = RSTArrayTableViewDataSource<MenuItem>(items: [])
override var preferredContentSize: CGSize { override var preferredContentSize: CGSize {
get { get {

10
Delta/Components/Popover Menu/PopoverMenuButton.swift
View File

@ -35,7 +35,7 @@ extension UINavigationBar
return textAttributes return textAttributes
} }
fileprivate var _defaultTitleTextAttributes: [NSAttributedStringKey: Any]? { private var _defaultTitleTextAttributes: [NSAttributedStringKey: Any]? {
guard self.titleTextAttributes == nil else { return self.titleTextAttributes } guard self.titleTextAttributes == nil else { return self.titleTextAttributes }
guard guard
@ -59,11 +59,11 @@ class PopoverMenuButton: UIControl
} }
} }
fileprivate let textLabel: UILabel private let textLabel: UILabel
fileprivate let arrowLabel: UILabel private let arrowLabel: UILabel
fileprivate let stackView: UIStackView private let stackView: UIStackView
fileprivate var parentNavigationBar: UINavigationBar? { private var parentNavigationBar: UINavigationBar? {
guard let navigationController = self.parentViewController as? UINavigationController ?? self.parentViewController?.navigationController else { return nil } guard let navigationController = self.parentViewController as? UINavigationController ?? self.parentViewController?.navigationController else { return nil }
guard self.isDescendant(of: navigationController.navigationBar) else { return nil } guard self.isDescendant(of: navigationController.navigationBar) else { return nil }

2
Delta/Database/DatabaseManager.swift
View File

@ -60,7 +60,7 @@ final class DatabaseManager: NSPersistentContainer
{ {
static let shared = DatabaseManager() static let shared = DatabaseManager()
fileprivate var gamesDatabase: GamesDatabase? = nil private var gamesDatabase: GamesDatabase? = nil
private init() private init()
{ {

4
Delta/Database/InputStreamOutputWriter.swift
View File

@ -15,9 +15,9 @@ class InputStreamOutputWriter: NSObject
let inputStream: InputStream let inputStream: InputStream
let outputStream: OutputStream let outputStream: OutputStream
fileprivate var completion: ((Error?) -> Void)? private var completion: ((Error?) -> Void)?
fileprivate var dataBuffer = Data(capacity: MaximumBufferLength * 2) private var dataBuffer = Data(capacity: MaximumBufferLength * 2)
init(inputStream: InputStream, outputStream: OutputStream) init(inputStream: InputStream, outputStream: OutputStream)
{ {

2
Delta/Database/Model/Human/ControllerSkin.swift
View File

@ -61,7 +61,7 @@ public class ControllerSkin: _ControllerSkin
return self.controllerSkin?.isDebugModeEnabled ?? false return self.controllerSkin?.isDebugModeEnabled ?? false
} }
fileprivate lazy var controllerSkin: DeltaCore.ControllerSkin? = { private lazy var controllerSkin: DeltaCore.ControllerSkin? = {
let controllerSkin = self.isStandard ? DeltaCore.ControllerSkin.standardControllerSkin(for: self.gameType) : DeltaCore.ControllerSkin(fileURL: self.fileURL) let controllerSkin = self.isStandard ? DeltaCore.ControllerSkin.standardControllerSkin(for: self.gameType) : DeltaCore.ControllerSkin(fileURL: self.fileURL)
return controllerSkin return controllerSkin
}() }()

2
Delta/Database/Model/Human/GameControllerInputMapping.swift
View File

@ -13,7 +13,7 @@ import DeltaCore
@objc(GameControllerInputMapping) @objc(GameControllerInputMapping)
public class GameControllerInputMapping: _GameControllerInputMapping public class GameControllerInputMapping: _GameControllerInputMapping
{ {
fileprivate var inputMapping: DeltaCore.GameControllerInputMapping { private var inputMapping: DeltaCore.GameControllerInputMapping {
get { return self.deltaCoreInputMapping as! DeltaCore.GameControllerInputMapping } get { return self.deltaCoreInputMapping as! DeltaCore.GameControllerInputMapping }
set { self.deltaCoreInputMapping = newValue } set { self.deltaCoreInputMapping = newValue }
} }

2
Delta/Database/OpenVGDB/GamesDatabase.swift
View File

@ -68,7 +68,7 @@ class GamesDatabase
{ {
static let version = -1 static let version = -1
fileprivate let connection: Connection private let connection: Connection
init() throws init() throws
{ {

4
Delta/Database/OpenVGDB/GamesDatabaseBrowserViewController.swift
View File

@ -15,9 +15,9 @@ class GamesDatabaseBrowserViewController: UITableViewController
{ {
var selectionHandler: ((GameMetadata) -> Void)? var selectionHandler: ((GameMetadata) -> Void)?
fileprivate let database: GamesDatabase? private let database: GamesDatabase?
fileprivate let dataSource: RSTArrayTableViewPrefetchingDataSource<GameMetadata, UIImage> private let dataSource: RSTArrayTableViewPrefetchingDataSource<GameMetadata, UIImage>
override init(style: UITableViewStyle) { override init(style: UITableViewStyle) {
fatalError() fatalError()

26
Delta/Emulation/GameViewController.swift
View File

@ -72,11 +72,11 @@ class GameViewController: DeltaCore.GameViewController
} }
//MARK: - Private Properties - //MARK: - Private Properties -
fileprivate var pauseViewController: PauseViewController? private var pauseViewController: PauseViewController?
fileprivate var pausingGameController: GameController? private var pausingGameController: GameController?
// Prevents the same save state from being saved multiple times // Prevents the same save state from being saved multiple times
fileprivate var pausedSaveState: PausedSaveState? { private var pausedSaveState: PausedSaveState? {
didSet didSet
{ {
if let saveState = oldValue, self.pausedSaveState == nil if let saveState = oldValue, self.pausedSaveState == nil
@ -93,17 +93,17 @@ class GameViewController: DeltaCore.GameViewController
} }
} }
fileprivate var _isLoadingSaveState = false private var _isLoadingSaveState = false
fileprivate var context = CIContext(options: [kCIContextWorkingColorSpace: NSNull()]) private var context = CIContext(options: [kCIContextWorkingColorSpace: NSNull()])
// Sustain Buttons // Sustain Buttons
fileprivate var isSelectingSustainedButtons = false private var isSelectingSustainedButtons = false
fileprivate var sustainInputsMapping: SustainInputsMapping? private var sustainInputsMapping: SustainInputsMapping?
fileprivate var sustainButtonsContentView: UIView! private var sustainButtonsContentView: UIView!
fileprivate var sustainButtonsBlurView: UIVisualEffectView! private var sustainButtonsBlurView: UIVisualEffectView!
fileprivate var sustainButtonsBackgroundView: RSTPlaceholderView! private var sustainButtonsBackgroundView: RSTPlaceholderView!
required init() required init()
{ {
@ -460,7 +460,7 @@ private extension GameViewController
/// Save States /// Save States
extension GameViewController: SaveStatesViewControllerDelegate extension GameViewController: SaveStatesViewControllerDelegate
{ {
fileprivate func updateAutoSaveState() private func updateAutoSaveState()
{ {
// Ensures game is non-nil and also a Game subclass // Ensures game is non-nil and also a Game subclass
guard let game = self.game as? Game else { return } guard let game = self.game as? Game else { return }
@ -513,7 +513,7 @@ extension GameViewController: SaveStatesViewControllerDelegate
} }
} }
fileprivate func update(_ saveState: SaveState, with replacementSaveState: SaveStateProtocol? = nil) private func update(_ saveState: SaveState, with replacementSaveState: SaveStateProtocol? = nil)
{ {
let isRunning = (self.emulatorCore?.state == .running) let isRunning = (self.emulatorCore?.state == .running)
@ -567,7 +567,7 @@ extension GameViewController: SaveStatesViewControllerDelegate
} }
} }
fileprivate func load(_ saveState: SaveStateProtocol) private func load(_ saveState: SaveStateProtocol)
{ {
let isRunning = (self.emulatorCore?.state == .running) let isRunning = (self.emulatorCore?.state == .running)

2
Delta/Emulation/PreviewGameViewController.swift
View File

@ -27,7 +27,7 @@ class PreviewGameViewController: DeltaCore.GameViewController
} }
} }
fileprivate var emulatorCoreQueue = DispatchQueue(label: "com.rileytestut.Delta.PreviewGameViewController.emulatorCoreQueue", qos: .userInitiated) private var emulatorCoreQueue = DispatchQueue(label: "com.rileytestut.Delta.PreviewGameViewController.emulatorCoreQueue", qos: .userInitiated)
override var game: GameProtocol? { override var game: GameProtocol? {
willSet { willSet {

14
Delta/Game Selection/GameCollectionViewController.swift
View File

@ -43,16 +43,16 @@ class GameCollectionViewController: UICollectionViewController
weak var activeEmulatorCore: EmulatorCore? weak var activeEmulatorCore: EmulatorCore?
fileprivate var activeSaveState: SaveStateProtocol? private var activeSaveState: SaveStateProtocol?
fileprivate let dataSource: RSTFetchedResultsCollectionViewPrefetchingDataSource<Game, UIImage> private let dataSource: RSTFetchedResultsCollectionViewPrefetchingDataSource<Game, UIImage>
fileprivate let prototypeCell = GridCollectionViewCell() private let prototypeCell = GridCollectionViewCell()
fileprivate var _performing3DTouchTransition = false private var _performing3DTouchTransition = false
fileprivate weak var _destination3DTouchTransitionViewController: UIViewController? private weak var _destination3DTouchTransitionViewController: UIViewController?
fileprivate var _renameAction: UIAlertAction? private var _renameAction: UIAlertAction?
fileprivate var _changingArtworkGame: Game? private var _changingArtworkGame: Game?
required init?(coder aDecoder: NSCoder) required init?(coder aDecoder: NSCoder)
{ {

10
Delta/Game Selection/GamesViewController.swift
View File

@ -35,11 +35,11 @@ class GamesViewController: UIViewController
} }
} }
fileprivate var pageViewController: UIPageViewController! private var pageViewController: UIPageViewController!
fileprivate var placeholderView: RSTPlaceholderView! private var placeholderView: RSTPlaceholderView!
fileprivate var pageControl: UIPageControl! private var pageControl: UIPageControl!
fileprivate let fetchedResultsController: NSFetchedResultsController<NSFetchRequestResult> private let fetchedResultsController: NSFetchedResultsController<NSFetchRequestResult>
override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) { override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
fatalError("initWithNibName: not implemented") fatalError("initWithNibName: not implemented")
@ -273,7 +273,7 @@ private extension GamesViewController
/// Importing /// Importing
extension GamesViewController: ImportControllerDelegate extension GamesViewController: ImportControllerDelegate
{ {
@IBAction fileprivate func importFiles() @IBAction private func importFiles()
{ {
var documentTypes = Set(System.supportedSystems.map { $0.gameType.rawValue }) var documentTypes = Set(System.supportedSystems.map { $0.gameType.rawValue })
documentTypes.insert(kUTTypeZipArchive as String) documentTypes.insert(kUTTypeZipArchive as String)

4
Delta/Game Selection/Segues/GamesStoryboardSegue.swift
View File

@ -10,9 +10,9 @@ import UIKit
class GamesStoryboardSegue: UIStoryboardSegue class GamesStoryboardSegue: UIStoryboardSegue
{ {
fileprivate let animator: UIViewPropertyAnimator private let animator: UIViewPropertyAnimator
fileprivate var isPresenting: Bool = true private var isPresenting: Bool = true
override init(identifier: String?, source: UIViewController, destination: UIViewController) override init(identifier: String?, source: UIViewController, destination: UIViewController)
{ {

4
Delta/Game Selection/Segues/InitialGamesStoryboardSegue.swift
View File

@ -10,9 +10,9 @@ import UIKit
class InitialGamesStoryboardSegue: UIStoryboardSegue class InitialGamesStoryboardSegue: UIStoryboardSegue
{ {
fileprivate let animator: UIViewPropertyAnimator private let animator: UIViewPropertyAnimator
fileprivate var isPresenting: Bool = true private var isPresenting: Bool = true
override init(identifier: String?, source: UIViewController, destination: UIViewController) override init(identifier: String?, source: UIViewController, destination: UIViewController)
{ {

2
Delta/Importing/Import Options/PhotoLibraryImportOption.swift
View File

@ -15,7 +15,7 @@ class PhotoLibraryImportOption: NSObject, ImportOption
let image: UIImage? = nil let image: UIImage? = nil
private let presentingViewController: UIViewController private let presentingViewController: UIViewController
fileprivate var completionHandler: ((Set<URL>?) -> Void)? private var completionHandler: ((Set<URL>?) -> Void)?
init(presentingViewController: UIViewController) init(presentingViewController: UIViewController)
{ {

12
Delta/Importing/ImportController.swift
View File

@ -37,14 +37,14 @@ class ImportController: NSObject
var delegate: ImportControllerDelegate? var delegate: ImportControllerDelegate?
var importOptions: [ImportOption]? var importOptions: [ImportOption]?
fileprivate weak var presentingViewController: UIViewController? private weak var presentingViewController: UIViewController?
// Store presentedViewController separately, since when we dismiss we don't know if it has already been dismissed. // Store presentedViewController separately, since when we dismiss we don't know if it has already been dismissed.
// Calling dismiss on presentingViewController in that case would dismiss presentingViewController, which is bad. // Calling dismiss on presentingViewController in that case would dismiss presentingViewController, which is bad.
fileprivate weak var presentedViewController: UIViewController? private weak var presentedViewController: UIViewController?
fileprivate let importQueue: OperationQueue private let importQueue: OperationQueue
fileprivate let fileCoordinator: NSFileCoordinator private let fileCoordinator: NSFileCoordinator
init(documentTypes: Set<String>) init(documentTypes: Set<String>)
{ {
@ -104,12 +104,12 @@ class ImportController: NSObject
#endif #endif
} }
@objc fileprivate func cancel() @objc private func cancel()
{ {
self.finish(with: nil, errors: []) self.finish(with: nil, errors: [])
} }
fileprivate func finish(with urls: Set<URL>?, errors: [Error]) private func finish(with urls: Set<URL>?, errors: [Error])
{ {
if let urls = urls if let urls = urls
{ {

6
Delta/Launch/LaunchViewController.swift
View File

@ -10,10 +10,10 @@ import UIKit
class LaunchViewController: UIViewController class LaunchViewController: UIViewController
{ {
@IBOutlet fileprivate var gameViewContainerView: UIView! @IBOutlet private var gameViewContainerView: UIView!
fileprivate var gameViewController: GameViewController! private var gameViewController: GameViewController!
fileprivate var presentedGameViewController: Bool = false private var presentedGameViewController: Bool = false
override var preferredStatusBarStyle: UIStatusBarStyle { override var preferredStatusBarStyle: UIStatusBarStyle {
return self.gameViewController?.preferredStatusBarStyle ?? .lightContent return self.gameViewController?.preferredStatusBarStyle ?? .lightContent

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

@ -26,7 +26,7 @@ class CheatTextView: UITextView
} }
} }
@NSCopying fileprivate var attributedFormat: NSAttributedString? @NSCopying private var attributedFormat: NSAttributedString?
required init?(coder aDecoder: NSCoder) required init?(coder aDecoder: NSCoder)
{ {

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

@ -29,7 +29,7 @@ class CheatsViewController: UITableViewController
weak var delegate: CheatsViewControllerDelegate? weak var delegate: CheatsViewControllerDelegate?
fileprivate let dataSource = RSTFetchedResultsTableViewDataSource<Cheat>(fetchedResultsController: NSFetchedResultsController()) private let dataSource = RSTFetchedResultsTableViewDataSource<Cheat>(fetchedResultsController: NSFetchedResultsController())
} }
extension CheatsViewController extension CheatsViewController

14
Delta/Pause Menu/Cheats/EditCheatViewController.swift
View File

@ -43,19 +43,19 @@ class EditCheatViewController: UITableViewController
var isPreviewing = false var isPreviewing = false
fileprivate var supportedCheatFormats: [CheatFormat]! private var supportedCheatFormats: [CheatFormat]!
fileprivate var selectedCheatFormat: CheatFormat { private var selectedCheatFormat: CheatFormat {
let cheatFormat = self.supportedCheatFormats[self.typeSegmentedControl.selectedSegmentIndex] let cheatFormat = self.supportedCheatFormats[self.typeSegmentedControl.selectedSegmentIndex]
return cheatFormat return cheatFormat
} }
fileprivate var mutableCheat: Cheat! private var mutableCheat: Cheat!
fileprivate var managedObjectContext = DatabaseManager.shared.newBackgroundContext() private var managedObjectContext = DatabaseManager.shared.newBackgroundContext()
@IBOutlet fileprivate var nameTextField: UITextField! @IBOutlet private var nameTextField: UITextField!
@IBOutlet fileprivate var typeSegmentedControl: UISegmentedControl! @IBOutlet private var typeSegmentedControl: UISegmentedControl!
@IBOutlet fileprivate var codeTextView: CheatTextView! @IBOutlet private var codeTextView: CheatTextView!
override var previewActionItems: [UIPreviewActionItem] override var previewActionItems: [UIPreviewActionItem]
{ {

8
Delta/Pause Menu/GridMenuViewController.swift
View File

@ -23,12 +23,12 @@ class GridMenuViewController: UICollectionViewController
get { return self.collectionView?.contentSize ?? CGSize.zero } get { return self.collectionView?.contentSize ?? CGSize.zero }
} }
fileprivate let dataSource = RSTArrayCollectionViewDataSource<MenuItem>(items: []) private let dataSource = RSTArrayCollectionViewDataSource<MenuItem>(items: [])
fileprivate var prototypeCell = GridCollectionViewCell() private var prototypeCell = GridCollectionViewCell()
fileprivate var previousIndexPath: IndexPath? = nil private var previousIndexPath: IndexPath? = nil
fileprivate var registeredKVOObservers = Set<NSKeyValueObservation>() private var registeredKVOObservers = Set<NSKeyValueObservation>()
init() init()
{ {

4
Delta/Pause Menu/PauseViewController.swift
View File

@ -38,9 +38,9 @@ class PauseViewController: UIViewController, PauseInfoProviding
/// Save States /// Save States
weak var saveStatesViewControllerDelegate: SaveStatesViewControllerDelegate? weak var saveStatesViewControllerDelegate: SaveStatesViewControllerDelegate?
fileprivate var saveStatesViewControllerMode = SaveStatesViewController.Mode.loading private var saveStatesViewControllerMode = SaveStatesViewController.Mode.loading
fileprivate var pauseNavigationController: UINavigationController! private var pauseNavigationController: UINavigationController!
/// UIViewController /// UIViewController
override var preferredContentSize: CGSize { override var preferredContentSize: CGSize {

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

@ -12,7 +12,7 @@ class SaveStatesCollectionHeaderView: UICollectionReusableView
{ {
let textLabel = UILabel() let textLabel = UILabel()
fileprivate let vibrancyView = UIVisualEffectView(effect: UIVibrancyEffect(blurEffect: UIBlurEffect(style: .dark))) private let vibrancyView = UIVisualEffectView(effect: UIVibrancyEffect(blurEffect: UIBlurEffect(style: .dark)))
var isTextLabelVibrancyEnabled = true { var isTextLabelVibrancyEnabled = true {
didSet { didSet {

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

@ -59,18 +59,18 @@ class SaveStatesViewController: UICollectionViewController
} }
} }
fileprivate var vibrancyView: UIVisualEffectView! private var vibrancyView: UIVisualEffectView!
fileprivate var placeholderView: RSTPlaceholderView! private var placeholderView: RSTPlaceholderView!
fileprivate var prototypeCell = GridCollectionViewCell() private var prototypeCell = GridCollectionViewCell()
fileprivate var prototypeCellWidthConstraint: NSLayoutConstraint! private var prototypeCellWidthConstraint: NSLayoutConstraint!
fileprivate var prototypeHeader = SaveStatesCollectionHeaderView() private var prototypeHeader = SaveStatesCollectionHeaderView()
fileprivate let dataSource: RSTFetchedResultsCollectionViewPrefetchingDataSource<SaveState, UIImage> private let dataSource: RSTFetchedResultsCollectionViewPrefetchingDataSource<SaveState, UIImage>
fileprivate var emulatorCoreSaveState: SaveStateProtocol? private var emulatorCoreSaveState: SaveStateProtocol?
fileprivate let dateFormatter: DateFormatter private let dateFormatter: DateFormatter
required init?(coder aDecoder: NSCoder) required init?(coder aDecoder: NSCoder)
{ {
@ -562,7 +562,7 @@ private extension SaveStatesViewController
//MARK: - 3D Touch - //MARK: - 3D Touch -
extension SaveStatesViewController: UIViewControllerPreviewingDelegate extension SaveStatesViewController: UIViewControllerPreviewingDelegate
{ {
fileprivate func prepareEmulatorCoreSaveState() private func prepareEmulatorCoreSaveState()
{ {
guard let emulatorCore = self.emulatorCore else { return } guard let emulatorCore = self.emulatorCore else { return }

4
Delta/Pause Menu/Segues/PauseStoryboardSegue.swift
View File

@ -10,8 +10,8 @@ import UIKit
class PauseStoryboardSegue: UIStoryboardSegue class PauseStoryboardSegue: UIStoryboardSegue
{ {
fileprivate let animator: UIViewPropertyAnimator private let animator: UIViewPropertyAnimator
fileprivate let presentationController: PausePresentationController private let presentationController: PausePresentationController
override init(identifier: String?, source: UIViewController, destination: UIViewController) override init(identifier: String?, source: UIViewController, destination: UIViewController)
{ {

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

@ -26,7 +26,7 @@ class ControllerSkinsViewController: UITableViewController
} }
} }
fileprivate let dataSource: RSTFetchedResultsTableViewPrefetchingDataSource<ControllerSkin, UIImage> private let dataSource: RSTFetchedResultsTableViewPrefetchingDataSource<ControllerSkin, UIImage>
required init?(coder aDecoder: NSCoder) required init?(coder aDecoder: NSCoder)
{ {

6
Delta/Settings/Controller Skins/SystemControllerSkinsViewController.swift
View File

@ -12,7 +12,7 @@ import DeltaCore
extension SystemControllerSkinsViewController extension SystemControllerSkinsViewController
{ {
fileprivate enum Section: Int private enum Section: Int
{ {
case portrait case portrait
case landscape case landscape
@ -23,8 +23,8 @@ class SystemControllerSkinsViewController: UITableViewController
{ {
var system: System! var system: System!
@IBOutlet fileprivate var portraitImageView: UIImageView! @IBOutlet private var portraitImageView: UIImageView!
@IBOutlet fileprivate var landscapeImageView: UIImageView! @IBOutlet private var landscapeImageView: UIImageView!
} }
extension SystemControllerSkinsViewController extension SystemControllerSkinsViewController

14
Delta/Settings/Controllers/ControllerInputsViewController.swift
View File

@ -28,17 +28,17 @@ class ControllerInputsViewController: UIViewController
} }
} }
fileprivate lazy var managedObjectContext: NSManagedObjectContext = DatabaseManager.shared.newBackgroundContext() private lazy var managedObjectContext: NSManagedObjectContext = DatabaseManager.shared.newBackgroundContext()
fileprivate var inputMappings = [System: GameControllerInputMapping]() private var inputMappings = [System: GameControllerInputMapping]()
fileprivate let supportedActionInputs: [ActionInput] = [.quickSave, .quickLoad, .fastForward] private let supportedActionInputs: [ActionInput] = [.quickSave, .quickLoad, .fastForward]
fileprivate var gameViewController: DeltaCore.GameViewController! private var gameViewController: DeltaCore.GameViewController!
fileprivate var actionsMenuViewController: GridMenuViewController! private var actionsMenuViewController: GridMenuViewController!
fileprivate var calloutViews = [AnyInput: InputCalloutView]() private var calloutViews = [AnyInput: InputCalloutView]()
fileprivate var activeCalloutView: InputCalloutView? private var activeCalloutView: InputCalloutView?
@IBOutlet private var actionsMenuViewControllerHeightConstraint: NSLayoutConstraint! @IBOutlet private var actionsMenuViewControllerHeightConstraint: NSLayoutConstraint!
@IBOutlet private var cancelTapGestureRecognizer: UITapGestureRecognizer! @IBOutlet private var cancelTapGestureRecognizer: UITapGestureRecognizer!

8
Delta/Settings/Controllers/ControllersSettingsViewController.swift
View File

@ -13,7 +13,7 @@ import Roxas
extension ControllersSettingsViewController extension ControllersSettingsViewController
{ {
fileprivate enum Section: Int private enum Section: Int
{ {
case none case none
case localDevice case localDevice
@ -46,7 +46,7 @@ class ControllersSettingsViewController: UITableViewController
} }
} }
fileprivate var gameController: GameController? { private var gameController: GameController? {
didSet { didSet {
// Order matters since localDeviceController changes Settings.localControllerPlayerIndex, which sends out NSNotification. // Order matters since localDeviceController changes Settings.localControllerPlayerIndex, which sends out NSNotification.
if oldValue == self.localDeviceController if oldValue == self.localDeviceController
@ -62,9 +62,9 @@ class ControllersSettingsViewController: UITableViewController
} }
} }
fileprivate var connectedControllers = ExternalGameControllerManager.shared.connectedControllers.sorted(by: { $0.playerIndex ?? NSIntegerMax < $1.playerIndex ?? NSIntegerMax }) private var connectedControllers = ExternalGameControllerManager.shared.connectedControllers.sorted(by: { $0.playerIndex ?? NSIntegerMax < $1.playerIndex ?? NSIntegerMax })
fileprivate lazy var localDeviceController: LocalDeviceController = { private lazy var localDeviceController: LocalDeviceController = {
let device = LocalDeviceController() let device = LocalDeviceController()
device.playerIndex = Settings.localControllerPlayerIndex device.playerIndex = Settings.localControllerPlayerIndex

2
Delta/Settings/Controllers/InputCalloutView.swift
View File

@ -33,7 +33,7 @@ class InputCalloutView: SMCalloutView
} }
} }
fileprivate let textLabel: UILabel private let textLabel: UILabel
init() init()
{ {

10
Delta/Settings/SettingsViewController.swift
View File

@ -12,7 +12,7 @@ import DeltaCore
import Roxas import Roxas
fileprivate extension SettingsViewController private extension SettingsViewController
{ {
enum Section: Int enum Section: Int
{ {
@ -37,12 +37,12 @@ fileprivate extension SettingsViewController
class SettingsViewController: UITableViewController class SettingsViewController: UITableViewController
{ {
@IBOutlet fileprivate var controllerOpacityLabel: UILabel! @IBOutlet private var controllerOpacityLabel: UILabel!
@IBOutlet fileprivate var controllerOpacitySlider: UISlider! @IBOutlet private var controllerOpacitySlider: UISlider!
fileprivate var selectionFeedbackGenerator: UISelectionFeedbackGenerator? private var selectionFeedbackGenerator: UISelectionFeedbackGenerator?
fileprivate var previousSelectedRowIndexPath: IndexPath? private var previousSelectedRowIndexPath: IndexPath?
required init?(coder aDecoder: NSCoder) required init?(coder aDecoder: NSCoder)
{ {