From 6e3037ced5386b3569b1a0f6b3b8473b959e19cc Mon Sep 17 00:00:00 2001 From: Stephen Bensley <76857027+stephenbensley@users.noreply.github.com> Date: Thu, 5 Sep 2024 14:50:26 -0700 Subject: [PATCH] Reorganize source code to be consistent across projects. --- {QueahEngine => Core}/GameModel.swift | 0 {QueahEngine => Core}/GameNode.swift | 0 {QueahEngine => Core}/GamePosition.swift | 0 {QueahEngine => Core}/PlayerPosition.swift | 0 {QueahEngine => Core}/PositionEvaluator.swift | 0 {QueahEngine => Core}/Queah.swift | 0 {QueahEngine => Core}/Solver.swift | 0 Queah.xcodeproj/project.pbxproj | 120 ++++++------------ .../{Solver.xcscheme => QueahSolver.xcscheme} | 12 +- .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/app-icon.png | Bin .../Assets.xcassets/Contents.json | 0 .../game-board.imageset/Contents.json | 0 .../game-board.imageset/game-board.png | Bin .../game-board.imageset/game-board@2x.png | Bin .../game-board.imageset/game-board@3x.png | Bin .../launch-background.colorset/Contents.json | 0 .../Contents.json | 0 .../piece-black-selected.png | Bin .../piece-black-selected@2x.png | Bin .../piece-black-selected@3x.png | Bin .../Contents.json | 0 .../piece-black-unselected.png | Bin .../piece-black-unselected@2x.png | Bin .../piece-black-unselected@3x.png | Bin .../Contents.json | 0 .../piece-white-selected.png | Bin .../piece-white-selected@2x.png | Bin .../piece-white-selected@3x.png | Bin .../Contents.json | 0 .../piece-white-unselected.png | Bin .../piece-white-unselected@2x.png | Bin .../piece-white-unselected@3x.png | Bin .../space-selected.imageset/Contents.json | 0 .../space-selected.png | Bin .../space-selected@2x.png | Bin .../space-selected@3x.png | Bin {QueahApp/Scene => Queah}/BoardLocation.swift | 0 {QueahApp/Scene => Queah}/BoardSpace.swift | 0 {QueahApp/View => Queah}/ContentView.swift | 0 {QueahApp/Scene => Queah}/GameBoard.swift | 0 {QueahApp/Scene => Queah}/GamePiece.swift | 0 {QueahApp/Scene => Queah}/GameScene.swift | 0 {QueahApp/View => Queah}/GameView.swift | 0 Queah-Info.plist => Queah/Info.plist | 0 {QueahApp/Scene => Queah}/MenuButton.swift | 0 {QueahApp/View => Queah}/MenuView.swift | 0 {QueahApp/View => Queah}/QueahApp.swift | 0 {QueahApp/Model => Queah}/QueahModel.swift | 0 {QueahApp/View => Queah}/RulesView.swift | 0 Queah/icon.afdesign~lock~ | Bin 0 -> 120 bytes .../Preview Assets.xcassets/Contents.json | 6 - {QueahApp => Resources}/artwork.afdesign | Bin {QueahApp => Resources}/icon.afdesign | Bin .../queahSolution.data | Bin {QueahApp/Resources => Resources}/rules.txt | 0 57 files changed, 48 insertions(+), 90 deletions(-) rename {QueahEngine => Core}/GameModel.swift (100%) rename {QueahEngine => Core}/GameNode.swift (100%) rename {QueahEngine => Core}/GamePosition.swift (100%) rename {QueahEngine => Core}/PlayerPosition.swift (100%) rename {QueahEngine => Core}/PositionEvaluator.swift (100%) rename {QueahEngine => Core}/Queah.swift (100%) rename {QueahEngine => Core}/Solver.swift (100%) rename Queah.xcodeproj/xcshareddata/xcschemes/{Solver.xcscheme => QueahSolver.xcscheme} (90%) rename {QueahApp => Queah}/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename {QueahApp => Queah}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {QueahApp => Queah}/Assets.xcassets/AppIcon.appiconset/app-icon.png (100%) rename {QueahApp => Queah}/Assets.xcassets/Contents.json (100%) rename {QueahApp => Queah}/Assets.xcassets/game-board.imageset/Contents.json (100%) rename {QueahApp => Queah}/Assets.xcassets/game-board.imageset/game-board.png (100%) rename {QueahApp => Queah}/Assets.xcassets/game-board.imageset/game-board@2x.png (100%) rename {QueahApp => Queah}/Assets.xcassets/game-board.imageset/game-board@3x.png (100%) rename {QueahApp => Queah}/Assets.xcassets/launch-background.colorset/Contents.json (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-black-selected.imageset/Contents.json (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-black-selected.imageset/piece-black-selected.png (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-black-selected.imageset/piece-black-selected@2x.png (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-black-selected.imageset/piece-black-selected@3x.png (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-black-unselected.imageset/Contents.json (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected.png (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected@2x.png (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected@3x.png (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-white-selected.imageset/Contents.json (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-white-selected.imageset/piece-white-selected.png (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-white-selected.imageset/piece-white-selected@2x.png (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-white-selected.imageset/piece-white-selected@3x.png (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-white-unselected.imageset/Contents.json (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected.png (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected@2x.png (100%) rename {QueahApp => Queah}/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected@3x.png (100%) rename {QueahApp => Queah}/Assets.xcassets/space-selected.imageset/Contents.json (100%) rename {QueahApp => Queah}/Assets.xcassets/space-selected.imageset/space-selected.png (100%) rename {QueahApp => Queah}/Assets.xcassets/space-selected.imageset/space-selected@2x.png (100%) rename {QueahApp => Queah}/Assets.xcassets/space-selected.imageset/space-selected@3x.png (100%) rename {QueahApp/Scene => Queah}/BoardLocation.swift (100%) rename {QueahApp/Scene => Queah}/BoardSpace.swift (100%) rename {QueahApp/View => Queah}/ContentView.swift (100%) rename {QueahApp/Scene => Queah}/GameBoard.swift (100%) rename {QueahApp/Scene => Queah}/GamePiece.swift (100%) rename {QueahApp/Scene => Queah}/GameScene.swift (100%) rename {QueahApp/View => Queah}/GameView.swift (100%) rename Queah-Info.plist => Queah/Info.plist (100%) rename {QueahApp/Scene => Queah}/MenuButton.swift (100%) rename {QueahApp/View => Queah}/MenuView.swift (100%) rename {QueahApp/View => Queah}/QueahApp.swift (100%) rename {QueahApp/Model => Queah}/QueahModel.swift (100%) rename {QueahApp/View => Queah}/RulesView.swift (100%) create mode 100644 Queah/icon.afdesign~lock~ delete mode 100644 QueahSolver/Preview Content/Preview Assets.xcassets/Contents.json rename {QueahApp => Resources}/artwork.afdesign (100%) rename {QueahApp => Resources}/icon.afdesign (100%) rename {QueahApp/Resources => Resources}/queahSolution.data (100%) rename {QueahApp/Resources => Resources}/rules.txt (100%) diff --git a/QueahEngine/GameModel.swift b/Core/GameModel.swift similarity index 100% rename from QueahEngine/GameModel.swift rename to Core/GameModel.swift diff --git a/QueahEngine/GameNode.swift b/Core/GameNode.swift similarity index 100% rename from QueahEngine/GameNode.swift rename to Core/GameNode.swift diff --git a/QueahEngine/GamePosition.swift b/Core/GamePosition.swift similarity index 100% rename from QueahEngine/GamePosition.swift rename to Core/GamePosition.swift diff --git a/QueahEngine/PlayerPosition.swift b/Core/PlayerPosition.swift similarity index 100% rename from QueahEngine/PlayerPosition.swift rename to Core/PlayerPosition.swift diff --git a/QueahEngine/PositionEvaluator.swift b/Core/PositionEvaluator.swift similarity index 100% rename from QueahEngine/PositionEvaluator.swift rename to Core/PositionEvaluator.swift diff --git a/QueahEngine/Queah.swift b/Core/Queah.swift similarity index 100% rename from QueahEngine/Queah.swift rename to Core/Queah.swift diff --git a/QueahEngine/Solver.swift b/Core/Solver.swift similarity index 100% rename from QueahEngine/Solver.swift rename to Core/Solver.swift diff --git a/Queah.xcodeproj/project.pbxproj b/Queah.xcodeproj/project.pbxproj index 9bac6ee..1c71275 100644 --- a/Queah.xcodeproj/project.pbxproj +++ b/Queah.xcodeproj/project.pbxproj @@ -24,7 +24,6 @@ DCA32CCC2C596FB8009DF4A5 /* SolverApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA32CCB2C596FB8009DF4A5 /* SolverApp.swift */; }; DCA32CCE2C596FB8009DF4A5 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA32CCD2C596FB8009DF4A5 /* ContentView.swift */; }; DCA32CD02C596FB8009DF4A5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DCA32CCF2C596FB8009DF4A5 /* Assets.xcassets */; }; - DCA32CD32C596FB8009DF4A5 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DCA32CD22C596FB8009DF4A5 /* Preview Assets.xcassets */; }; DCA32CEC2C5ADED9009DF4A5 /* PositionEvaluator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA32CC32C595FC2009DF4A5 /* PositionEvaluator.swift */; }; DCA32CED2C5ADED9009DF4A5 /* Solver.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA32CC12C594ACD009DF4A5 /* Solver.swift */; }; DCA32CEE2C5ADED9009DF4A5 /* GamePosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA32CBB2C587535009DF4A5 /* GamePosition.swift */; }; @@ -56,7 +55,7 @@ DC4A8AE22A3F59F70068924C /* QueahApp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueahApp.swift; sourceTree = ""; }; DC4A8AE82A3F5A0C0068924C /* icon.afdesign */ = {isa = PBXFileReference; lastKnownFileType = file; path = icon.afdesign; sourceTree = ""; }; DC4A8AE92A3F5A0C0068924C /* artwork.afdesign */ = {isa = PBXFileReference; lastKnownFileType = file; path = artwork.afdesign; sourceTree = ""; }; - DC4A8AEF2A3F5BCE0068924C /* Queah-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Queah-Info.plist"; sourceTree = ""; }; + DC4A8AEF2A3F5BCE0068924C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; DC73A5732C5AFD1C008BBD55 /* queahSolution.data */ = {isa = PBXFileReference; lastKnownFileType = file; path = queahSolution.data; sourceTree = ""; }; DC84DF5A2A3F5669009368A3 /* Queah.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Queah.app; sourceTree = BUILT_PRODUCTS_DIR; }; DC84DF612A3F5669009368A3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -66,11 +65,10 @@ DCA32CBF2C594637009DF4A5 /* GameNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameNode.swift; sourceTree = ""; }; DCA32CC12C594ACD009DF4A5 /* Solver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Solver.swift; sourceTree = ""; }; DCA32CC32C595FC2009DF4A5 /* PositionEvaluator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PositionEvaluator.swift; sourceTree = ""; }; - DCA32CC92C596FB8009DF4A5 /* Solver.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Solver.app; sourceTree = BUILT_PRODUCTS_DIR; }; + DCA32CC92C596FB8009DF4A5 /* Queah Solver.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Queah Solver.app"; sourceTree = BUILT_PRODUCTS_DIR; }; DCA32CCB2C596FB8009DF4A5 /* SolverApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SolverApp.swift; sourceTree = ""; }; DCA32CCD2C596FB8009DF4A5 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; DCA32CCF2C596FB8009DF4A5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - DCA32CD22C596FB8009DF4A5 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; DCA32CD42C596FB8009DF4A5 /* Solver.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Solver.entitlements; sourceTree = ""; }; DCA32CE02C5A9000009DF4A5 /* GameModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameModel.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -100,57 +98,26 @@ name = Frameworks; sourceTree = ""; }; - DC4A8AC82A3F59A20068924C /* Model */ = { - isa = PBXGroup; - children = ( - DC4A8ACC2A3F59C60068924C /* QueahModel.swift */, - ); - path = Model; - sourceTree = ""; - }; - DC4A8AC92A3F59A70068924C /* Resources */ = { + DC77B7B32C8A5D7400D9DF28 /* Resources */ = { isa = PBXGroup; children = ( + DC4A8AE92A3F5A0C0068924C /* artwork.afdesign */, + DC4A8AE82A3F5A0C0068924C /* icon.afdesign */, DC73A5732C5AFD1C008BBD55 /* queahSolution.data */, DC4A8AD02A3F59D40068924C /* rules.txt */, ); path = Resources; sourceTree = ""; }; - DC4A8ACA2A3F59AD0068924C /* Scene */ = { - isa = PBXGroup; - children = ( - DC4A8AD72A3F59E20068924C /* BoardLocation.swift */, - DC4A8AD32A3F59E20068924C /* BoardSpace.swift */, - DC4A8AD42A3F59E20068924C /* GameBoard.swift */, - DC4A8AD22A3F59E20068924C /* GamePiece.swift */, - DC4A8AD52A3F59E20068924C /* GameScene.swift */, - DC4A8AD62A3F59E20068924C /* MenuButton.swift */, - ); - path = Scene; - sourceTree = ""; - }; - DC4A8ACB2A3F59B50068924C /* View */ = { - isa = PBXGroup; - children = ( - DC4A8ADF2A3F59F70068924C /* ContentView.swift */, - DC4A8AE02A3F59F70068924C /* GameView.swift */, - DC4A8AE12A3F59F70068924C /* MenuView.swift */, - DC4A8AE22A3F59F70068924C /* QueahApp.swift */, - DC4A8ADE2A3F59F70068924C /* RulesView.swift */, - ); - path = View; - sourceTree = ""; - }; DC84DF512A3F5669009368A3 = { isa = PBXGroup; children = ( + DCA32CB82C586989009DF4A5 /* Core */, DC0AC49A2A3F58350028B4EE /* Frameworks */, DC84DF5B2A3F5669009368A3 /* Products */, - DCA32CB82C586989009DF4A5 /* QueahEngine */, - DC4A8AEF2A3F5BCE0068924C /* Queah-Info.plist */, - DC84DF5C2A3F5669009368A3 /* QueahApp */, + DC84DF5C2A3F5669009368A3 /* Queah */, DCA32CCA2C596FB8009DF4A5 /* QueahSolver */, + DC77B7B32C8A5D7400D9DF28 /* Resources */, ); sourceTree = ""; }; @@ -158,26 +125,33 @@ isa = PBXGroup; children = ( DC84DF5A2A3F5669009368A3 /* Queah.app */, - DCA32CC92C596FB8009DF4A5 /* Solver.app */, + DCA32CC92C596FB8009DF4A5 /* Queah Solver.app */, ); name = Products; sourceTree = ""; }; - DC84DF5C2A3F5669009368A3 /* QueahApp */ = { + DC84DF5C2A3F5669009368A3 /* Queah */ = { isa = PBXGroup; children = ( - DC4A8AE92A3F5A0C0068924C /* artwork.afdesign */, DC84DF612A3F5669009368A3 /* Assets.xcassets */, - DC4A8AE82A3F5A0C0068924C /* icon.afdesign */, - DC4A8AC82A3F59A20068924C /* Model */, - DC4A8AC92A3F59A70068924C /* Resources */, - DC4A8ACA2A3F59AD0068924C /* Scene */, - DC4A8ACB2A3F59B50068924C /* View */, + DC4A8AD72A3F59E20068924C /* BoardLocation.swift */, + DC4A8AD32A3F59E20068924C /* BoardSpace.swift */, + DC4A8ADF2A3F59F70068924C /* ContentView.swift */, + DC4A8AD42A3F59E20068924C /* GameBoard.swift */, + DC4A8AD22A3F59E20068924C /* GamePiece.swift */, + DC4A8AD52A3F59E20068924C /* GameScene.swift */, + DC4A8AE02A3F59F70068924C /* GameView.swift */, + DC4A8AEF2A3F5BCE0068924C /* Info.plist */, + DC4A8AD62A3F59E20068924C /* MenuButton.swift */, + DC4A8AE12A3F59F70068924C /* MenuView.swift */, + DC4A8AE22A3F59F70068924C /* QueahApp.swift */, + DC4A8ACC2A3F59C60068924C /* QueahModel.swift */, + DC4A8ADE2A3F59F70068924C /* RulesView.swift */, ); - path = QueahApp; + path = Queah; sourceTree = ""; }; - DCA32CB82C586989009DF4A5 /* QueahEngine */ = { + DCA32CB82C586989009DF4A5 /* Core */ = { isa = PBXGroup; children = ( DCA32CE02C5A9000009DF4A5 /* GameModel.swift */, @@ -188,29 +162,20 @@ DCA32CBD2C59283C009DF4A5 /* Queah.swift */, DCA32CC12C594ACD009DF4A5 /* Solver.swift */, ); - path = QueahEngine; + path = Core; sourceTree = ""; }; DCA32CCA2C596FB8009DF4A5 /* QueahSolver */ = { isa = PBXGroup; children = ( - DCA32CCB2C596FB8009DF4A5 /* SolverApp.swift */, - DCA32CCD2C596FB8009DF4A5 /* ContentView.swift */, DCA32CCF2C596FB8009DF4A5 /* Assets.xcassets */, + DCA32CCD2C596FB8009DF4A5 /* ContentView.swift */, DCA32CD42C596FB8009DF4A5 /* Solver.entitlements */, - DCA32CD12C596FB8009DF4A5 /* Preview Content */, + DCA32CCB2C596FB8009DF4A5 /* SolverApp.swift */, ); path = QueahSolver; sourceTree = ""; }; - DCA32CD12C596FB8009DF4A5 /* Preview Content */ = { - isa = PBXGroup; - children = ( - DCA32CD22C596FB8009DF4A5 /* Preview Assets.xcassets */, - ); - path = "Preview Content"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -231,9 +196,9 @@ productReference = DC84DF5A2A3F5669009368A3 /* Queah.app */; productType = "com.apple.product-type.application"; }; - DCA32CC82C596FB8009DF4A5 /* Solver */ = { + DCA32CC82C596FB8009DF4A5 /* QueahSolver */ = { isa = PBXNativeTarget; - buildConfigurationList = DCA32CD52C596FB8009DF4A5 /* Build configuration list for PBXNativeTarget "Solver" */; + buildConfigurationList = DCA32CD52C596FB8009DF4A5 /* Build configuration list for PBXNativeTarget "QueahSolver" */; buildPhases = ( DCA32CC52C596FB8009DF4A5 /* Sources */, DCA32CC62C596FB8009DF4A5 /* Frameworks */, @@ -243,9 +208,9 @@ ); dependencies = ( ); - name = Solver; + name = QueahSolver; productName = Solver; - productReference = DCA32CC92C596FB8009DF4A5 /* Solver.app */; + productReference = DCA32CC92C596FB8009DF4A5 /* Queah Solver.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -280,7 +245,7 @@ projectRoot = ""; targets = ( DC84DF592A3F5669009368A3 /* Queah */, - DCA32CC82C596FB8009DF4A5 /* Solver */, + DCA32CC82C596FB8009DF4A5 /* QueahSolver */, ); }; /* End PBXProject section */ @@ -300,7 +265,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - DCA32CD32C596FB8009DF4A5 /* Preview Assets.xcassets in Resources */, DCA32CD02C596FB8009DF4A5 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -478,7 +442,7 @@ DEVELOPMENT_TEAM = 6X2P4HJBQW; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = "Queah-Info.plist"; + INFOPLIST_FILE = Queah/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Queah; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.board-games"; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; @@ -510,7 +474,7 @@ DEVELOPMENT_TEAM = 6X2P4HJBQW; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = "Queah-Info.plist"; + INFOPLIST_FILE = Queah/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Queah; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.board-games"; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; @@ -541,7 +505,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"QueahSolver/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = 6X2P4HJBQW; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; @@ -557,8 +521,8 @@ LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MACOSX_DEPLOYMENT_TARGET = 14.5; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.stephenbensley.Solver; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = com.stephenbensley.QueahSolver; + PRODUCT_NAME = "Queah Solver"; SDKROOT = macosx; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -576,7 +540,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"QueahSolver/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = 6X2P4HJBQW; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; @@ -592,8 +556,8 @@ LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MACOSX_DEPLOYMENT_TARGET = 14.5; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.stephenbensley.Solver; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = com.stephenbensley.QueahSolver; + PRODUCT_NAME = "Queah Solver"; SDKROOT = macosx; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -621,7 +585,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - DCA32CD52C596FB8009DF4A5 /* Build configuration list for PBXNativeTarget "Solver" */ = { + DCA32CD52C596FB8009DF4A5 /* Build configuration list for PBXNativeTarget "QueahSolver" */ = { isa = XCConfigurationList; buildConfigurations = ( DCA32CD62C596FB8009DF4A5 /* Debug */, diff --git a/Queah.xcodeproj/xcshareddata/xcschemes/Solver.xcscheme b/Queah.xcodeproj/xcshareddata/xcschemes/QueahSolver.xcscheme similarity index 90% rename from Queah.xcodeproj/xcshareddata/xcschemes/Solver.xcscheme rename to Queah.xcodeproj/xcshareddata/xcschemes/QueahSolver.xcscheme index 5e2dbfa..24d2e06 100644 --- a/Queah.xcodeproj/xcshareddata/xcschemes/Solver.xcscheme +++ b/Queah.xcodeproj/xcshareddata/xcschemes/QueahSolver.xcscheme @@ -16,8 +16,8 @@ @@ -45,8 +45,8 @@ @@ -62,8 +62,8 @@ diff --git a/QueahApp/Assets.xcassets/AccentColor.colorset/Contents.json b/Queah/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from QueahApp/Assets.xcassets/AccentColor.colorset/Contents.json rename to Queah/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/QueahApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/Queah/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from QueahApp/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Queah/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/QueahApp/Assets.xcassets/AppIcon.appiconset/app-icon.png b/Queah/Assets.xcassets/AppIcon.appiconset/app-icon.png similarity index 100% rename from QueahApp/Assets.xcassets/AppIcon.appiconset/app-icon.png rename to Queah/Assets.xcassets/AppIcon.appiconset/app-icon.png diff --git a/QueahApp/Assets.xcassets/Contents.json b/Queah/Assets.xcassets/Contents.json similarity index 100% rename from QueahApp/Assets.xcassets/Contents.json rename to Queah/Assets.xcassets/Contents.json diff --git a/QueahApp/Assets.xcassets/game-board.imageset/Contents.json b/Queah/Assets.xcassets/game-board.imageset/Contents.json similarity index 100% rename from QueahApp/Assets.xcassets/game-board.imageset/Contents.json rename to Queah/Assets.xcassets/game-board.imageset/Contents.json diff --git a/QueahApp/Assets.xcassets/game-board.imageset/game-board.png b/Queah/Assets.xcassets/game-board.imageset/game-board.png similarity index 100% rename from QueahApp/Assets.xcassets/game-board.imageset/game-board.png rename to Queah/Assets.xcassets/game-board.imageset/game-board.png diff --git a/QueahApp/Assets.xcassets/game-board.imageset/game-board@2x.png b/Queah/Assets.xcassets/game-board.imageset/game-board@2x.png similarity index 100% rename from QueahApp/Assets.xcassets/game-board.imageset/game-board@2x.png rename to Queah/Assets.xcassets/game-board.imageset/game-board@2x.png diff --git a/QueahApp/Assets.xcassets/game-board.imageset/game-board@3x.png b/Queah/Assets.xcassets/game-board.imageset/game-board@3x.png similarity index 100% rename from QueahApp/Assets.xcassets/game-board.imageset/game-board@3x.png rename to Queah/Assets.xcassets/game-board.imageset/game-board@3x.png diff --git a/QueahApp/Assets.xcassets/launch-background.colorset/Contents.json b/Queah/Assets.xcassets/launch-background.colorset/Contents.json similarity index 100% rename from QueahApp/Assets.xcassets/launch-background.colorset/Contents.json rename to Queah/Assets.xcassets/launch-background.colorset/Contents.json diff --git a/QueahApp/Assets.xcassets/piece-black-selected.imageset/Contents.json b/Queah/Assets.xcassets/piece-black-selected.imageset/Contents.json similarity index 100% rename from QueahApp/Assets.xcassets/piece-black-selected.imageset/Contents.json rename to Queah/Assets.xcassets/piece-black-selected.imageset/Contents.json diff --git a/QueahApp/Assets.xcassets/piece-black-selected.imageset/piece-black-selected.png b/Queah/Assets.xcassets/piece-black-selected.imageset/piece-black-selected.png similarity index 100% rename from QueahApp/Assets.xcassets/piece-black-selected.imageset/piece-black-selected.png rename to Queah/Assets.xcassets/piece-black-selected.imageset/piece-black-selected.png diff --git a/QueahApp/Assets.xcassets/piece-black-selected.imageset/piece-black-selected@2x.png b/Queah/Assets.xcassets/piece-black-selected.imageset/piece-black-selected@2x.png similarity index 100% rename from QueahApp/Assets.xcassets/piece-black-selected.imageset/piece-black-selected@2x.png rename to Queah/Assets.xcassets/piece-black-selected.imageset/piece-black-selected@2x.png diff --git a/QueahApp/Assets.xcassets/piece-black-selected.imageset/piece-black-selected@3x.png b/Queah/Assets.xcassets/piece-black-selected.imageset/piece-black-selected@3x.png similarity index 100% rename from QueahApp/Assets.xcassets/piece-black-selected.imageset/piece-black-selected@3x.png rename to Queah/Assets.xcassets/piece-black-selected.imageset/piece-black-selected@3x.png diff --git a/QueahApp/Assets.xcassets/piece-black-unselected.imageset/Contents.json b/Queah/Assets.xcassets/piece-black-unselected.imageset/Contents.json similarity index 100% rename from QueahApp/Assets.xcassets/piece-black-unselected.imageset/Contents.json rename to Queah/Assets.xcassets/piece-black-unselected.imageset/Contents.json diff --git a/QueahApp/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected.png b/Queah/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected.png similarity index 100% rename from QueahApp/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected.png rename to Queah/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected.png diff --git a/QueahApp/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected@2x.png b/Queah/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected@2x.png similarity index 100% rename from QueahApp/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected@2x.png rename to Queah/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected@2x.png diff --git a/QueahApp/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected@3x.png b/Queah/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected@3x.png similarity index 100% rename from QueahApp/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected@3x.png rename to Queah/Assets.xcassets/piece-black-unselected.imageset/piece-black-unselected@3x.png diff --git a/QueahApp/Assets.xcassets/piece-white-selected.imageset/Contents.json b/Queah/Assets.xcassets/piece-white-selected.imageset/Contents.json similarity index 100% rename from QueahApp/Assets.xcassets/piece-white-selected.imageset/Contents.json rename to Queah/Assets.xcassets/piece-white-selected.imageset/Contents.json diff --git a/QueahApp/Assets.xcassets/piece-white-selected.imageset/piece-white-selected.png b/Queah/Assets.xcassets/piece-white-selected.imageset/piece-white-selected.png similarity index 100% rename from QueahApp/Assets.xcassets/piece-white-selected.imageset/piece-white-selected.png rename to Queah/Assets.xcassets/piece-white-selected.imageset/piece-white-selected.png diff --git a/QueahApp/Assets.xcassets/piece-white-selected.imageset/piece-white-selected@2x.png b/Queah/Assets.xcassets/piece-white-selected.imageset/piece-white-selected@2x.png similarity index 100% rename from QueahApp/Assets.xcassets/piece-white-selected.imageset/piece-white-selected@2x.png rename to Queah/Assets.xcassets/piece-white-selected.imageset/piece-white-selected@2x.png diff --git a/QueahApp/Assets.xcassets/piece-white-selected.imageset/piece-white-selected@3x.png b/Queah/Assets.xcassets/piece-white-selected.imageset/piece-white-selected@3x.png similarity index 100% rename from QueahApp/Assets.xcassets/piece-white-selected.imageset/piece-white-selected@3x.png rename to Queah/Assets.xcassets/piece-white-selected.imageset/piece-white-selected@3x.png diff --git a/QueahApp/Assets.xcassets/piece-white-unselected.imageset/Contents.json b/Queah/Assets.xcassets/piece-white-unselected.imageset/Contents.json similarity index 100% rename from QueahApp/Assets.xcassets/piece-white-unselected.imageset/Contents.json rename to Queah/Assets.xcassets/piece-white-unselected.imageset/Contents.json diff --git a/QueahApp/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected.png b/Queah/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected.png similarity index 100% rename from QueahApp/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected.png rename to Queah/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected.png diff --git a/QueahApp/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected@2x.png b/Queah/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected@2x.png similarity index 100% rename from QueahApp/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected@2x.png rename to Queah/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected@2x.png diff --git a/QueahApp/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected@3x.png b/Queah/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected@3x.png similarity index 100% rename from QueahApp/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected@3x.png rename to Queah/Assets.xcassets/piece-white-unselected.imageset/piece-white-unselected@3x.png diff --git a/QueahApp/Assets.xcassets/space-selected.imageset/Contents.json b/Queah/Assets.xcassets/space-selected.imageset/Contents.json similarity index 100% rename from QueahApp/Assets.xcassets/space-selected.imageset/Contents.json rename to Queah/Assets.xcassets/space-selected.imageset/Contents.json diff --git a/QueahApp/Assets.xcassets/space-selected.imageset/space-selected.png b/Queah/Assets.xcassets/space-selected.imageset/space-selected.png similarity index 100% rename from QueahApp/Assets.xcassets/space-selected.imageset/space-selected.png rename to Queah/Assets.xcassets/space-selected.imageset/space-selected.png diff --git a/QueahApp/Assets.xcassets/space-selected.imageset/space-selected@2x.png b/Queah/Assets.xcassets/space-selected.imageset/space-selected@2x.png similarity index 100% rename from QueahApp/Assets.xcassets/space-selected.imageset/space-selected@2x.png rename to Queah/Assets.xcassets/space-selected.imageset/space-selected@2x.png diff --git a/QueahApp/Assets.xcassets/space-selected.imageset/space-selected@3x.png b/Queah/Assets.xcassets/space-selected.imageset/space-selected@3x.png similarity index 100% rename from QueahApp/Assets.xcassets/space-selected.imageset/space-selected@3x.png rename to Queah/Assets.xcassets/space-selected.imageset/space-selected@3x.png diff --git a/QueahApp/Scene/BoardLocation.swift b/Queah/BoardLocation.swift similarity index 100% rename from QueahApp/Scene/BoardLocation.swift rename to Queah/BoardLocation.swift diff --git a/QueahApp/Scene/BoardSpace.swift b/Queah/BoardSpace.swift similarity index 100% rename from QueahApp/Scene/BoardSpace.swift rename to Queah/BoardSpace.swift diff --git a/QueahApp/View/ContentView.swift b/Queah/ContentView.swift similarity index 100% rename from QueahApp/View/ContentView.swift rename to Queah/ContentView.swift diff --git a/QueahApp/Scene/GameBoard.swift b/Queah/GameBoard.swift similarity index 100% rename from QueahApp/Scene/GameBoard.swift rename to Queah/GameBoard.swift diff --git a/QueahApp/Scene/GamePiece.swift b/Queah/GamePiece.swift similarity index 100% rename from QueahApp/Scene/GamePiece.swift rename to Queah/GamePiece.swift diff --git a/QueahApp/Scene/GameScene.swift b/Queah/GameScene.swift similarity index 100% rename from QueahApp/Scene/GameScene.swift rename to Queah/GameScene.swift diff --git a/QueahApp/View/GameView.swift b/Queah/GameView.swift similarity index 100% rename from QueahApp/View/GameView.swift rename to Queah/GameView.swift diff --git a/Queah-Info.plist b/Queah/Info.plist similarity index 100% rename from Queah-Info.plist rename to Queah/Info.plist diff --git a/QueahApp/Scene/MenuButton.swift b/Queah/MenuButton.swift similarity index 100% rename from QueahApp/Scene/MenuButton.swift rename to Queah/MenuButton.swift diff --git a/QueahApp/View/MenuView.swift b/Queah/MenuView.swift similarity index 100% rename from QueahApp/View/MenuView.swift rename to Queah/MenuView.swift diff --git a/QueahApp/View/QueahApp.swift b/Queah/QueahApp.swift similarity index 100% rename from QueahApp/View/QueahApp.swift rename to Queah/QueahApp.swift diff --git a/QueahApp/Model/QueahModel.swift b/Queah/QueahModel.swift similarity index 100% rename from QueahApp/Model/QueahModel.swift rename to Queah/QueahModel.swift diff --git a/QueahApp/View/RulesView.swift b/Queah/RulesView.swift similarity index 100% rename from QueahApp/View/RulesView.swift rename to Queah/RulesView.swift diff --git a/Queah/icon.afdesign~lock~ b/Queah/icon.afdesign~lock~ new file mode 100644 index 0000000000000000000000000000000000000000..84e3bdbad1d14f73d09fac00ac7ecdf60c2846a7 GIT binary patch literal 120 zcmeatPtM-0dMk|q2w=1hqY8-2z|SDeAi!W?YV2%kXyK^qVq{>hYvO3^r0Znr=&0-J zVqt1#Vs2n*=Ij_;l3I|Fny28Dnpd2YTIraUmYJ7XQmNpQTAZ1lms+G?1Xb~&H Irf*_00KsY@x&QzG literal 0 HcmV?d00001 diff --git a/QueahSolver/Preview Content/Preview Assets.xcassets/Contents.json b/QueahSolver/Preview Content/Preview Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/QueahSolver/Preview Content/Preview Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/QueahApp/artwork.afdesign b/Resources/artwork.afdesign similarity index 100% rename from QueahApp/artwork.afdesign rename to Resources/artwork.afdesign diff --git a/QueahApp/icon.afdesign b/Resources/icon.afdesign similarity index 100% rename from QueahApp/icon.afdesign rename to Resources/icon.afdesign diff --git a/QueahApp/Resources/queahSolution.data b/Resources/queahSolution.data similarity index 100% rename from QueahApp/Resources/queahSolution.data rename to Resources/queahSolution.data diff --git a/QueahApp/Resources/rules.txt b/Resources/rules.txt similarity index 100% rename from QueahApp/Resources/rules.txt rename to Resources/rules.txt