diff --git a/PhotoBrowser.xcodeproj/project.pbxproj b/PhotoBrowser.xcodeproj/project.pbxproj index 6687477..78db3a3 100644 --- a/PhotoBrowser.xcodeproj/project.pbxproj +++ b/PhotoBrowser.xcodeproj/project.pbxproj @@ -9,38 +9,23 @@ /* Begin PBXBuildFile section */ 4A0B3FDF1C76DB300049338C /* Kingfisher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0B3FDE1C76DB300049338C /* Kingfisher.framework */; }; 4A52D1E41C72CB2E001C257B /* PhotoBrowser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A52D1E31C72CB2E001C257B /* PhotoBrowser.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4A52D1EB1C72CB2E001C257B /* PhotoBrowser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A52D1E01C72CB2E001C257B /* PhotoBrowser.framework */; }; - 4A52D1F01C72CB2E001C257B /* PhotoBrowserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A52D1EF1C72CB2E001C257B /* PhotoBrowserTests.swift */; }; 4A52D1FE1C72CE69001C257B /* PhotoBrowser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A52D1FD1C72CE69001C257B /* PhotoBrowser.swift */; }; 4A52D2301C72F47C001C257B /* Photo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A52D22F1C72F47C001C257B /* Photo.swift */; }; 4A52D2361C72F524001C257B /* WaitingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A52D2351C72F524001C257B /* WaitingView.swift */; }; 4A52D2381C72F568001C257B /* PhotoPreviewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A52D2371C72F568001C257B /* PhotoPreviewController.swift */; }; - 4A52D23A1C7310DD001C257B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4A52D2391C7310DD001C257B /* Images.xcassets */; }; + 4A6BC7C11C770F6400DACDA5 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4A6BC7C01C770F6400DACDA5 /* Images.xcassets */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 4A52D1EC1C72CB2E001C257B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A52D1D71C72CB2E001C257B /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4A52D1DF1C72CB2E001C257B; - remoteInfo = PhotoBrowser; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 4A0B3FDE1C76DB300049338C /* Kingfisher.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kingfisher.framework; path = Carthage/Build/iOS/Kingfisher.framework; sourceTree = ""; }; 4A52D1E01C72CB2E001C257B /* PhotoBrowser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PhotoBrowser.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4A52D1E31C72CB2E001C257B /* PhotoBrowser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PhotoBrowser.h; sourceTree = ""; }; 4A52D1E51C72CB2E001C257B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 4A52D1EA1C72CB2E001C257B /* PhotoBrowserTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PhotoBrowserTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A52D1EF1C72CB2E001C257B /* PhotoBrowserTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoBrowserTests.swift; sourceTree = ""; }; - 4A52D1F11C72CB2E001C257B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4A52D1FD1C72CE69001C257B /* PhotoBrowser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoBrowser.swift; sourceTree = ""; }; 4A52D22F1C72F47C001C257B /* Photo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Photo.swift; sourceTree = ""; }; 4A52D2351C72F524001C257B /* WaitingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WaitingView.swift; sourceTree = ""; }; 4A52D2371C72F568001C257B /* PhotoPreviewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoPreviewController.swift; sourceTree = ""; }; - 4A52D2391C7310DD001C257B /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ../Images.xcassets; sourceTree = ""; }; + 4A6BC7C01C770F6400DACDA5 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -52,14 +37,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4A52D1E71C72CB2E001C257B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 4A52D1EB1C72CB2E001C257B /* PhotoBrowser.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -68,7 +45,6 @@ children = ( 4A0B3FDE1C76DB300049338C /* Kingfisher.framework */, 4A52D1E21C72CB2E001C257B /* PhotoBrowser */, - 4A52D1EE1C72CB2E001C257B /* PhotoBrowserTests */, 4A52D1E11C72CB2E001C257B /* Products */, ); sourceTree = ""; @@ -77,7 +53,6 @@ isa = PBXGroup; children = ( 4A52D1E01C72CB2E001C257B /* PhotoBrowser.framework */, - 4A52D1EA1C72CB2E001C257B /* PhotoBrowserTests.xctest */, ); name = Products; sourceTree = ""; @@ -85,7 +60,7 @@ 4A52D1E21C72CB2E001C257B /* PhotoBrowser */ = { isa = PBXGroup; children = ( - 4A52D2391C7310DD001C257B /* Images.xcassets */, + 4A6BC7C01C770F6400DACDA5 /* Images.xcassets */, 4A52D1E31C72CB2E001C257B /* PhotoBrowser.h */, 4A52D1E51C72CB2E001C257B /* Info.plist */, 4A52D22F1C72F47C001C257B /* Photo.swift */, @@ -96,15 +71,6 @@ path = PhotoBrowser; sourceTree = ""; }; - 4A52D1EE1C72CB2E001C257B /* PhotoBrowserTests */ = { - isa = PBXGroup; - children = ( - 4A52D1EF1C72CB2E001C257B /* PhotoBrowserTests.swift */, - 4A52D1F11C72CB2E001C257B /* Info.plist */, - ); - path = PhotoBrowserTests; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -137,24 +103,6 @@ productReference = 4A52D1E01C72CB2E001C257B /* PhotoBrowser.framework */; productType = "com.apple.product-type.framework"; }; - 4A52D1E91C72CB2E001C257B /* PhotoBrowserTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4A52D1F71C72CB2E001C257B /* Build configuration list for PBXNativeTarget "PhotoBrowserTests" */; - buildPhases = ( - 4A52D1E61C72CB2E001C257B /* Sources */, - 4A52D1E71C72CB2E001C257B /* Frameworks */, - 4A52D1E81C72CB2E001C257B /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 4A52D1ED1C72CB2E001C257B /* PBXTargetDependency */, - ); - name = PhotoBrowserTests; - productName = PhotoBrowserTests; - productReference = 4A52D1EA1C72CB2E001C257B /* PhotoBrowserTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -168,9 +116,6 @@ 4A52D1DF1C72CB2E001C257B = { CreatedOnToolsVersion = 7.2.1; }; - 4A52D1E91C72CB2E001C257B = { - CreatedOnToolsVersion = 7.2.1; - }; }; }; buildConfigurationList = 4A52D1DA1C72CB2E001C257B /* Build configuration list for PBXProject "PhotoBrowser" */; @@ -186,7 +131,6 @@ projectRoot = ""; targets = ( 4A52D1DF1C72CB2E001C257B /* PhotoBrowser */, - 4A52D1E91C72CB2E001C257B /* PhotoBrowserTests */, ); }; /* End PBXProject section */ @@ -196,14 +140,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4A52D23A1C7310DD001C257B /* Images.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4A52D1E81C72CB2E001C257B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( + 4A6BC7C11C770F6400DACDA5 /* Images.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -221,24 +158,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4A52D1E61C72CB2E001C257B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4A52D1F01C72CB2E001C257B /* PhotoBrowserTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 4A52D1ED1C72CB2E001C257B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4A52D1DF1C72CB2E001C257B /* PhotoBrowser */; - targetProxy = 4A52D1EC1C72CB2E001C257B /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 4A52D1F21C72CB2E001C257B /* Debug */ = { isa = XCBuildConfiguration; @@ -372,26 +293,6 @@ }; name = Release; }; - 4A52D1F81C72CB2E001C257B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - INFOPLIST_FILE = PhotoBrowserTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.Teambition.PhotoBrowserTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 4A52D1F91C72CB2E001C257B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - INFOPLIST_FILE = PhotoBrowserTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.Teambition.PhotoBrowserTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -413,15 +314,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4A52D1F71C72CB2E001C257B /* Build configuration list for PBXNativeTarget "PhotoBrowserTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4A52D1F81C72CB2E001C257B /* Debug */, - 4A52D1F91C72CB2E001C257B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 4A52D1D71C72CB2E001C257B /* Project object */; diff --git a/PhotoBrowser.xcworkspace/contents.xcworkspacedata b/PhotoBrowser.xcworkspace/contents.xcworkspacedata index ddb31d9..1452a7d 100644 --- a/PhotoBrowser.xcworkspace/contents.xcworkspacedata +++ b/PhotoBrowser.xcworkspace/contents.xcworkspacedata @@ -2,9 +2,9 @@ + location = "group:PhotoBrowserDemo.xcodeproj"> + location = "group:PhotoBrowser.xcodeproj"> diff --git a/PhotoBrowser.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate b/PhotoBrowser.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate index d332826..43c34d0 100644 Binary files a/PhotoBrowser.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate and b/PhotoBrowser.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Images.xcassets/Contents.json b/PhotoBrowser/Images.xcassets/Contents.json similarity index 100% rename from Images.xcassets/Contents.json rename to PhotoBrowser/Images.xcassets/Contents.json diff --git a/Images.xcassets/icon-logo-white.imageset/Contents.json b/PhotoBrowser/Images.xcassets/icon-logo-white.imageset/Contents.json similarity index 100% rename from Images.xcassets/icon-logo-white.imageset/Contents.json rename to PhotoBrowser/Images.xcassets/icon-logo-white.imageset/Contents.json diff --git a/Images.xcassets/icon-logo-white.imageset/icon-logo-white.pdf b/PhotoBrowser/Images.xcassets/icon-logo-white.imageset/icon-logo-white.pdf similarity index 100% rename from Images.xcassets/icon-logo-white.imageset/icon-logo-white.pdf rename to PhotoBrowser/Images.xcassets/icon-logo-white.imageset/icon-logo-white.pdf diff --git a/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/project.pbxproj b/PhotoBrowserDemo.xcodeproj/project.pbxproj similarity index 70% rename from PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/project.pbxproj rename to PhotoBrowserDemo.xcodeproj/project.pbxproj index ee46410..275b7ed 100644 --- a/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/project.pbxproj +++ b/PhotoBrowserDemo.xcodeproj/project.pbxproj @@ -7,25 +7,15 @@ objects = { /* Begin PBXBuildFile section */ - 4A0B3FE31C76F0CC0049338C /* PhotoBrowser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0B3FE21C76F0CC0049338C /* PhotoBrowser.framework */; }; 4A52D20C1C72D13B001C257B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A52D20B1C72D13B001C257B /* AppDelegate.swift */; }; 4A52D20E1C72D13B001C257B /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A52D20D1C72D13B001C257B /* ViewController.swift */; }; 4A52D2111C72D13B001C257B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A52D20F1C72D13B001C257B /* Main.storyboard */; }; 4A52D2131C72D13B001C257B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4A52D2121C72D13B001C257B /* Assets.xcassets */; }; 4A52D2161C72D13B001C257B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A52D2141C72D13B001C257B /* LaunchScreen.storyboard */; }; - 4A52D2211C72D13B001C257B /* PhotoBrowserDemoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A52D2201C72D13B001C257B /* PhotoBrowserDemoTests.swift */; }; + 4A6BC7BC1C770DE100DACDA5 /* Kingfisher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6BC7BB1C770DE100DACDA5 /* Kingfisher.framework */; }; + 4A6BC7BE1C770DE900DACDA5 /* PhotoBrowser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6BC7BD1C770DE900DACDA5 /* PhotoBrowser.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 4A52D21D1C72D13B001C257B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4A52D2001C72D13B001C257B /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4A52D2071C72D13B001C257B; - remoteInfo = PhotoBrowserDemo; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ 4A52D22E1C72D3BA001C257B /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; @@ -40,7 +30,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 4A0B3FE21C76F0CC0049338C /* PhotoBrowser.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PhotoBrowser.framework; path = ../Carthage/Build/iOS/PhotoBrowser.framework; sourceTree = ""; }; 4A52D2081C72D13B001C257B /* PhotoBrowserDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PhotoBrowserDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4A52D20B1C72D13B001C257B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 4A52D20D1C72D13B001C257B /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -48,9 +37,8 @@ 4A52D2121C72D13B001C257B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 4A52D2151C72D13B001C257B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 4A52D2171C72D13B001C257B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 4A52D21C1C72D13B001C257B /* PhotoBrowserDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PhotoBrowserDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 4A52D2201C72D13B001C257B /* PhotoBrowserDemoTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoBrowserDemoTests.swift; sourceTree = ""; }; - 4A52D2221C72D13B001C257B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 4A6BC7BB1C770DE100DACDA5 /* Kingfisher.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kingfisher.framework; path = Carthage/Build/iOS/Kingfisher.framework; sourceTree = ""; }; + 4A6BC7BD1C770DE900DACDA5 /* PhotoBrowser.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PhotoBrowser.framework; path = "../../Library/Developer/Xcode/DerivedData/PhotoBrowser-fvhcjeswrqujghbndnhfixwxfzii/Build/Products/Debug-iphoneos/PhotoBrowser.framework"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -58,14 +46,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A0B3FE31C76F0CC0049338C /* PhotoBrowser.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4A52D2191C72D13B001C257B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( + 4A6BC7BE1C770DE900DACDA5 /* PhotoBrowser.framework in Frameworks */, + 4A6BC7BC1C770DE100DACDA5 /* Kingfisher.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -75,9 +57,9 @@ 4A52D1FF1C72D13B001C257B = { isa = PBXGroup; children = ( - 4A0B3FE21C76F0CC0049338C /* PhotoBrowser.framework */, + 4A6BC7BD1C770DE900DACDA5 /* PhotoBrowser.framework */, + 4A6BC7BB1C770DE100DACDA5 /* Kingfisher.framework */, 4A52D20A1C72D13B001C257B /* PhotoBrowserDemo */, - 4A52D21F1C72D13B001C257B /* PhotoBrowserDemoTests */, 4A52D2091C72D13B001C257B /* Products */, ); sourceTree = ""; @@ -86,7 +68,6 @@ isa = PBXGroup; children = ( 4A52D2081C72D13B001C257B /* PhotoBrowserDemo.app */, - 4A52D21C1C72D13B001C257B /* PhotoBrowserDemoTests.xctest */, ); name = Products; sourceTree = ""; @@ -104,15 +85,6 @@ path = PhotoBrowserDemo; sourceTree = ""; }; - 4A52D21F1C72D13B001C257B /* PhotoBrowserDemoTests */ = { - isa = PBXGroup; - children = ( - 4A52D2201C72D13B001C257B /* PhotoBrowserDemoTests.swift */, - 4A52D2221C72D13B001C257B /* Info.plist */, - ); - path = PhotoBrowserDemoTests; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -124,6 +96,7 @@ 4A52D2051C72D13B001C257B /* Frameworks */, 4A52D2061C72D13B001C257B /* Resources */, 4A52D22E1C72D3BA001C257B /* Embed Frameworks */, + 4A6BC7BF1C770E0B00DACDA5 /* ShellScript */, ); buildRules = ( ); @@ -134,24 +107,6 @@ productReference = 4A52D2081C72D13B001C257B /* PhotoBrowserDemo.app */; productType = "com.apple.product-type.application"; }; - 4A52D21B1C72D13B001C257B /* PhotoBrowserDemoTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4A52D2281C72D13B001C257B /* Build configuration list for PBXNativeTarget "PhotoBrowserDemoTests" */; - buildPhases = ( - 4A52D2181C72D13B001C257B /* Sources */, - 4A52D2191C72D13B001C257B /* Frameworks */, - 4A52D21A1C72D13B001C257B /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 4A52D21E1C72D13B001C257B /* PBXTargetDependency */, - ); - name = PhotoBrowserDemoTests; - productName = PhotoBrowserDemoTests; - productReference = 4A52D21C1C72D13B001C257B /* PhotoBrowserDemoTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -165,10 +120,6 @@ 4A52D2071C72D13B001C257B = { CreatedOnToolsVersion = 7.2.1; }; - 4A52D21B1C72D13B001C257B = { - CreatedOnToolsVersion = 7.2.1; - TestTargetID = 4A52D2071C72D13B001C257B; - }; }; }; buildConfigurationList = 4A52D2031C72D13B001C257B /* Build configuration list for PBXProject "PhotoBrowserDemo" */; @@ -185,7 +136,6 @@ projectRoot = ""; targets = ( 4A52D2071C72D13B001C257B /* PhotoBrowserDemo */, - 4A52D21B1C72D13B001C257B /* PhotoBrowserDemoTests */, ); }; /* End PBXProject section */ @@ -201,14 +151,24 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4A52D21A1C72D13B001C257B /* Resources */ = { - isa = PBXResourcesBuildPhase; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 4A6BC7BF1C770E0B00DACDA5 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputPaths = ( + "$(SRCROOT)/Carthage/Build/iOS/Kingfisher.framework", + ); + outputPaths = ( + ); runOnlyForDeploymentPostprocessing = 0; + shellPath = "/usr/local/bin/carthage copy-frameworks"; + shellScript = ""; }; -/* End PBXResourcesBuildPhase section */ +/* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ 4A52D2041C72D13B001C257B /* Sources */ = { @@ -220,24 +180,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4A52D2181C72D13B001C257B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4A52D2211C72D13B001C257B /* PhotoBrowserDemoTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 4A52D21E1C72D13B001C257B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4A52D2071C72D13B001C257B /* PhotoBrowserDemo */; - targetProxy = 4A52D21D1C72D13B001C257B /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin PBXVariantGroup section */ 4A52D20F1C72D13B001C257B /* Main.storyboard */ = { isa = PBXVariantGroup; @@ -345,6 +289,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS"; INFOPLIST_FILE = PhotoBrowserDemo/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.Teambition.PhotoBrowserDemo; @@ -356,6 +301,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS"; INFOPLIST_FILE = PhotoBrowserDemo/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.Teambition.PhotoBrowserDemo; @@ -363,30 +309,6 @@ }; name = Release; }; - 4A52D2291C72D13B001C257B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - INFOPLIST_FILE = PhotoBrowserDemoTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.Teambition.PhotoBrowserDemoTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PhotoBrowserDemo.app/PhotoBrowserDemo"; - }; - name = Debug; - }; - 4A52D22A1C72D13B001C257B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - INFOPLIST_FILE = PhotoBrowserDemoTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.Teambition.PhotoBrowserDemoTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PhotoBrowserDemo.app/PhotoBrowserDemo"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -408,15 +330,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4A52D2281C72D13B001C257B /* Build configuration list for PBXNativeTarget "PhotoBrowserDemoTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4A52D2291C72D13B001C257B /* Debug */, - 4A52D22A1C72D13B001C257B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 4A52D2001C72D13B001C257B /* Project object */; diff --git a/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/PhotoBrowserDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to PhotoBrowserDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/xcshareddata/xcschemes/PhotoBrowserDemo.xcscheme b/PhotoBrowserDemo.xcodeproj/xcshareddata/xcschemes/PhotoBrowserDemo.xcscheme similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/xcshareddata/xcschemes/PhotoBrowserDemo.xcscheme rename to PhotoBrowserDemo.xcodeproj/xcshareddata/xcschemes/PhotoBrowserDemo.xcscheme diff --git a/PhotoBrowserDemo/PhotoBrowserDemo/AppDelegate.swift b/PhotoBrowserDemo/AppDelegate.swift similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo/AppDelegate.swift rename to PhotoBrowserDemo/AppDelegate.swift diff --git a/PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/AppIcon.appiconset/Contents.json b/PhotoBrowserDemo/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/AppIcon.appiconset/Contents.json rename to PhotoBrowserDemo/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/Contents.json b/PhotoBrowserDemo/Assets.xcassets/Contents.json similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/Contents.json rename to PhotoBrowserDemo/Assets.xcassets/Contents.json diff --git a/PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/thumbnail1.imageset/Contents.json b/PhotoBrowserDemo/Assets.xcassets/thumbnail1.imageset/Contents.json similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/thumbnail1.imageset/Contents.json rename to PhotoBrowserDemo/Assets.xcassets/thumbnail1.imageset/Contents.json diff --git a/PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/thumbnail1.imageset/thumbnail1.jpeg b/PhotoBrowserDemo/Assets.xcassets/thumbnail1.imageset/thumbnail1.jpeg similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/thumbnail1.imageset/thumbnail1.jpeg rename to PhotoBrowserDemo/Assets.xcassets/thumbnail1.imageset/thumbnail1.jpeg diff --git a/PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/thumbnail2.imageset/Contents.json b/PhotoBrowserDemo/Assets.xcassets/thumbnail2.imageset/Contents.json similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/thumbnail2.imageset/Contents.json rename to PhotoBrowserDemo/Assets.xcassets/thumbnail2.imageset/Contents.json diff --git a/PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/thumbnail2.imageset/thumbnail2.png b/PhotoBrowserDemo/Assets.xcassets/thumbnail2.imageset/thumbnail2.png similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/thumbnail2.imageset/thumbnail2.png rename to PhotoBrowserDemo/Assets.xcassets/thumbnail2.imageset/thumbnail2.png diff --git a/PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/thumbnail3.imageset/Contents.json b/PhotoBrowserDemo/Assets.xcassets/thumbnail3.imageset/Contents.json similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/thumbnail3.imageset/Contents.json rename to PhotoBrowserDemo/Assets.xcassets/thumbnail3.imageset/Contents.json diff --git a/PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/thumbnail3.imageset/thumbnail3.jpeg b/PhotoBrowserDemo/Assets.xcassets/thumbnail3.imageset/thumbnail3.jpeg similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo/Assets.xcassets/thumbnail3.imageset/thumbnail3.jpeg rename to PhotoBrowserDemo/Assets.xcassets/thumbnail3.imageset/thumbnail3.jpeg diff --git a/PhotoBrowserDemo/PhotoBrowserDemo/Base.lproj/LaunchScreen.storyboard b/PhotoBrowserDemo/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo/Base.lproj/LaunchScreen.storyboard rename to PhotoBrowserDemo/Base.lproj/LaunchScreen.storyboard diff --git a/PhotoBrowserDemo/PhotoBrowserDemo/Base.lproj/Main.storyboard b/PhotoBrowserDemo/Base.lproj/Main.storyboard similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo/Base.lproj/Main.storyboard rename to PhotoBrowserDemo/Base.lproj/Main.storyboard diff --git a/PhotoBrowserDemo/PhotoBrowserDemo/Info.plist b/PhotoBrowserDemo/Info.plist similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo/Info.plist rename to PhotoBrowserDemo/Info.plist diff --git a/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/project.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate b/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/project.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 0def7ed..0000000 Binary files a/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/project.xcworkspace/xcuserdata/wangwei.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/xcuserdata/wangwei.xcuserdatad/xcschemes/xcschememanagement.plist b/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/xcuserdata/wangwei.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 3eb7f0d..0000000 --- a/PhotoBrowserDemo/PhotoBrowserDemo.xcodeproj/xcuserdata/wangwei.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,27 +0,0 @@ - - - - - SchemeUserState - - PhotoBrowserDemo.xcscheme_^#shared#^_ - - orderHint - 0 - - - SuppressBuildableAutocreation - - 4A52D2071C72D13B001C257B - - primary - - - 4A52D21B1C72D13B001C257B - - primary - - - - - diff --git a/PhotoBrowserDemo/PhotoBrowserDemoTests/Info.plist b/PhotoBrowserDemo/PhotoBrowserDemoTests/Info.plist deleted file mode 100644 index ba72822..0000000 --- a/PhotoBrowserDemo/PhotoBrowserDemoTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/PhotoBrowserDemo/PhotoBrowserDemoTests/PhotoBrowserDemoTests.swift b/PhotoBrowserDemo/PhotoBrowserDemoTests/PhotoBrowserDemoTests.swift deleted file mode 100644 index 779e670..0000000 --- a/PhotoBrowserDemo/PhotoBrowserDemoTests/PhotoBrowserDemoTests.swift +++ /dev/null @@ -1,36 +0,0 @@ -// -// PhotoBrowserDemoTests.swift -// PhotoBrowserDemoTests -// -// Created by 王卫 on 16/2/16. -// Copyright © 2016年 Teambition. All rights reserved. -// - -import XCTest -@testable import PhotoBrowserDemo - -class PhotoBrowserDemoTests: XCTestCase { - - override func setUp() { - super.setUp() - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDown() { - // Put teardown code here. This method is called after the invocation of each test method in the class. - super.tearDown() - } - - func testExample() { - // This is an example of a functional test case. - // Use XCTAssert and related functions to verify your tests produce the correct results. - } - - func testPerformanceExample() { - // This is an example of a performance test case. - self.measureBlock { - // Put the code you want to measure the time of here. - } - } - -} diff --git a/PhotoBrowserDemo/PhotoBrowserDemo/ViewController.swift b/PhotoBrowserDemo/ViewController.swift similarity index 100% rename from PhotoBrowserDemo/PhotoBrowserDemo/ViewController.swift rename to PhotoBrowserDemo/ViewController.swift diff --git a/PhotoBrowserTests/Info.plist b/PhotoBrowserTests/Info.plist deleted file mode 100644 index ba72822..0000000 --- a/PhotoBrowserTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/PhotoBrowserTests/PhotoBrowserTests.swift b/PhotoBrowserTests/PhotoBrowserTests.swift deleted file mode 100644 index 520065f..0000000 --- a/PhotoBrowserTests/PhotoBrowserTests.swift +++ /dev/null @@ -1,36 +0,0 @@ -// -// PhotoBrowserTests.swift -// PhotoBrowserTests -// -// Created by 王卫 on 16/2/16. -// Copyright © 2016年 Teambition. All rights reserved. -// - -import XCTest -@testable import PhotoBrowser - -class PhotoBrowserTests: XCTestCase { - - override func setUp() { - super.setUp() - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDown() { - // Put teardown code here. This method is called after the invocation of each test method in the class. - super.tearDown() - } - - func testExample() { - // This is an example of a functional test case. - // Use XCTAssert and related functions to verify your tests produce the correct results. - } - - func testPerformanceExample() { - // This is an example of a performance test case. - self.measureBlock { - // Put the code you want to measure the time of here. - } - } - -}