From 93119b47144eef391ac53cf76e782e3acf5bcd9b Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Tue, 20 Dec 2016 14:22:52 -0600 Subject: [PATCH] Reorganizes Xcode project structure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merges “Common” folder into main Delta target folder --- Delta.xcodeproj/project.pbxproj | 357 +++++++++--------- {Common => Delta}/Components/Action.swift | 0 .../GridCollectionViewCell.swift | 0 .../GridCollectionViewLayout.swift | 0 .../Importing/ImportController.swift | 0 .../LoadControllerSkinImageOperation.swift | 0 .../Loading}/LoadImageOperation.swift | 0 .../Loading}/LoadImageURLOperation.swift | 0 .../Database/DatabaseManager.swift | 2 +- .../Database/GamesDatabase.swift | 0 .../Database/Model/Human}/Cheat.swift | 0 .../Model/Human}/ControllerSkin.swift | 0 .../Database/Model/Human}/Game.swift | 0 .../Model/Human}/GameCollection.swift | 0 .../Database/Model/Human}/SaveState.swift | 0 .../Database/Model/Machine}/_Cheat.swift | 0 .../Model/Machine}/_ControllerSkin.swift | 0 .../Database/Model/Machine}/_Game.swift | 0 .../Model/Machine}/_GameCollection.swift | 0 .../Database/Model/Machine}/_SaveState.swift | 0 .../Model/Misc/ControllerSkinConfigurations.h | 0 .../Database/Model/Model.xcdatamodel/contents | 112 ++++++ .../NSFetchedResultsController+Conveniences.h | 0 .../NSFetchedResultsController+Conveniences.m | 0 .../NSManagedObject+Conveniences.swift | 0 .../NSManagedObjectContext+Conveniences.swift | 0 26 files changed, 281 insertions(+), 190 deletions(-) rename {Common => Delta}/Components/Action.swift (100%) rename {Common => Delta/Components}/Collection View/GridCollectionViewCell.swift (100%) rename {Common => Delta/Components}/Collection View/GridCollectionViewLayout.swift (100%) rename {Common => Delta/Components}/Importing/ImportController.swift (100%) rename {Common/Components => Delta/Components/Loading}/LoadControllerSkinImageOperation.swift (100%) rename {Common/Components => Delta/Components/Loading}/LoadImageOperation.swift (100%) rename {Common/Components => Delta/Components/Loading}/LoadImageURLOperation.swift (100%) rename {Common => Delta}/Database/DatabaseManager.swift (99%) rename {Common => Delta}/Database/GamesDatabase.swift (100%) rename {Common/Database/Model => Delta/Database/Model/Human}/Cheat.swift (100%) rename {Common/Database/Model => Delta/Database/Model/Human}/ControllerSkin.swift (100%) rename {Common/Database/Model => Delta/Database/Model/Human}/Game.swift (100%) rename {Common/Database/Model => Delta/Database/Model/Human}/GameCollection.swift (100%) rename {Common/Database/Model => Delta/Database/Model/Human}/SaveState.swift (100%) rename {Common/Database/Model => Delta/Database/Model/Machine}/_Cheat.swift (100%) rename {Common/Database/Model => Delta/Database/Model/Machine}/_ControllerSkin.swift (100%) rename {Common/Database/Model => Delta/Database/Model/Machine}/_Game.swift (100%) rename {Common/Database/Model => Delta/Database/Model/Machine}/_GameCollection.swift (100%) rename {Common/Database/Model => Delta/Database/Model/Machine}/_SaveState.swift (100%) rename {Common => Delta}/Database/Model/Misc/ControllerSkinConfigurations.h (100%) create mode 100644 Delta/Database/Model/Model.xcdatamodel/contents rename {Common => Delta}/Extensions/NSFetchedResultsController+Conveniences.h (100%) rename {Common => Delta}/Extensions/NSFetchedResultsController+Conveniences.m (100%) rename {Common => Delta}/Extensions/NSManagedObject+Conveniences.swift (100%) rename {Common => Delta}/Extensions/NSManagedObjectContext+Conveniences.swift (100%) diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj index cc3bd5e..0f878dd 100644 --- a/Delta.xcodeproj/project.pbxproj +++ b/Delta.xcodeproj/project.pbxproj @@ -26,25 +26,13 @@ BF0418141D01E93400E85BCF /* GBADeltaCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF0418131D01E93400E85BCF /* GBADeltaCore.framework */; }; BF0418151D01E93400E85BCF /* GBADeltaCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BF0418131D01E93400E85BCF /* GBADeltaCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; BF04E6FF1DB8625C000F35D3 /* ControllerSkinsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF04E6FE1DB8625C000F35D3 /* ControllerSkinsViewController.swift */; }; - BF0CDDAD1C8155D200640168 /* LoadImageOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0CDDAC1C8155D200640168 /* LoadImageOperation.swift */; }; - BF0D057F1DDD9A96002A71A7 /* GamesDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0D057E1DDD9A96002A71A7 /* GamesDatabase.swift */; }; BF107EC41BF413F000E0C32C /* GamesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF107EC31BF413F000E0C32C /* GamesViewController.swift */; }; BF11734D1DA32A5200047DF8 /* GameType+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF11734C1DA32A5200047DF8 /* GameType+Localization.swift */; }; BF1173501DA32CF600047DF8 /* ControllersSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF11734F1DA32CF600047DF8 /* ControllersSettingsViewController.swift */; }; BF13A7561D5D29B0000BB055 /* PreviewGameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF13A7551D5D29B0000BB055 /* PreviewGameViewController.swift */; }; BF13A7581D5D2FD9000BB055 /* EmulatorCore+Cheats.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF13A7571D5D2FD9000BB055 /* EmulatorCore+Cheats.swift */; }; - BF172AEB1C68986300C26774 /* NSManagedObjectContext+Conveniences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF172AEA1C68986300C26774 /* NSManagedObjectContext+Conveniences.swift */; }; BF1DAD5D1D9F576000E752A7 /* GameTypeControllerSkinsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF1DAD5C1D9F576000E752A7 /* GameTypeControllerSkinsViewController.swift */; }; BF27CC8E1BC9FEA200A20D89 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BF6BB2451BB73FE800CCF94A /* Assets.xcassets */; }; - BF28980D1DAAFB640023D8E9 /* Delta.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = BF28980B1DAAFB640023D8E9 /* Delta.xcdatamodeld */; }; - BF2898151DAAFC2A0023D8E9 /* Cheat.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF2898111DAAFC2A0023D8E9 /* Cheat.swift */; }; - BF2898161DAAFC2A0023D8E9 /* Game.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF2898121DAAFC2A0023D8E9 /* Game.swift */; }; - BF2898171DAAFC2A0023D8E9 /* GameCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF2898131DAAFC2A0023D8E9 /* GameCollection.swift */; }; - BF2898181DAAFC2A0023D8E9 /* SaveState.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF2898141DAAFC2A0023D8E9 /* SaveState.swift */; }; - BF2898211DAAFD720023D8E9 /* _Cheat.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF2898191DAAFC330023D8E9 /* _Cheat.swift */; }; - BF2898221DAAFD720023D8E9 /* _Game.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF28981A1DAAFC330023D8E9 /* _Game.swift */; }; - BF2898231DAAFD720023D8E9 /* _GameCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF28981B1DAAFC330023D8E9 /* _GameCollection.swift */; }; - BF2898241DAAFD720023D8E9 /* _SaveState.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF28981C1DAAFC330023D8E9 /* _SaveState.swift */; }; BF2B98E61C97E32F00F6D57D /* SaveStatesCollectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF2B98E51C97E32F00F6D57D /* SaveStatesCollectionHeaderView.swift */; }; BF31878B1D489AAA00BD020D /* CheatValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF31878A1D489AAA00BD020D /* CheatValidator.swift */; }; BF34FA071CF0F510006624C7 /* EditCheatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF34FA061CF0F510006624C7 /* EditCheatViewController.swift */; }; @@ -56,36 +44,48 @@ BF3540001C5DA3C500C1184C /* PausePresentationControllerContentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF353FFE1C5DA3C500C1184C /* PausePresentationControllerContentView.xib */; }; BF3540021C5DA3D500C1184C /* PauseStoryboardSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3540011C5DA3D500C1184C /* PauseStoryboardSegue.swift */; }; BF3540081C5DAFAD00C1184C /* PauseTransitionCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3540071C5DAFAD00C1184C /* PauseTransitionCoordinator.swift */; }; - BF4F562B1DC3C6AF00267E32 /* LoadImageURLOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF4F562A1DC3C6AF00267E32 /* LoadImageURLOperation.swift */; }; + BF59425C1E09BB810051894B /* Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942581E09BB810051894B /* Action.swift */; }; + BF5942641E09BBB10051894B /* LoadControllerSkinImageOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942611E09BBB10051894B /* LoadControllerSkinImageOperation.swift */; }; + BF5942651E09BBB10051894B /* LoadImageOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942621E09BBB10051894B /* LoadImageOperation.swift */; }; + BF5942661E09BBB10051894B /* LoadImageURLOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942631E09BBB10051894B /* LoadImageURLOperation.swift */; }; + BF59426A1E09BBD00051894B /* GridCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942681E09BBD00051894B /* GridCollectionViewCell.swift */; }; + BF59426B1E09BBD00051894B /* GridCollectionViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942691E09BBD00051894B /* GridCollectionViewLayout.swift */; }; + BF59426F1E09BC5D0051894B /* DatabaseManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF59426D1E09BC5D0051894B /* DatabaseManager.swift */; }; + BF5942701E09BC5D0051894B /* GamesDatabase.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF59426E1E09BC5D0051894B /* GamesDatabase.swift */; }; + BF5942731E09BC700051894B /* Model.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = BF5942721E09BC700051894B /* Model.xcdatamodel */; }; + BF59427C1E09BC830051894B /* Cheat.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942771E09BC830051894B /* Cheat.swift */; }; + BF59427D1E09BC830051894B /* ControllerSkin.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942781E09BC830051894B /* ControllerSkin.swift */; }; + BF59427E1E09BC830051894B /* Game.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942791E09BC830051894B /* Game.swift */; }; + BF59427F1E09BC830051894B /* GameCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF59427A1E09BC830051894B /* GameCollection.swift */; }; + BF5942801E09BC830051894B /* SaveState.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF59427B1E09BC830051894B /* SaveState.swift */; }; + BF5942861E09BC8B0051894B /* _Cheat.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942811E09BC8B0051894B /* _Cheat.swift */; }; + BF5942871E09BC8B0051894B /* _ControllerSkin.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942821E09BC8B0051894B /* _ControllerSkin.swift */; }; + BF5942881E09BC8B0051894B /* _Game.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942831E09BC8B0051894B /* _Game.swift */; }; + BF5942891E09BC8B0051894B /* _GameCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942841E09BC8B0051894B /* _GameCollection.swift */; }; + BF59428A1E09BC8B0051894B /* _SaveState.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942851E09BC8B0051894B /* _SaveState.swift */; }; + BF59428E1E09BCFB0051894B /* ImportController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF59428D1E09BCFB0051894B /* ImportController.swift */; }; + BF5942931E09BD1A0051894B /* NSFetchedResultsController+Conveniences.m in Sources */ = {isa = PBXBuildFile; fileRef = BF5942901E09BD1A0051894B /* NSFetchedResultsController+Conveniences.m */; }; + BF5942941E09BD1A0051894B /* NSManagedObject+Conveniences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942911E09BD1A0051894B /* NSManagedObject+Conveniences.swift */; }; + BF5942951E09BD1A0051894B /* NSManagedObjectContext+Conveniences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5942921E09BD1A0051894B /* NSManagedObjectContext+Conveniences.swift */; }; BF5E7F441B9A650B00AE44F8 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5E7F431B9A650B00AE44F8 /* SettingsViewController.swift */; }; BF5E7F461B9A652600AE44F8 /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BF5E7F451B9A652600AE44F8 /* Settings.storyboard */; }; BF6866171DCAC8B900BF2D06 /* ControllerSkin+Configuring.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF6866161DCAC8B900BF2D06 /* ControllerSkin+Configuring.swift */; }; BF696B801D9B2B02009639E0 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF696B7F1D9B2B02009639E0 /* Theme.swift */; }; BF70798C1B6B464B0019077C /* ZipZap.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF70798B1B6B464B0019077C /* ZipZap.framework */; }; BF70798D1B6B464B0019077C /* ZipZap.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BF70798B1B6B464B0019077C /* ZipZap.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - BF762EAB1BC1B076002C8866 /* NSManagedObject+Conveniences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF762EAA1BC1B076002C8866 /* NSManagedObject+Conveniences.swift */; }; BF797A2D1C2D339F00F1A000 /* UILabel+FontSize.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF797A2C1C2D339F00F1A000 /* UILabel+FontSize.swift */; }; BF7AE8081C2E858400B1B5BC /* PauseMenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7AE8041C2E858400B1B5BC /* PauseMenuViewController.swift */; }; BF7AE80A1C2E8C7600B1B5BC /* UIColor+Delta.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7AE8091C2E8C7600B1B5BC /* UIColor+Delta.swift */; }; - BF7AE81E1C2E984300B1B5BC /* GridCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7AE81A1C2E984300B1B5BC /* GridCollectionViewCell.swift */; }; - BF7AE8241C2E984300B1B5BC /* GridCollectionViewLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF7AE81D1C2E984300B1B5BC /* GridCollectionViewLayout.swift */; }; BF99A5971DC2F9C400468E9E /* ControllerSkinTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF99A5961DC2F9C400468E9E /* ControllerSkinTableViewCell.swift */; }; BF99C6941D0A9AA600BA92BC /* SNESDeltaCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFC134E01AAD82460087AD7B /* SNESDeltaCore.framework */; }; BF99C6951D0A9AA600BA92BC /* SNESDeltaCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BFC134E01AAD82460087AD7B /* SNESDeltaCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; BF9F4FCF1AAD7B87004C9500 /* DeltaCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF9F4FCE1AAD7B87004C9500 /* DeltaCore.framework */; }; BF9F4FD01AAD7B87004C9500 /* DeltaCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BF9F4FCE1AAD7B87004C9500 /* DeltaCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; BFA0D1271D3AE1F600565894 /* GameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF63BDE91D389EEB00FCB040 /* GameViewController.swift */; }; - BFA2315C1CED10BE0011E35A /* Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFA2315B1CED10BE0011E35A /* Action.swift */; }; BFAA1FED1B8AA4FA00495943 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFAA1FEC1B8AA4FA00495943 /* Settings.swift */; }; - BFACD5FD1DC3D2CE002D6DDC /* LoadControllerSkinImageOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF23C4941DC3CB2E00849B3E /* LoadControllerSkinImageOperation.swift */; }; - BFBAA86A1D5A483900A29C1B /* DatabaseManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBAA8691D5A483900A29C1B /* DatabaseManager.swift */; }; - BFC853351DB039AD00E8C372 /* _ControllerSkin.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFC853341DB039AD00E8C372 /* _ControllerSkin.swift */; }; - BFC853371DB039B500E8C372 /* ControllerSkin.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFC853361DB039B500E8C372 /* ControllerSkin.swift */; }; BFC9B7391CEFCD34008629BB /* CheatsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFC9B7381CEFCD34008629BB /* CheatsViewController.swift */; }; BFCEA67E1D56FF640061A534 /* UIViewControllerContextTransitioning+Conveniences.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFCEA67D1D56FF640061A534 /* UIViewControllerContextTransitioning+Conveniences.swift */; }; BFD097211D3A01B8005A44C2 /* SaveStatesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3540041C5DA70400C1184C /* SaveStatesViewController.swift */; }; - BFDB28451BC9DA7B001D0C83 /* ImportController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFDB28441BC9DA7B001D0C83 /* ImportController.swift */; }; - BFDD04EF1D5E27DB002D450E /* NSFetchedResultsController+Conveniences.m in Sources */ = {isa = PBXBuildFile; fileRef = BF02BCFF1D361BD1000892F2 /* NSFetchedResultsController+Conveniences.m */; }; BFDD04F11D5E2C27002D450E /* GameCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFDD04F01D5E2C27002D450E /* GameCollectionViewController.swift */; }; BFE4269E1D9C68E600DC913F /* SaveStatesStoryboardSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE4269D1D9C68E600DC913F /* SaveStatesStoryboardSegue.swift */; }; BFEC732D1AAECC4A00650035 /* Roxas.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFEC732C1AAECC4A00650035 /* Roxas.framework */; }; @@ -122,35 +122,19 @@ 22506DA00971C4300AF90A35 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 695E8C07A709B16AAD83AEC8 /* Pods_Delta.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Delta.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A19FF50F55441BC2B2248241 /* Pods-Delta.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Delta.release.xcconfig"; path = "Pods/Target Support Files/Pods-Delta/Pods-Delta.release.xcconfig"; sourceTree = ""; }; - BF02BCFE1D361BD1000892F2 /* NSFetchedResultsController+Conveniences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSFetchedResultsController+Conveniences.h"; sourceTree = ""; }; - BF02BCFF1D361BD1000892F2 /* NSFetchedResultsController+Conveniences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFetchedResultsController+Conveniences.m"; sourceTree = ""; }; BF02D5D91DDEBB3000A5E131 /* openvgdb.sqlite */ = {isa = PBXFileReference; lastKnownFileType = file; path = openvgdb.sqlite; sourceTree = ""; }; BF0418131D01E93400E85BCF /* GBADeltaCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = GBADeltaCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BF04E6FE1DB8625C000F35D3 /* ControllerSkinsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ControllerSkinsViewController.swift; path = "Controller Skins/ControllerSkinsViewController.swift"; sourceTree = ""; }; BF090CF11B490D8300DCAB45 /* Delta-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Delta-Bridging-Header.h"; sourceTree = ""; }; - BF0A81C41DC915C800443EF0 /* ControllerSkinConfigurations.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ControllerSkinConfigurations.h; path = Misc/ControllerSkinConfigurations.h; sourceTree = ""; }; - BF0CDDAC1C8155D200640168 /* LoadImageOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoadImageOperation.swift; path = Components/LoadImageOperation.swift; sourceTree = ""; }; - BF0D057E1DDD9A96002A71A7 /* GamesDatabase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GamesDatabase.swift; sourceTree = ""; }; BF107EC31BF413F000E0C32C /* GamesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GamesViewController.swift; sourceTree = ""; }; BF11734C1DA32A5200047DF8 /* GameType+Localization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "GameType+Localization.swift"; sourceTree = ""; }; BF11734F1DA32CF600047DF8 /* ControllersSettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ControllersSettingsViewController.swift; path = Controllers/ControllersSettingsViewController.swift; sourceTree = ""; }; BF13A7551D5D29B0000BB055 /* PreviewGameViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewGameViewController.swift; sourceTree = ""; }; BF13A7571D5D2FD9000BB055 /* EmulatorCore+Cheats.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "EmulatorCore+Cheats.swift"; sourceTree = ""; }; - BF172AEA1C68986300C26774 /* NSManagedObjectContext+Conveniences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Conveniences.swift"; sourceTree = ""; }; BF1DAD5C1D9F576000E752A7 /* GameTypeControllerSkinsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GameTypeControllerSkinsViewController.swift; path = "Controller Skins/GameTypeControllerSkinsViewController.swift"; sourceTree = ""; }; - BF23C4941DC3CB2E00849B3E /* LoadControllerSkinImageOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoadControllerSkinImageOperation.swift; path = Components/LoadControllerSkinImageOperation.swift; sourceTree = ""; }; BF27CC861BC9E3C600A20D89 /* Delta.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Delta.entitlements; sourceTree = ""; }; BF27CC8A1BC9FE4D00A20D89 /* Pods.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Pods.framework; path = "Pods/../build/Debug-appletvos/Pods.framework"; sourceTree = ""; }; BF27CC941BCB7B7A00A20D89 /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.0.sdk/System/Library/Frameworks/GameController.framework; sourceTree = DEVELOPER_DIR; }; - BF28980C1DAAFB640023D8E9 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = ""; }; - BF2898111DAAFC2A0023D8E9 /* Cheat.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cheat.swift; sourceTree = ""; }; - BF2898121DAAFC2A0023D8E9 /* Game.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Game.swift; sourceTree = ""; }; - BF2898131DAAFC2A0023D8E9 /* GameCollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameCollection.swift; sourceTree = ""; }; - BF2898141DAAFC2A0023D8E9 /* SaveState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SaveState.swift; sourceTree = ""; }; - BF2898191DAAFC330023D8E9 /* _Cheat.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _Cheat.swift; sourceTree = ""; }; - BF28981A1DAAFC330023D8E9 /* _Game.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _Game.swift; sourceTree = ""; }; - BF28981B1DAAFC330023D8E9 /* _GameCollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _GameCollection.swift; sourceTree = ""; }; - BF28981C1DAAFC330023D8E9 /* _SaveState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _SaveState.swift; sourceTree = ""; }; BF2B98E51C97E32F00F6D57D /* SaveStatesCollectionHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SaveStatesCollectionHeaderView.swift; path = "Pause Menu/Save States/SaveStatesCollectionHeaderView.swift"; sourceTree = ""; }; BF31878A1D489AAA00BD020D /* CheatValidator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CheatValidator.swift; path = "Pause Menu/Cheats/CheatValidator.swift"; sourceTree = ""; }; BF34FA061CF0F510006624C7 /* EditCheatViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EditCheatViewController.swift; path = "Pause Menu/Cheats/EditCheatViewController.swift"; sourceTree = ""; }; @@ -163,7 +147,31 @@ BF3540011C5DA3D500C1184C /* PauseStoryboardSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PauseStoryboardSegue.swift; path = "Pause Menu/Segues/PauseStoryboardSegue.swift"; sourceTree = ""; }; BF3540041C5DA70400C1184C /* SaveStatesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SaveStatesViewController.swift; path = "Pause Menu/Save States/SaveStatesViewController.swift"; sourceTree = ""; }; BF3540071C5DAFAD00C1184C /* PauseTransitionCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PauseTransitionCoordinator.swift; path = "Pause Menu/Segues/PauseTransitionCoordinator.swift"; sourceTree = ""; }; - BF4F562A1DC3C6AF00267E32 /* LoadImageURLOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoadImageURLOperation.swift; path = Components/LoadImageURLOperation.swift; sourceTree = ""; }; + BF5942581E09BB810051894B /* Action.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Action.swift; path = Components/Action.swift; sourceTree = ""; }; + BF5942611E09BBB10051894B /* LoadControllerSkinImageOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoadControllerSkinImageOperation.swift; path = Components/Loading/LoadControllerSkinImageOperation.swift; sourceTree = ""; }; + BF5942621E09BBB10051894B /* LoadImageOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoadImageOperation.swift; path = Components/Loading/LoadImageOperation.swift; sourceTree = ""; }; + BF5942631E09BBB10051894B /* LoadImageURLOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoadImageURLOperation.swift; path = Components/Loading/LoadImageURLOperation.swift; sourceTree = ""; }; + BF5942681E09BBD00051894B /* GridCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GridCollectionViewCell.swift; path = "Components/Collection View/GridCollectionViewCell.swift"; sourceTree = ""; }; + BF5942691E09BBD00051894B /* GridCollectionViewLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GridCollectionViewLayout.swift; path = "Components/Collection View/GridCollectionViewLayout.swift"; sourceTree = ""; }; + BF59426D1E09BC5D0051894B /* DatabaseManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DatabaseManager.swift; path = Database/DatabaseManager.swift; sourceTree = ""; }; + BF59426E1E09BC5D0051894B /* GamesDatabase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GamesDatabase.swift; path = Database/GamesDatabase.swift; sourceTree = ""; }; + BF5942721E09BC700051894B /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; name = Model.xcdatamodel; path = Database/Model/Model.xcdatamodel; sourceTree = ""; }; + BF5942771E09BC830051894B /* Cheat.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Cheat.swift; path = Database/Model/Human/Cheat.swift; sourceTree = ""; }; + BF5942781E09BC830051894B /* ControllerSkin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ControllerSkin.swift; path = Database/Model/Human/ControllerSkin.swift; sourceTree = ""; }; + BF5942791E09BC830051894B /* Game.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Game.swift; path = Database/Model/Human/Game.swift; sourceTree = ""; }; + BF59427A1E09BC830051894B /* GameCollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GameCollection.swift; path = Database/Model/Human/GameCollection.swift; sourceTree = ""; }; + BF59427B1E09BC830051894B /* SaveState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SaveState.swift; path = Database/Model/Human/SaveState.swift; sourceTree = ""; }; + BF5942811E09BC8B0051894B /* _Cheat.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = _Cheat.swift; path = Database/Model/Machine/_Cheat.swift; sourceTree = ""; }; + BF5942821E09BC8B0051894B /* _ControllerSkin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = _ControllerSkin.swift; path = Database/Model/Machine/_ControllerSkin.swift; sourceTree = ""; }; + BF5942831E09BC8B0051894B /* _Game.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = _Game.swift; path = Database/Model/Machine/_Game.swift; sourceTree = ""; }; + BF5942841E09BC8B0051894B /* _GameCollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = _GameCollection.swift; path = Database/Model/Machine/_GameCollection.swift; sourceTree = ""; }; + BF5942851E09BC8B0051894B /* _SaveState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = _SaveState.swift; path = Database/Model/Machine/_SaveState.swift; sourceTree = ""; }; + BF59428B1E09BC930051894B /* ControllerSkinConfigurations.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ControllerSkinConfigurations.h; path = Database/Model/Misc/ControllerSkinConfigurations.h; sourceTree = ""; }; + BF59428D1E09BCFB0051894B /* ImportController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ImportController.swift; path = Components/Importing/ImportController.swift; sourceTree = ""; }; + BF59428F1E09BD1A0051894B /* NSFetchedResultsController+Conveniences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSFetchedResultsController+Conveniences.h"; sourceTree = ""; }; + BF5942901E09BD1A0051894B /* NSFetchedResultsController+Conveniences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFetchedResultsController+Conveniences.m"; sourceTree = ""; }; + BF5942911E09BD1A0051894B /* NSManagedObject+Conveniences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+Conveniences.swift"; sourceTree = ""; }; + BF5942921E09BD1A0051894B /* NSManagedObjectContext+Conveniences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Conveniences.swift"; sourceTree = ""; }; BF5E7F431B9A650B00AE44F8 /* SettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; BF5E7F451B9A652600AE44F8 /* Settings.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Settings.storyboard; sourceTree = ""; }; BF63BDE91D389EEB00FCB040 /* GameViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameViewController.swift; sourceTree = ""; }; @@ -171,23 +179,15 @@ BF696B7F1D9B2B02009639E0 /* Theme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Theme.swift; path = Theming/Theme.swift; sourceTree = ""; }; BF6BB2451BB73FE800CCF94A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; BF70798B1B6B464B0019077C /* ZipZap.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ZipZap.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - BF762EAA1BC1B076002C8866 /* NSManagedObject+Conveniences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+Conveniences.swift"; sourceTree = ""; }; BF797A2C1C2D339F00F1A000 /* UILabel+FontSize.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UILabel+FontSize.swift"; sourceTree = ""; }; BF7AE8041C2E858400B1B5BC /* PauseMenuViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PauseMenuViewController.swift; path = "Pause Menu/PauseMenuViewController.swift"; sourceTree = ""; }; BF7AE8091C2E8C7600B1B5BC /* UIColor+Delta.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+Delta.swift"; sourceTree = ""; }; - BF7AE81A1C2E984300B1B5BC /* GridCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GridCollectionViewCell.swift; path = "Collection View/GridCollectionViewCell.swift"; sourceTree = ""; }; - BF7AE81D1C2E984300B1B5BC /* GridCollectionViewLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GridCollectionViewLayout.swift; path = "Collection View/GridCollectionViewLayout.swift"; sourceTree = ""; }; BF99A5961DC2F9C400468E9E /* ControllerSkinTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ControllerSkinTableViewCell.swift; path = "Controller Skins/ControllerSkinTableViewCell.swift"; sourceTree = ""; }; BF9F4FCE1AAD7B87004C9500 /* DeltaCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DeltaCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - BFA2315B1CED10BE0011E35A /* Action.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Action.swift; path = Components/Action.swift; sourceTree = ""; }; BFAA1FEC1B8AA4FA00495943 /* Settings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = ""; }; - BFBAA8691D5A483900A29C1B /* DatabaseManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatabaseManager.swift; sourceTree = ""; }; BFC134E01AAD82460087AD7B /* SNESDeltaCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SNESDeltaCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - BFC853341DB039AD00E8C372 /* _ControllerSkin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = _ControllerSkin.swift; sourceTree = ""; }; - BFC853361DB039B500E8C372 /* ControllerSkin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ControllerSkin.swift; sourceTree = ""; }; BFC9B7381CEFCD34008629BB /* CheatsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CheatsViewController.swift; path = "Pause Menu/Cheats/CheatsViewController.swift"; sourceTree = ""; }; BFCEA67D1D56FF640061A534 /* UIViewControllerContextTransitioning+Conveniences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewControllerContextTransitioning+Conveniences.swift"; sourceTree = ""; }; - BFDB28441BC9DA7B001D0C83 /* ImportController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportController.swift; sourceTree = ""; }; BFDD04F01D5E2C27002D450E /* GameCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameCollectionViewController.swift; sourceTree = ""; }; BFE4269D1D9C68E600DC913F /* SaveStatesStoryboardSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SaveStatesStoryboardSegue.swift; path = Segues/SaveStatesStoryboardSegue.swift; sourceTree = ""; }; BFEC732C1AAECC4A00650035 /* Roxas.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Roxas.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -230,18 +230,14 @@ BF13A7571D5D2FD9000BB055 /* EmulatorCore+Cheats.swift */, BF11734C1DA32A5200047DF8 /* GameType+Localization.swift */, BF6866161DCAC8B900BF2D06 /* ControllerSkin+Configuring.swift */, + BF59428F1E09BD1A0051894B /* NSFetchedResultsController+Conveniences.h */, + BF5942901E09BD1A0051894B /* NSFetchedResultsController+Conveniences.m */, + BF5942911E09BD1A0051894B /* NSManagedObject+Conveniences.swift */, + BF5942921E09BD1A0051894B /* NSManagedObjectContext+Conveniences.swift */, ); path = Extensions; sourceTree = ""; }; - BF0A81C31DC915A100443EF0 /* Misc */ = { - isa = PBXGroup; - children = ( - BF0A81C41DC915C800443EF0 /* ControllerSkinConfigurations.h */, - ); - name = Misc; - sourceTree = ""; - }; BF11734E1DA32CEC00047DF8 /* Controllers */ = { isa = PBXGroup; children = ( @@ -260,30 +256,6 @@ name = "Controller Skins"; sourceTree = ""; }; - BF28980F1DAAFC0E0023D8E9 /* Human */ = { - isa = PBXGroup; - children = ( - BF2898111DAAFC2A0023D8E9 /* Cheat.swift */, - BFC853361DB039B500E8C372 /* ControllerSkin.swift */, - BF2898121DAAFC2A0023D8E9 /* Game.swift */, - BF2898131DAAFC2A0023D8E9 /* GameCollection.swift */, - BF2898141DAAFC2A0023D8E9 /* SaveState.swift */, - ); - name = Human; - sourceTree = ""; - }; - BF2898101DAAFC120023D8E9 /* Machine */ = { - isa = PBXGroup; - children = ( - BF2898191DAAFC330023D8E9 /* _Cheat.swift */, - BFC853341DB039AD00E8C372 /* _ControllerSkin.swift */, - BF28981A1DAAFC330023D8E9 /* _Game.swift */, - BF28981B1DAAFC330023D8E9 /* _GameCollection.swift */, - BF28981C1DAAFC330023D8E9 /* _SaveState.swift */, - ); - name = Machine; - sourceTree = ""; - }; BF353FFB1C5DA2F600C1184C /* Presentation Controller */ = { isa = PBXGroup; children = ( @@ -302,39 +274,6 @@ name = "Save States"; sourceTree = ""; }; - BF4566E31BC09026007BFA1A /* Common */ = { - isa = PBXGroup; - children = ( - BFF1E55F1BE04BF6000E9EF6 /* Components */, - BF9257571BD8244800B109DA /* Collection View */, - BF4566E41BC0902E007BFA1A /* Database */, - BFDB28431BC9D9D1001D0C83 /* Importing */, - BF762EA91BC1B044002C8866 /* Extensions */, - ); - path = Common; - sourceTree = ""; - }; - BF4566E41BC0902E007BFA1A /* Database */ = { - isa = PBXGroup; - children = ( - BFBAA8691D5A483900A29C1B /* DatabaseManager.swift */, - BF0D057E1DDD9A96002A71A7 /* GamesDatabase.swift */, - BF4566E51BC09033007BFA1A /* Model */, - ); - path = Database; - sourceTree = ""; - }; - BF4566E51BC09033007BFA1A /* Model */ = { - isa = PBXGroup; - children = ( - BF28980B1DAAFB640023D8E9 /* Delta.xcdatamodeld */, - BF28980F1DAAFC0E0023D8E9 /* Human */, - BF2898101DAAFC120023D8E9 /* Machine */, - BF0A81C31DC915A100443EF0 /* Misc */, - ); - path = Model; - sourceTree = ""; - }; BF46894D1AAC469800A2586D /* Game Selection */ = { isa = PBXGroup; children = ( @@ -345,6 +284,97 @@ path = "Game Selection"; sourceTree = ""; }; + BF5942571E09BB5D0051894B /* Components */ = { + isa = PBXGroup; + children = ( + BF5942581E09BB810051894B /* Action.swift */, + BF59428C1E09BCE50051894B /* Importing */, + BF5942671E09BBB70051894B /* Collection View */, + BF5942601E09BBA80051894B /* Loading */, + ); + name = Components; + sourceTree = ""; + }; + BF5942601E09BBA80051894B /* Loading */ = { + isa = PBXGroup; + children = ( + BF5942611E09BBB10051894B /* LoadControllerSkinImageOperation.swift */, + BF5942621E09BBB10051894B /* LoadImageOperation.swift */, + BF5942631E09BBB10051894B /* LoadImageURLOperation.swift */, + ); + name = Loading; + sourceTree = ""; + }; + BF5942671E09BBB70051894B /* Collection View */ = { + isa = PBXGroup; + children = ( + BF5942681E09BBD00051894B /* GridCollectionViewCell.swift */, + BF5942691E09BBD00051894B /* GridCollectionViewLayout.swift */, + ); + name = "Collection View"; + sourceTree = ""; + }; + BF59426C1E09BC450051894B /* Database */ = { + isa = PBXGroup; + children = ( + BF59426D1E09BC5D0051894B /* DatabaseManager.swift */, + BF59426E1E09BC5D0051894B /* GamesDatabase.swift */, + BF5942711E09BC690051894B /* Model */, + ); + name = Database; + sourceTree = ""; + }; + BF5942711E09BC690051894B /* Model */ = { + isa = PBXGroup; + children = ( + BF5942721E09BC700051894B /* Model.xcdatamodel */, + BF5942741E09BC740051894B /* Human */, + BF5942751E09BC780051894B /* Machine */, + BF5942761E09BC7C0051894B /* Misc */, + ); + name = Model; + sourceTree = ""; + }; + BF5942741E09BC740051894B /* Human */ = { + isa = PBXGroup; + children = ( + BF5942771E09BC830051894B /* Cheat.swift */, + BF5942781E09BC830051894B /* ControllerSkin.swift */, + BF5942791E09BC830051894B /* Game.swift */, + BF59427A1E09BC830051894B /* GameCollection.swift */, + BF59427B1E09BC830051894B /* SaveState.swift */, + ); + name = Human; + sourceTree = ""; + }; + BF5942751E09BC780051894B /* Machine */ = { + isa = PBXGroup; + children = ( + BF5942811E09BC8B0051894B /* _Cheat.swift */, + BF5942821E09BC8B0051894B /* _ControllerSkin.swift */, + BF5942831E09BC8B0051894B /* _Game.swift */, + BF5942841E09BC8B0051894B /* _GameCollection.swift */, + BF5942851E09BC8B0051894B /* _SaveState.swift */, + ); + name = Machine; + sourceTree = ""; + }; + BF5942761E09BC7C0051894B /* Misc */ = { + isa = PBXGroup; + children = ( + BF59428B1E09BC930051894B /* ControllerSkinConfigurations.h */, + ); + name = Misc; + sourceTree = ""; + }; + BF59428C1E09BCE50051894B /* Importing */ = { + isa = PBXGroup; + children = ( + BF59428D1E09BCFB0051894B /* ImportController.swift */, + ); + name = Importing; + sourceTree = ""; + }; BF696B7E1D9B2AE6009639E0 /* Theming */ = { isa = PBXGroup; children = ( @@ -353,17 +383,6 @@ name = Theming; sourceTree = ""; }; - BF762EA91BC1B044002C8866 /* Extensions */ = { - isa = PBXGroup; - children = ( - BF762EAA1BC1B076002C8866 /* NSManagedObject+Conveniences.swift */, - BF172AEA1C68986300C26774 /* NSManagedObjectContext+Conveniences.swift */, - BF02BCFE1D361BD1000892F2 /* NSFetchedResultsController+Conveniences.h */, - BF02BCFF1D361BD1000892F2 /* NSFetchedResultsController+Conveniences.m */, - ); - path = Extensions; - sourceTree = ""; - }; BF7AE7FA1C2E851F00B1B5BC /* Pause Menu */ = { isa = PBXGroup; children = ( @@ -388,15 +407,6 @@ name = Segues; sourceTree = ""; }; - BF9257571BD8244800B109DA /* Collection View */ = { - isa = PBXGroup; - children = ( - BF7AE81A1C2E984300B1B5BC /* GridCollectionViewCell.swift */, - BF7AE81D1C2E984300B1B5BC /* GridCollectionViewLayout.swift */, - ); - name = "Collection View"; - sourceTree = ""; - }; BF9F4FCD1AAD7B25004C9500 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -437,14 +447,6 @@ name = Cheats; sourceTree = ""; }; - BFDB28431BC9D9D1001D0C83 /* Importing */ = { - isa = PBXGroup; - children = ( - BFDB28441BC9DA7B001D0C83 /* ImportController.swift */, - ); - path = Importing; - sourceTree = ""; - }; BFEC732F1AAECCBD00650035 /* Resources */ = { isa = PBXGroup; children = ( @@ -454,22 +456,10 @@ path = Resources; sourceTree = ""; }; - BFF1E55F1BE04BF6000E9EF6 /* Components */ = { - isa = PBXGroup; - children = ( - BFA2315B1CED10BE0011E35A /* Action.swift */, - BF0CDDAC1C8155D200640168 /* LoadImageOperation.swift */, - BF4F562A1DC3C6AF00267E32 /* LoadImageURLOperation.swift */, - BF23C4941DC3CB2E00849B3E /* LoadControllerSkinImageOperation.swift */, - ); - name = Components; - sourceTree = ""; - }; BFFA71CE1AAC406100EE9DD1 = { isa = PBXGroup; children = ( BFFA71D91AAC406100EE9DD1 /* Delta */, - BF4566E31BC09026007BFA1A /* Common */, BFEC732F1AAECCBD00650035 /* Resources */, BF9F4FCD1AAD7B25004C9500 /* Frameworks */, BFFA71D81AAC406100EE9DD1 /* Products */, @@ -495,6 +485,8 @@ BFFB709D1AF99ACA00DE56FE /* Emulation */, BF7AE7FA1C2E851F00B1B5BC /* Pause Menu */, BFAA1FEB1B8AA4E800495943 /* Settings */, + BF59426C1E09BC450051894B /* Database */, + BF5942571E09BB5D0051894B /* Components */, BF696B7E1D9B2AE6009639E0 /* Theming */, BF090CEE1B490C1A00DCAB45 /* Extensions */, BFFA71DA1AAC406100EE9DD1 /* Supporting Files */, @@ -704,65 +696,65 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + BF59426A1E09BBD00051894B /* GridCollectionViewCell.swift in Sources */, + BF59427C1E09BC830051894B /* Cheat.swift in Sources */, BF3540081C5DAFAD00C1184C /* PauseTransitionCoordinator.swift in Sources */, + BF59427E1E09BC830051894B /* Game.swift in Sources */, BFAA1FED1B8AA4FA00495943 /* Settings.swift in Sources */, - BF7AE8241C2E984300B1B5BC /* GridCollectionViewLayout.swift in Sources */, - BF28980D1DAAFB640023D8E9 /* Delta.xcdatamodeld in Sources */, BFA0D1271D3AE1F600565894 /* GameViewController.swift in Sources */, + BF59428A1E09BC8B0051894B /* _SaveState.swift in Sources */, + BF5942801E09BC830051894B /* SaveState.swift in Sources */, + BF59428E1E09BCFB0051894B /* ImportController.swift in Sources */, BF13A7581D5D2FD9000BB055 /* EmulatorCore+Cheats.swift in Sources */, BF31878B1D489AAA00BD020D /* CheatValidator.swift in Sources */, BFFC46201D59823500AF2CC6 /* InitialGamesStoryboardSegue.swift in Sources */, - BFA2315C1CED10BE0011E35A /* Action.swift in Sources */, + BF5942731E09BC700051894B /* Model.xcdatamodel in Sources */, + BF5942951E09BD1A0051894B /* NSManagedObjectContext+Conveniences.swift in Sources */, BF353FF91C5D870B00C1184C /* PauseItem.swift in Sources */, - BFBAA86A1D5A483900A29C1B /* DatabaseManager.swift in Sources */, BFDD04F11D5E2C27002D450E /* GameCollectionViewController.swift in Sources */, BFE4269E1D9C68E600DC913F /* SaveStatesStoryboardSegue.swift in Sources */, BFFA71DD1AAC406100EE9DD1 /* AppDelegate.swift in Sources */, - BF2898241DAAFD720023D8E9 /* _SaveState.swift in Sources */, + BF59426B1E09BBD00051894B /* GridCollectionViewLayout.swift in Sources */, BF04E6FF1DB8625C000F35D3 /* ControllerSkinsViewController.swift in Sources */, - BF7AE81E1C2E984300B1B5BC /* GridCollectionViewCell.swift in Sources */, + BF5942891E09BC8B0051894B /* _GameCollection.swift in Sources */, BF34FA111CF1899D006624C7 /* CheatTextView.swift in Sources */, BF1DAD5D1D9F576000E752A7 /* GameTypeControllerSkinsViewController.swift in Sources */, BFFC46231D5984A000AF2CC6 /* LaunchViewController.swift in Sources */, + BF5942701E09BC5D0051894B /* GamesDatabase.swift in Sources */, BF34FA071CF0F510006624C7 /* EditCheatViewController.swift in Sources */, + BF5942881E09BC8B0051894B /* _Game.swift in Sources */, BF11734D1DA32A5200047DF8 /* GameType+Localization.swift in Sources */, BFFC461F1D59823500AF2CC6 /* GamesStoryboardSegue.swift in Sources */, - BF2898211DAAFD720023D8E9 /* _Cheat.swift in Sources */, BF2B98E61C97E32F00F6D57D /* SaveStatesCollectionHeaderView.swift in Sources */, - BF2898221DAAFD720023D8E9 /* _Game.swift in Sources */, - BF762EAB1BC1B076002C8866 /* NSManagedObject+Conveniences.swift in Sources */, BFC9B7391CEFCD34008629BB /* CheatsViewController.swift in Sources */, BF353FFF1C5DA3C500C1184C /* PausePresentationController.swift in Sources */, BFFC464C1D5998D600AF2CC6 /* CheatTableViewCell.swift in Sources */, + BF5942941E09BD1A0051894B /* NSManagedObject+Conveniences.swift in Sources */, BF7AE80A1C2E8C7600B1B5BC /* UIColor+Delta.swift in Sources */, - BFACD5FD1DC3D2CE002D6DDC /* LoadControllerSkinImageOperation.swift in Sources */, BF797A2D1C2D339F00F1A000 /* UILabel+FontSize.swift in Sources */, + BF5942641E09BBB10051894B /* LoadControllerSkinImageOperation.swift in Sources */, + BF5942871E09BC8B0051894B /* _ControllerSkin.swift in Sources */, BFD097211D3A01B8005A44C2 /* SaveStatesViewController.swift in Sources */, BF3540021C5DA3D500C1184C /* PauseStoryboardSegue.swift in Sources */, - BF0CDDAD1C8155D200640168 /* LoadImageOperation.swift in Sources */, - BF2898171DAAFC2A0023D8E9 /* GameCollection.swift in Sources */, BF107EC41BF413F000E0C32C /* GamesViewController.swift in Sources */, - BF2898181DAAFC2A0023D8E9 /* SaveState.swift in Sources */, - BF172AEB1C68986300C26774 /* NSManagedObjectContext+Conveniences.swift in Sources */, - BFC853351DB039AD00E8C372 /* _ControllerSkin.swift in Sources */, - BFC853371DB039B500E8C372 /* ControllerSkin.swift in Sources */, + BF59426F1E09BC5D0051894B /* DatabaseManager.swift in Sources */, BF13A7561D5D29B0000BB055 /* PreviewGameViewController.swift in Sources */, BF6866171DCAC8B900BF2D06 /* ControllerSkin+Configuring.swift in Sources */, - BFDD04EF1D5E27DB002D450E /* NSFetchedResultsController+Conveniences.m in Sources */, + BF59427D1E09BC830051894B /* ControllerSkin.swift in Sources */, + BF5942651E09BBB10051894B /* LoadImageOperation.swift in Sources */, BFCEA67E1D56FF640061A534 /* UIViewControllerContextTransitioning+Conveniences.swift in Sources */, - BF2898161DAAFC2A0023D8E9 /* Game.swift in Sources */, - BF0D057F1DDD9A96002A71A7 /* GamesDatabase.swift in Sources */, BF1173501DA32CF600047DF8 /* ControllersSettingsViewController.swift in Sources */, BFFC461E1D59823500AF2CC6 /* GamesPresentationController.swift in Sources */, BF99A5971DC2F9C400468E9E /* ControllerSkinTableViewCell.swift in Sources */, + BF5942861E09BC8B0051894B /* _Cheat.swift in Sources */, BF5E7F441B9A650B00AE44F8 /* SettingsViewController.swift in Sources */, - BF4F562B1DC3C6AF00267E32 /* LoadImageURLOperation.swift in Sources */, - BF2898231DAAFD720023D8E9 /* _GameCollection.swift in Sources */, + BF5942931E09BD1A0051894B /* NSFetchedResultsController+Conveniences.m in Sources */, + BF5942661E09BBB10051894B /* LoadImageURLOperation.swift in Sources */, BF353FF21C5D7FB000C1184C /* PauseViewController.swift in Sources */, - BFDB28451BC9DA7B001D0C83 /* ImportController.swift in Sources */, - BF2898151DAAFC2A0023D8E9 /* Cheat.swift in Sources */, + BF59425C1E09BB810051894B /* Action.swift in Sources */, BF696B801D9B2B02009639E0 /* Theme.swift in Sources */, BF7AE8081C2E858400B1B5BC /* PauseMenuViewController.swift in Sources */, + BF59427F1E09BC830051894B /* GameCollection.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -967,19 +959,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - -/* Begin XCVersionGroup section */ - BF28980B1DAAFB640023D8E9 /* Delta.xcdatamodeld */ = { - isa = XCVersionGroup; - children = ( - BF28980C1DAAFB640023D8E9 /* Model.xcdatamodel */, - ); - currentVersion = BF28980C1DAAFB640023D8E9 /* Model.xcdatamodel */; - path = Delta.xcdatamodeld; - sourceTree = ""; - versionGroupType = wrapper.xcdatamodel; - }; -/* End XCVersionGroup section */ }; rootObject = BFFA71CF1AAC406100EE9DD1 /* Project object */; } diff --git a/Common/Components/Action.swift b/Delta/Components/Action.swift similarity index 100% rename from Common/Components/Action.swift rename to Delta/Components/Action.swift diff --git a/Common/Collection View/GridCollectionViewCell.swift b/Delta/Components/Collection View/GridCollectionViewCell.swift similarity index 100% rename from Common/Collection View/GridCollectionViewCell.swift rename to Delta/Components/Collection View/GridCollectionViewCell.swift diff --git a/Common/Collection View/GridCollectionViewLayout.swift b/Delta/Components/Collection View/GridCollectionViewLayout.swift similarity index 100% rename from Common/Collection View/GridCollectionViewLayout.swift rename to Delta/Components/Collection View/GridCollectionViewLayout.swift diff --git a/Common/Importing/ImportController.swift b/Delta/Components/Importing/ImportController.swift similarity index 100% rename from Common/Importing/ImportController.swift rename to Delta/Components/Importing/ImportController.swift diff --git a/Common/Components/LoadControllerSkinImageOperation.swift b/Delta/Components/Loading/LoadControllerSkinImageOperation.swift similarity index 100% rename from Common/Components/LoadControllerSkinImageOperation.swift rename to Delta/Components/Loading/LoadControllerSkinImageOperation.swift diff --git a/Common/Components/LoadImageOperation.swift b/Delta/Components/Loading/LoadImageOperation.swift similarity index 100% rename from Common/Components/LoadImageOperation.swift rename to Delta/Components/Loading/LoadImageOperation.swift diff --git a/Common/Components/LoadImageURLOperation.swift b/Delta/Components/Loading/LoadImageURLOperation.swift similarity index 100% rename from Common/Components/LoadImageURLOperation.swift rename to Delta/Components/Loading/LoadImageURLOperation.swift diff --git a/Common/Database/DatabaseManager.swift b/Delta/Database/DatabaseManager.swift similarity index 99% rename from Common/Database/DatabaseManager.swift rename to Delta/Database/DatabaseManager.swift index 32185c0..3429695 100644 --- a/Common/Database/DatabaseManager.swift +++ b/Delta/Database/DatabaseManager.swift @@ -24,7 +24,7 @@ final class DatabaseManager: NSPersistentContainer private init() { guard - let modelURL = Bundle(for: DatabaseManager.self).url(forResource: "Delta", withExtension: "momd"), + let modelURL = Bundle(for: DatabaseManager.self).url(forResource: "Model", withExtension: "mom"), let managedObjectModel = NSManagedObjectModel(contentsOf: modelURL) else { fatalError("Core Data model cannot be found. Aborting.") } diff --git a/Common/Database/GamesDatabase.swift b/Delta/Database/GamesDatabase.swift similarity index 100% rename from Common/Database/GamesDatabase.swift rename to Delta/Database/GamesDatabase.swift diff --git a/Common/Database/Model/Cheat.swift b/Delta/Database/Model/Human/Cheat.swift similarity index 100% rename from Common/Database/Model/Cheat.swift rename to Delta/Database/Model/Human/Cheat.swift diff --git a/Common/Database/Model/ControllerSkin.swift b/Delta/Database/Model/Human/ControllerSkin.swift similarity index 100% rename from Common/Database/Model/ControllerSkin.swift rename to Delta/Database/Model/Human/ControllerSkin.swift diff --git a/Common/Database/Model/Game.swift b/Delta/Database/Model/Human/Game.swift similarity index 100% rename from Common/Database/Model/Game.swift rename to Delta/Database/Model/Human/Game.swift diff --git a/Common/Database/Model/GameCollection.swift b/Delta/Database/Model/Human/GameCollection.swift similarity index 100% rename from Common/Database/Model/GameCollection.swift rename to Delta/Database/Model/Human/GameCollection.swift diff --git a/Common/Database/Model/SaveState.swift b/Delta/Database/Model/Human/SaveState.swift similarity index 100% rename from Common/Database/Model/SaveState.swift rename to Delta/Database/Model/Human/SaveState.swift diff --git a/Common/Database/Model/_Cheat.swift b/Delta/Database/Model/Machine/_Cheat.swift similarity index 100% rename from Common/Database/Model/_Cheat.swift rename to Delta/Database/Model/Machine/_Cheat.swift diff --git a/Common/Database/Model/_ControllerSkin.swift b/Delta/Database/Model/Machine/_ControllerSkin.swift similarity index 100% rename from Common/Database/Model/_ControllerSkin.swift rename to Delta/Database/Model/Machine/_ControllerSkin.swift diff --git a/Common/Database/Model/_Game.swift b/Delta/Database/Model/Machine/_Game.swift similarity index 100% rename from Common/Database/Model/_Game.swift rename to Delta/Database/Model/Machine/_Game.swift diff --git a/Common/Database/Model/_GameCollection.swift b/Delta/Database/Model/Machine/_GameCollection.swift similarity index 100% rename from Common/Database/Model/_GameCollection.swift rename to Delta/Database/Model/Machine/_GameCollection.swift diff --git a/Common/Database/Model/_SaveState.swift b/Delta/Database/Model/Machine/_SaveState.swift similarity index 100% rename from Common/Database/Model/_SaveState.swift rename to Delta/Database/Model/Machine/_SaveState.swift diff --git a/Common/Database/Model/Misc/ControllerSkinConfigurations.h b/Delta/Database/Model/Misc/ControllerSkinConfigurations.h similarity index 100% rename from Common/Database/Model/Misc/ControllerSkinConfigurations.h rename to Delta/Database/Model/Misc/ControllerSkinConfigurations.h diff --git a/Delta/Database/Model/Model.xcdatamodel/contents b/Delta/Database/Model/Model.xcdatamodel/contents new file mode 100644 index 0000000..62b6475 --- /dev/null +++ b/Delta/Database/Model/Model.xcdatamodel/contents @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Common/Extensions/NSFetchedResultsController+Conveniences.h b/Delta/Extensions/NSFetchedResultsController+Conveniences.h similarity index 100% rename from Common/Extensions/NSFetchedResultsController+Conveniences.h rename to Delta/Extensions/NSFetchedResultsController+Conveniences.h diff --git a/Common/Extensions/NSFetchedResultsController+Conveniences.m b/Delta/Extensions/NSFetchedResultsController+Conveniences.m similarity index 100% rename from Common/Extensions/NSFetchedResultsController+Conveniences.m rename to Delta/Extensions/NSFetchedResultsController+Conveniences.m diff --git a/Common/Extensions/NSManagedObject+Conveniences.swift b/Delta/Extensions/NSManagedObject+Conveniences.swift similarity index 100% rename from Common/Extensions/NSManagedObject+Conveniences.swift rename to Delta/Extensions/NSManagedObject+Conveniences.swift diff --git a/Common/Extensions/NSManagedObjectContext+Conveniences.swift b/Delta/Extensions/NSManagedObjectContext+Conveniences.swift similarity index 100% rename from Common/Extensions/NSManagedObjectContext+Conveniences.swift rename to Delta/Extensions/NSManagedObjectContext+Conveniences.swift