From f46fcc79783ceb1106c96a7ab9e5ef525aa7ad76 Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Sat, 26 Sep 2015 13:16:25 -0700 Subject: [PATCH] Reorganized Xcode project and file structure --- Delta.xcodeproj/project.pbxproj | 28 ++++++++++--------- .../EmulationViewController.swift | 0 .../EmulationViewController.xib | 0 Delta/{ => Extensions}/UIDevice+Vibration.h | 0 Delta/{ => Extensions}/UIDevice+Vibration.m | 0 .../DirectoryContentsDataSource.swift | 0 .../GamesViewController.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Images.xcassets/Contents.json | 0 .../Settings_Button.imageset/Contents.json | 0 .../Settings_Button.imageset/gear_1.pdf | 0 .../ControllersSettingsViewController.swift | 0 Delta/{ => Settings}/Settings.storyboard | 0 Delta/{ => Settings}/Settings.swift | 0 .../SettingsViewController.swift | 0 .../Base.lproj/LaunchScreen.xib | 0 .../Delta-Bridging-Header.h | 0 Delta/{ => Supporting Files}/Info.plist | 0 18 files changed, 15 insertions(+), 13 deletions(-) rename Delta/{ => Emulation}/EmulationViewController.swift (100%) rename Delta/{ => Emulation}/EmulationViewController.xib (100%) rename Delta/{ => Extensions}/UIDevice+Vibration.h (100%) rename Delta/{ => Extensions}/UIDevice+Vibration.m (100%) rename Delta/{ => Game Selection}/DirectoryContentsDataSource.swift (100%) rename Delta/{ => Game Selection}/GamesViewController.swift (100%) rename Delta/{ => Resources}/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename Delta/{ => Resources}/Images.xcassets/Contents.json (100%) rename Delta/{ => Resources}/Images.xcassets/Settings_Button.imageset/Contents.json (100%) rename Delta/{ => Resources}/Images.xcassets/Settings_Button.imageset/gear_1.pdf (100%) rename Delta/{ => Settings}/ControllersSettingsViewController.swift (100%) rename Delta/{ => Settings}/Settings.storyboard (100%) rename Delta/{ => Settings}/Settings.swift (100%) rename Delta/{ => Settings}/SettingsViewController.swift (100%) rename Delta/{ => Supporting Files}/Base.lproj/LaunchScreen.xib (100%) rename Delta/{ => Supporting Files}/Delta-Bridging-Header.h (100%) rename Delta/{ => Supporting Files}/Info.plist (100%) diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj index 3dc0c68..0b476a2 100644 --- a/Delta.xcodeproj/project.pbxproj +++ b/Delta.xcodeproj/project.pbxproj @@ -92,16 +92,16 @@ BF090CF21B490D8300DCAB45 /* UIDevice+Vibration.h */, BF090CF31B490D8300DCAB45 /* UIDevice+Vibration.m */, ); - name = Extensions; + path = Extensions; sourceTree = ""; }; BF46894D1AAC469800A2586D /* Game Selection */ = { isa = PBXGroup; children = ( - BFFA71DE1AAC406100EE9DD1 /* GamesViewController.swift */, BF46894E1AAC46EF00A2586D /* DirectoryContentsDataSource.swift */, + BFFA71DE1AAC406100EE9DD1 /* GamesViewController.swift */, ); - name = "Game Selection"; + path = "Game Selection"; sourceTree = ""; }; BF9F4FCD1AAD7B25004C9500 /* Frameworks */ = { @@ -123,7 +123,7 @@ BF5E7F431B9A650B00AE44F8 /* SettingsViewController.swift */, BFAA1FF31B8AD7F900495943 /* ControllersSettingsViewController.swift */, ); - name = Settings; + path = Settings; sourceTree = ""; }; BFEC732F1AAECCBD00650035 /* Resources */ = { @@ -131,15 +131,15 @@ children = ( BFFA71E31AAC406100EE9DD1 /* Images.xcassets */, ); - name = Resources; + path = Resources; sourceTree = ""; }; BFFA71CE1AAC406100EE9DD1 = { isa = PBXGroup; children = ( BFFA71D91AAC406100EE9DD1 /* Delta */, - BFFA71D81AAC406100EE9DD1 /* Products */, BF9F4FCD1AAD7B25004C9500 /* Frameworks */, + BFFA71D81AAC406100EE9DD1 /* Products */, ); sourceTree = ""; }; @@ -170,10 +170,10 @@ isa = PBXGroup; children = ( BF090CF11B490D8300DCAB45 /* Delta-Bridging-Header.h */, - BFFA71E51AAC406100EE9DD1 /* LaunchScreen.xib */, BFFA71DB1AAC406100EE9DD1 /* Info.plist */, + BFFA71E51AAC406100EE9DD1 /* LaunchScreen.xib */, ); - name = "Supporting Files"; + path = "Supporting Files"; sourceTree = ""; }; BFFB709D1AF99ACA00DE56FE /* Emulation */ = { @@ -182,7 +182,7 @@ BFFB709E1AF99B1700DE56FE /* EmulationViewController.swift */, BFFB70A01AF99DFB00DE56FE /* EmulationViewController.xib */, ); - name = Emulation; + path = Emulation; sourceTree = ""; }; /* End PBXGroup section */ @@ -280,6 +280,7 @@ BFFA71E11AAC406100EE9DD1 /* Base */, ); name = Main.storyboard; + path = .; sourceTree = ""; }; BFFA71E51AAC406100EE9DD1 /* LaunchScreen.xib */ = { @@ -288,6 +289,7 @@ BFFA71E61AAC406100EE9DD1 /* Base */, ); name = LaunchScreen.xib; + path = .; sourceTree = ""; }; /* End PBXVariantGroup section */ @@ -383,14 +385,14 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - INFOPLIST_FILE = Delta/Info.plist; + INFOPLIST_FILE = "Delta/Supporting Files/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_CFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.rileytestut.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - SWIFT_OBJC_BRIDGING_HEADER = "Delta/Delta-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "Delta/Supporting Files/Delta-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; @@ -402,14 +404,14 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - INFOPLIST_FILE = Delta/Info.plist; + INFOPLIST_FILE = "Delta/Supporting Files/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_CFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.rileytestut.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - SWIFT_OBJC_BRIDGING_HEADER = "Delta/Delta-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "Delta/Supporting Files/Delta-Bridging-Header.h"; }; name = Release; }; diff --git a/Delta/EmulationViewController.swift b/Delta/Emulation/EmulationViewController.swift similarity index 100% rename from Delta/EmulationViewController.swift rename to Delta/Emulation/EmulationViewController.swift diff --git a/Delta/EmulationViewController.xib b/Delta/Emulation/EmulationViewController.xib similarity index 100% rename from Delta/EmulationViewController.xib rename to Delta/Emulation/EmulationViewController.xib diff --git a/Delta/UIDevice+Vibration.h b/Delta/Extensions/UIDevice+Vibration.h similarity index 100% rename from Delta/UIDevice+Vibration.h rename to Delta/Extensions/UIDevice+Vibration.h diff --git a/Delta/UIDevice+Vibration.m b/Delta/Extensions/UIDevice+Vibration.m similarity index 100% rename from Delta/UIDevice+Vibration.m rename to Delta/Extensions/UIDevice+Vibration.m diff --git a/Delta/DirectoryContentsDataSource.swift b/Delta/Game Selection/DirectoryContentsDataSource.swift similarity index 100% rename from Delta/DirectoryContentsDataSource.swift rename to Delta/Game Selection/DirectoryContentsDataSource.swift diff --git a/Delta/GamesViewController.swift b/Delta/Game Selection/GamesViewController.swift similarity index 100% rename from Delta/GamesViewController.swift rename to Delta/Game Selection/GamesViewController.swift diff --git a/Delta/Images.xcassets/AppIcon.appiconset/Contents.json b/Delta/Resources/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Delta/Images.xcassets/AppIcon.appiconset/Contents.json rename to Delta/Resources/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/Delta/Images.xcassets/Contents.json b/Delta/Resources/Images.xcassets/Contents.json similarity index 100% rename from Delta/Images.xcassets/Contents.json rename to Delta/Resources/Images.xcassets/Contents.json diff --git a/Delta/Images.xcassets/Settings_Button.imageset/Contents.json b/Delta/Resources/Images.xcassets/Settings_Button.imageset/Contents.json similarity index 100% rename from Delta/Images.xcassets/Settings_Button.imageset/Contents.json rename to Delta/Resources/Images.xcassets/Settings_Button.imageset/Contents.json diff --git a/Delta/Images.xcassets/Settings_Button.imageset/gear_1.pdf b/Delta/Resources/Images.xcassets/Settings_Button.imageset/gear_1.pdf similarity index 100% rename from Delta/Images.xcassets/Settings_Button.imageset/gear_1.pdf rename to Delta/Resources/Images.xcassets/Settings_Button.imageset/gear_1.pdf diff --git a/Delta/ControllersSettingsViewController.swift b/Delta/Settings/ControllersSettingsViewController.swift similarity index 100% rename from Delta/ControllersSettingsViewController.swift rename to Delta/Settings/ControllersSettingsViewController.swift diff --git a/Delta/Settings.storyboard b/Delta/Settings/Settings.storyboard similarity index 100% rename from Delta/Settings.storyboard rename to Delta/Settings/Settings.storyboard diff --git a/Delta/Settings.swift b/Delta/Settings/Settings.swift similarity index 100% rename from Delta/Settings.swift rename to Delta/Settings/Settings.swift diff --git a/Delta/SettingsViewController.swift b/Delta/Settings/SettingsViewController.swift similarity index 100% rename from Delta/SettingsViewController.swift rename to Delta/Settings/SettingsViewController.swift diff --git a/Delta/Base.lproj/LaunchScreen.xib b/Delta/Supporting Files/Base.lproj/LaunchScreen.xib similarity index 100% rename from Delta/Base.lproj/LaunchScreen.xib rename to Delta/Supporting Files/Base.lproj/LaunchScreen.xib diff --git a/Delta/Delta-Bridging-Header.h b/Delta/Supporting Files/Delta-Bridging-Header.h similarity index 100% rename from Delta/Delta-Bridging-Header.h rename to Delta/Supporting Files/Delta-Bridging-Header.h diff --git a/Delta/Info.plist b/Delta/Supporting Files/Info.plist similarity index 100% rename from Delta/Info.plist rename to Delta/Supporting Files/Info.plist