From f080d3f94615320eb93e425244be0ce3219904e0 Mon Sep 17 00:00:00 2001 From: Chris Grant Date: Thu, 2 Jul 2015 11:21:11 +0100 Subject: [PATCH] Updated photos framework post. --- .../StarGallery.xcodeproj/project.pbxproj | 130 +----------------- .../StarGallery/Base.lproj/Main.storyboard | 9 +- .../StarGallery/ImageCacheController.swift | 9 +- .../PhotosCollectionViewCell.swift | 2 +- .../PhotosCollectionViewController.swift | 14 +- .../StarGallery/StarGalleryTests/Info.plist | 24 ---- .../StarGalleryTests/StarGalleryTests.swift | 36 ----- 7 files changed, 18 insertions(+), 206 deletions(-) delete mode 100644 20-photos-framework/StarGallery/StarGalleryTests/Info.plist delete mode 100644 20-photos-framework/StarGallery/StarGalleryTests/StarGalleryTests.swift diff --git a/20-photos-framework/StarGallery/StarGallery.xcodeproj/project.pbxproj b/20-photos-framework/StarGallery/StarGallery.xcodeproj/project.pbxproj index 3ccd28b..e41c14c 100644 --- a/20-photos-framework/StarGallery/StarGallery.xcodeproj/project.pbxproj +++ b/20-photos-framework/StarGallery/StarGallery.xcodeproj/project.pbxproj @@ -10,32 +10,18 @@ 226F368C19A5329A00317C2F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 226F368B19A5329A00317C2F /* AppDelegate.swift */; }; 226F369119A5329A00317C2F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 226F368F19A5329A00317C2F /* Main.storyboard */; }; 226F369319A5329A00317C2F /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 226F369219A5329A00317C2F /* Images.xcassets */; }; - 226F369F19A5329A00317C2F /* StarGalleryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 226F369E19A5329A00317C2F /* StarGalleryTests.swift */; }; 226F36A919A53B1500317C2F /* PhotosCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 226F36A819A53B1500317C2F /* PhotosCollectionViewController.swift */; }; 226F36AB19A542EC00317C2F /* PhotosCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 226F36AA19A542EC00317C2F /* PhotosCollectionViewCell.swift */; }; 22732A7419A60283006036BD /* ImageCacheController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22732A7319A60283006036BD /* ImageCacheController.swift */; }; 22EDB8491AD6888E008515E4 /* Launch Screen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22EDB8471AD6888E008515E4 /* Launch Screen.xib */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 226F369919A5329A00317C2F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 226F367E19A5329A00317C2F /* Project object */; - proxyType = 1; - remoteGlobalIDString = 226F368519A5329A00317C2F; - remoteInfo = StarGallery; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 226F368619A5329A00317C2F /* StarGallery.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StarGallery.app; sourceTree = BUILT_PRODUCTS_DIR; }; 226F368A19A5329A00317C2F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 226F368B19A5329A00317C2F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 226F369019A5329A00317C2F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 226F369219A5329A00317C2F /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - 226F369819A5329A00317C2F /* StarGalleryTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StarGalleryTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 226F369D19A5329A00317C2F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 226F369E19A5329A00317C2F /* StarGalleryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarGalleryTests.swift; sourceTree = ""; }; 226F36A819A53B1500317C2F /* PhotosCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotosCollectionViewController.swift; sourceTree = ""; }; 226F36AA19A542EC00317C2F /* PhotosCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotosCollectionViewCell.swift; sourceTree = ""; }; 22732A7319A60283006036BD /* ImageCacheController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageCacheController.swift; sourceTree = ""; }; @@ -50,13 +36,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 226F369519A5329A00317C2F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -64,7 +43,6 @@ isa = PBXGroup; children = ( 226F368819A5329A00317C2F /* StarGallery */, - 226F369B19A5329A00317C2F /* StarGalleryTests */, 226F368719A5329A00317C2F /* Products */, ); sourceTree = ""; @@ -73,7 +51,6 @@ isa = PBXGroup; children = ( 226F368619A5329A00317C2F /* StarGallery.app */, - 226F369819A5329A00317C2F /* StarGalleryTests.xctest */, ); name = Products; sourceTree = ""; @@ -101,23 +78,6 @@ name = "Supporting Files"; sourceTree = ""; }; - 226F369B19A5329A00317C2F /* StarGalleryTests */ = { - isa = PBXGroup; - children = ( - 226F369E19A5329A00317C2F /* StarGalleryTests.swift */, - 226F369C19A5329A00317C2F /* Supporting Files */, - ); - path = StarGalleryTests; - sourceTree = ""; - }; - 226F369C19A5329A00317C2F /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 226F369D19A5329A00317C2F /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -138,40 +98,19 @@ productReference = 226F368619A5329A00317C2F /* StarGallery.app */; productType = "com.apple.product-type.application"; }; - 226F369719A5329A00317C2F /* StarGalleryTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 226F36A519A5329A00317C2F /* Build configuration list for PBXNativeTarget "StarGalleryTests" */; - buildPhases = ( - 226F369419A5329A00317C2F /* Sources */, - 226F369519A5329A00317C2F /* Frameworks */, - 226F369619A5329A00317C2F /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 226F369A19A5329A00317C2F /* PBXTargetDependency */, - ); - name = StarGalleryTests; - productName = StarGalleryTests; - productReference = 226F369819A5329A00317C2F /* StarGalleryTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 226F367E19A5329A00317C2F /* Project object */ = { isa = PBXProject; attributes = { + LastSwiftUpdateCheck = 0700; LastUpgradeCheck = 0600; ORGANIZATIONNAME = ShinobiControls; TargetAttributes = { 226F368519A5329A00317C2F = { CreatedOnToolsVersion = 6.0; }; - 226F369719A5329A00317C2F = { - CreatedOnToolsVersion = 6.0; - TestTargetID = 226F368519A5329A00317C2F; - }; }; }; buildConfigurationList = 226F368119A5329A00317C2F /* Build configuration list for PBXProject "StarGallery" */; @@ -188,7 +127,6 @@ projectRoot = ""; targets = ( 226F368519A5329A00317C2F /* StarGallery */, - 226F369719A5329A00317C2F /* StarGalleryTests */, ); }; /* End PBXProject section */ @@ -204,13 +142,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 226F369619A5329A00317C2F /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -225,24 +156,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 226F369419A5329A00317C2F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 226F369F19A5329A00317C2F /* StarGalleryTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 226F369A19A5329A00317C2F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 226F368519A5329A00317C2F /* StarGallery */; - targetProxy = 226F369919A5329A00317C2F /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin PBXVariantGroup section */ 226F368F19A5329A00317C2F /* Main.storyboard */ = { isa = PBXVariantGroup; @@ -362,40 +277,6 @@ }; name = Release; }; - 226F36A619A5329A00317C2F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = StarGalleryTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StarGallery.app/StarGallery"; - }; - name = Debug; - }; - 226F36A719A5329A00317C2F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - INFOPLIST_FILE = StarGalleryTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StarGallery.app/StarGallery"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -417,15 +298,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 226F36A519A5329A00317C2F /* Build configuration list for PBXNativeTarget "StarGalleryTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 226F36A619A5329A00317C2F /* Debug */, - 226F36A719A5329A00317C2F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 226F367E19A5329A00317C2F /* Project object */; diff --git a/20-photos-framework/StarGallery/StarGallery/Base.lproj/Main.storyboard b/20-photos-framework/StarGallery/StarGallery/Base.lproj/Main.storyboard index 9c487a1..c34407f 100644 --- a/20-photos-framework/StarGallery/StarGallery/Base.lproj/Main.storyboard +++ b/20-photos-framework/StarGallery/StarGallery/Base.lproj/Main.storyboard @@ -1,7 +1,8 @@ - + - + + @@ -20,7 +21,7 @@ - + @@ -29,7 +30,7 @@ -