diff --git a/Example/MWPhotoBrowser.xcodeproj/project.pbxproj b/Example/MWPhotoBrowser.xcodeproj/project.pbxproj index 9eb939fd4..a46f491df 100644 --- a/Example/MWPhotoBrowser.xcodeproj/project.pbxproj +++ b/Example/MWPhotoBrowser.xcodeproj/project.pbxproj @@ -1,1767 +1,699 @@ - - - - - archiveVersion - 1 - classes - - objectVersion - 46 - objects - - 02040E41C46EB311FEA82F90 - - buildActionMask - 2147483647 - files - - inputPaths - - isa - PBXShellScriptBuildPhase - name - Embed Pods Frameworks - outputPaths - - runOnlyForDeploymentPostprocessing - 0 - shellPath - /bin/sh - shellScript - "${SRCROOT}/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-frameworks.sh" - - showEnvVarsInLog - 0 - - 0EC5D4A41B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo1.jpg - path - MWPhotoBrowser/Local Media/photo1.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4A51B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo1t.jpg - path - MWPhotoBrowser/Local Media/photo1t.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4A61B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo2.jpg - path - MWPhotoBrowser/Local Media/photo2.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4A71B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo2t.jpg - path - MWPhotoBrowser/Local Media/photo2t.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4A81B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo3.jpg - path - MWPhotoBrowser/Local Media/photo3.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4A91B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo3t.jpg - path - MWPhotoBrowser/Local Media/photo3t.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4AA1B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo4.jpg - path - MWPhotoBrowser/Local Media/photo4.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4AB1B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo4t.jpg - path - MWPhotoBrowser/Local Media/photo4t.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4AC1B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo5.jpg - path - MWPhotoBrowser/Local Media/photo5.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4AD1B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo5t.jpg - path - MWPhotoBrowser/Local Media/photo5t.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4AE1B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo6.jpg - path - MWPhotoBrowser/Local Media/photo6.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4AF1B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo6t.jpg - path - MWPhotoBrowser/Local Media/photo6t.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4B01B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo7.jpg - path - MWPhotoBrowser/Local Media/photo7.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4B11B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo7t.jpg - path - MWPhotoBrowser/Local Media/photo7t.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4B21B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo8.jpg - path - MWPhotoBrowser/Local Media/photo8.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4B31B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - photo8t.jpg - path - MWPhotoBrowser/Local Media/photo8t.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4B41B4C46E50092ACC1 - - isa - PBXFileReference - lastKnownFileType - file - name - video.mp4 - path - MWPhotoBrowser/Local Media/video.mp4 - sourceTree - SOURCE_ROOT - - 0EC5D4B51B4C46E50092ACC1 - - fileRef - 0EC5D4A41B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4B61B4C46E50092ACC1 - - fileRef - 0EC5D4A51B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4B71B4C46E50092ACC1 - - fileRef - 0EC5D4A61B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4B81B4C46E50092ACC1 - - fileRef - 0EC5D4A71B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4B91B4C46E50092ACC1 - - fileRef - 0EC5D4A81B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4BA1B4C46E50092ACC1 - - fileRef - 0EC5D4A91B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4BB1B4C46E50092ACC1 - - fileRef - 0EC5D4AA1B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4BC1B4C46E50092ACC1 - - fileRef - 0EC5D4AB1B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4BD1B4C46E50092ACC1 - - fileRef - 0EC5D4AC1B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4BE1B4C46E50092ACC1 - - fileRef - 0EC5D4AD1B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4BF1B4C46E50092ACC1 - - fileRef - 0EC5D4AE1B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4C01B4C46E50092ACC1 - - fileRef - 0EC5D4AF1B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4C11B4C46E50092ACC1 - - fileRef - 0EC5D4B01B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4C21B4C46E50092ACC1 - - fileRef - 0EC5D4B11B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4C31B4C46E50092ACC1 - - fileRef - 0EC5D4B21B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4C41B4C46E50092ACC1 - - fileRef - 0EC5D4B31B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4C51B4C46E50092ACC1 - - fileRef - 0EC5D4B41B4C46E50092ACC1 - isa - PBXBuildFile - - 0EC5D4C81B4C480E0092ACC1 - - isa - PBXFileReference - lastKnownFileType - image.jpeg - name - video_thumb.jpg - path - MWPhotoBrowser/Local Media/video_thumb.jpg - sourceTree - SOURCE_ROOT - - 0EC5D4C91B4C480E0092ACC1 - - fileRef - 0EC5D4C81B4C480E0092ACC1 - isa - PBXBuildFile - - 234A7CACC7671133BED1A091 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - name - Pods-MWPhotoBrowser_Tests.release.xcconfig - path - Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests.release.xcconfig - sourceTree - <group> - - 2BD41C6E3DA363EE7B81636E - - explicitFileType - archive.ar - includeInIndex - 0 - isa - PBXFileReference - path - libPods-MWPhotoBrowser_Tests.a - sourceTree - BUILT_PRODUCTS_DIR - - 3CC5A2FF9CBF1B37D7CB6F91 - - buildActionMask - 2147483647 - files - - inputPaths - - isa - PBXShellScriptBuildPhase - name - Copy Pods Resources - outputPaths - - runOnlyForDeploymentPostprocessing - 0 - shellPath - /bin/sh - shellScript - "${SRCROOT}/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-resources.sh" - - showEnvVarsInLog - 0 - - 42FCB8D314CA85E2DF2C6434 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text - name - LICENSE - path - ../LICENSE - sourceTree - <group> - - 4C18E1171B47E72800E3D63A - - fileEncoding - 4 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - AppDelegate.h - sourceTree - <group> - - 4C18E1181B47E72800E3D63A - - fileEncoding - 4 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - AppDelegate.m - sourceTree - <group> - - 4C18E1191B47E72800E3D63A - - fileEncoding - 4 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - Menu.h - sourceTree - <group> - - 4C18E11A1B47E72800E3D63A - - fileEncoding - 4 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - Menu.m - sourceTree - <group> - - 4C18E11B1B47E72800E3D63A - - fileRef - 4C18E1181B47E72800E3D63A - isa - PBXBuildFile - - 4C18E11C1B47E72800E3D63A - - fileRef - 4C18E11A1B47E72800E3D63A - isa - PBXBuildFile - - 4C18E1431B47F05900E3D63A - - children - - 0EC5D4C81B4C480E0092ACC1 - 0EC5D4A41B4C46E50092ACC1 - 0EC5D4A51B4C46E50092ACC1 - 0EC5D4A61B4C46E50092ACC1 - 0EC5D4A71B4C46E50092ACC1 - 0EC5D4A81B4C46E50092ACC1 - 0EC5D4A91B4C46E50092ACC1 - 0EC5D4AA1B4C46E50092ACC1 - 0EC5D4AB1B4C46E50092ACC1 - 0EC5D4AC1B4C46E50092ACC1 - 0EC5D4AD1B4C46E50092ACC1 - 0EC5D4AE1B4C46E50092ACC1 - 0EC5D4AF1B4C46E50092ACC1 - 0EC5D4B01B4C46E50092ACC1 - 0EC5D4B11B4C46E50092ACC1 - 0EC5D4B21B4C46E50092ACC1 - 0EC5D4B31B4C46E50092ACC1 - 0EC5D4B41B4C46E50092ACC1 - - isa - PBXGroup - name - Local Media - path - Photos - sourceTree - <group> - - 4D7FBE8AC8249BBC4ADD838E - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - name - Pods-MWPhotoBrowser_Example.release.xcconfig - path - Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example.release.xcconfig - sourceTree - <group> - - 4E0A14EFB687307A0833E979 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text - name - MWPhotoBrowser.podspec - path - ../MWPhotoBrowser.podspec - sourceTree - <group> - - 542176705B9DBC22BBCDF3E4 - - children - - 6E2C60685D353B336094E4E7 - 4D7FBE8AC8249BBC4ADD838E - CA6EC4575DA50FD5A6F8685B - 234A7CACC7671133BED1A091 - - isa - PBXGroup - name - Pods - sourceTree - <group> - - 5FDE805C8BB47D59B5BCB5FA - - buildActionMask - 2147483647 - files - - inputPaths - - isa - PBXShellScriptBuildPhase - name - Copy Pods Resources - outputPaths - - runOnlyForDeploymentPostprocessing - 0 - shellPath - /bin/sh - shellScript - "${SRCROOT}/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-resources.sh" - - showEnvVarsInLog - 0 - - 6003F581195388D10070C39A - - children - - 4E0A14EFB687307A0833E979 - B5C85CB7FE89F584D392C9CF - 42FCB8D314CA85E2DF2C6434 - 6003F593195388D20070C39A - 6003F5B5195388D20070C39A - 6003F58C195388D20070C39A - 6003F58B195388D20070C39A - 542176705B9DBC22BBCDF3E4 - - isa - PBXGroup - sourceTree - <group> - - 6003F582195388D10070C39A - - attributes - - CLASSPREFIX - MW - LastUpgradeCheck - 0730 - ORGANIZATIONNAME - Michael Waterfall - TargetAttributes - - 6003F5AD195388D20070C39A - - TestTargetID - 6003F589195388D20070C39A - - - - buildConfigurationList - 6003F585195388D10070C39A - compatibilityVersion - Xcode 3.2 - developmentRegion - English - hasScannedForEncodings - 0 - isa - PBXProject - knownRegions - - en - Base - - mainGroup - 6003F581195388D10070C39A - productRefGroup - 6003F58B195388D20070C39A - projectDirPath - - projectReferences - - projectRoot - - targets - - 6003F589195388D20070C39A - 6003F5AD195388D20070C39A - - - 6003F585195388D10070C39A - - buildConfigurations - - 6003F5BD195388D20070C39A - 6003F5BE195388D20070C39A - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 6003F586195388D20070C39A - - buildActionMask - 2147483647 - files - - 4C18E11B1B47E72800E3D63A - 6003F59A195388D20070C39A - 4C18E11C1B47E72800E3D63A - - isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 6003F587195388D20070C39A - - buildActionMask - 2147483647 - files - - 6003F590195388D20070C39A - 6003F592195388D20070C39A - 6003F58E195388D20070C39A - BDF7E0625C136532C64B3038 - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 6003F588195388D20070C39A - - buildActionMask - 2147483647 - files - - 0EC5D4B51B4C46E50092ACC1 - 0EC5D4C31B4C46E50092ACC1 - 0EC5D4B71B4C46E50092ACC1 - 873B8AEB1B1F5CCA007FD442 - 6003F5A9195388D20070C39A - 0EC5D4BD1B4C46E50092ACC1 - 0EC5D4BF1B4C46E50092ACC1 - 0EC5D4BE1B4C46E50092ACC1 - 6003F598195388D20070C39A - 0EC5D4BB1B4C46E50092ACC1 - 0EC5D4C41B4C46E50092ACC1 - 0EC5D4C51B4C46E50092ACC1 - 0EC5D4C21B4C46E50092ACC1 - 0EC5D4C01B4C46E50092ACC1 - 0EC5D4C11B4C46E50092ACC1 - 0EC5D4B61B4C46E50092ACC1 - 0EC5D4C91B4C480E0092ACC1 - 0EC5D4BC1B4C46E50092ACC1 - 0EC5D4BA1B4C46E50092ACC1 - 0EC5D4B91B4C46E50092ACC1 - 0EC5D4B81B4C46E50092ACC1 - - isa - PBXResourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 6003F589195388D20070C39A - - buildConfigurationList - 6003F5BF195388D20070C39A - buildPhases - - 81B3EFFED33BEA59184A897C - 6003F586195388D20070C39A - 6003F587195388D20070C39A - 6003F588195388D20070C39A - 5FDE805C8BB47D59B5BCB5FA - C7E06D0576A92A1C834427BE - - buildRules - - dependencies - - isa - PBXNativeTarget - name - MWPhotoBrowser_Example - productName - MWPhotoBrowser - productReference - 6003F58A195388D20070C39A - productType - com.apple.product-type.application - - 6003F58A195388D20070C39A - - explicitFileType - wrapper.application - includeInIndex - 0 - isa - PBXFileReference - path - MWPhotoBrowser_Example.app - sourceTree - BUILT_PRODUCTS_DIR - - 6003F58B195388D20070C39A - - children - - 6003F58A195388D20070C39A - 6003F5AE195388D20070C39A - - isa - PBXGroup - name - Products - sourceTree - <group> - - 6003F58C195388D20070C39A - - children - - 6003F58D195388D20070C39A - 6003F58F195388D20070C39A - 6003F591195388D20070C39A - 6003F5AF195388D20070C39A - 9C165E5EE0D40A4673EB6CB0 - 2BD41C6E3DA363EE7B81636E - - isa - PBXGroup - name - Frameworks - sourceTree - <group> - - 6003F58D195388D20070C39A - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - Foundation.framework - path - System/Library/Frameworks/Foundation.framework - sourceTree - SDKROOT - - 6003F58E195388D20070C39A - - fileRef - 6003F58D195388D20070C39A - isa - PBXBuildFile - - 6003F58F195388D20070C39A - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - CoreGraphics.framework - path - System/Library/Frameworks/CoreGraphics.framework - sourceTree - SDKROOT - - 6003F590195388D20070C39A - - fileRef - 6003F58F195388D20070C39A - isa - PBXBuildFile - - 6003F591195388D20070C39A - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - UIKit.framework - path - System/Library/Frameworks/UIKit.framework - sourceTree - SDKROOT - - 6003F592195388D20070C39A - - fileRef - 6003F591195388D20070C39A - isa - PBXBuildFile - - 6003F593195388D20070C39A - - children - - 4C18E1171B47E72800E3D63A - 4C18E1181B47E72800E3D63A - 4C18E1191B47E72800E3D63A - 4C18E11A1B47E72800E3D63A - 873B8AEA1B1F5CCA007FD442 - 6003F5A8195388D20070C39A - 4C18E1431B47F05900E3D63A - 6003F594195388D20070C39A - - isa - PBXGroup - name - Example - path - MWPhotoBrowser - sourceTree - <group> - - 6003F594195388D20070C39A - - children - - 6003F595195388D20070C39A - 6003F596195388D20070C39A - 6003F599195388D20070C39A - 6003F59B195388D20070C39A - - isa - PBXGroup - name - Supporting Files - sourceTree - <group> - - 6003F595195388D20070C39A - - isa - PBXFileReference - lastKnownFileType - text.plist.xml - path - MWPhotoBrowser-Info.plist - sourceTree - <group> - - 6003F596195388D20070C39A - - children - - 6003F597195388D20070C39A - - isa - PBXVariantGroup - name - InfoPlist.strings - sourceTree - <group> - - 6003F597195388D20070C39A - - isa - PBXFileReference - lastKnownFileType - text.plist.strings - name - en - path - en.lproj/InfoPlist.strings - sourceTree - <group> - - 6003F598195388D20070C39A - - fileRef - 6003F596195388D20070C39A - isa - PBXBuildFile - - 6003F599195388D20070C39A - - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - main.m - sourceTree - <group> - - 6003F59A195388D20070C39A - - fileRef - 6003F599195388D20070C39A - isa - PBXBuildFile - - 6003F59B195388D20070C39A - - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - MWPhotoBrowser-Prefix.pch - sourceTree - <group> - - 6003F5A8195388D20070C39A - - isa - PBXFileReference - lastKnownFileType - folder.assetcatalog - path - Images.xcassets - sourceTree - <group> - - 6003F5A9195388D20070C39A - - fileRef - 6003F5A8195388D20070C39A - isa - PBXBuildFile - - 6003F5AA195388D20070C39A - - buildActionMask - 2147483647 - files - - 6003F5BC195388D20070C39A - - isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 6003F5AB195388D20070C39A - - buildActionMask - 2147483647 - files - - 6003F5B0195388D20070C39A - 6003F5B2195388D20070C39A - 6003F5B1195388D20070C39A - BBD9ABBBC6D859245030E9BA - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 6003F5AC195388D20070C39A - - buildActionMask - 2147483647 - files - - 6003F5BA195388D20070C39A - - isa - PBXResourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 6003F5AD195388D20070C39A - - buildConfigurationList - 6003F5C2195388D20070C39A - buildPhases - - F7D70421FEADB9922E5F26C7 - 6003F5AA195388D20070C39A - 6003F5AB195388D20070C39A - 6003F5AC195388D20070C39A - 3CC5A2FF9CBF1B37D7CB6F91 - 02040E41C46EB311FEA82F90 - - buildRules - - dependencies - - 6003F5B4195388D20070C39A - - isa - PBXNativeTarget - name - MWPhotoBrowser_Tests - productName - MWPhotoBrowserTests - productReference - 6003F5AE195388D20070C39A - productType - com.apple.product-type.bundle.unit-test - - 6003F5AE195388D20070C39A - - explicitFileType - wrapper.cfbundle - includeInIndex - 0 - isa - PBXFileReference - path - MWPhotoBrowser_Tests.xctest - sourceTree - BUILT_PRODUCTS_DIR - - 6003F5AF195388D20070C39A - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - XCTest.framework - path - Library/Frameworks/XCTest.framework - sourceTree - DEVELOPER_DIR - - 6003F5B0195388D20070C39A - - fileRef - 6003F5AF195388D20070C39A - isa - PBXBuildFile - - 6003F5B1195388D20070C39A - - fileRef - 6003F58D195388D20070C39A - isa - PBXBuildFile - - 6003F5B2195388D20070C39A - - fileRef - 6003F591195388D20070C39A - isa - PBXBuildFile - - 6003F5B3195388D20070C39A - - containerPortal - 6003F582195388D10070C39A - isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - 6003F589195388D20070C39A - remoteInfo - MWPhotoBrowser - - 6003F5B4195388D20070C39A - - isa - PBXTargetDependency - target - 6003F589195388D20070C39A - targetProxy - 6003F5B3195388D20070C39A - - 6003F5B5195388D20070C39A - - children - - 6003F5BB195388D20070C39A - 6003F5B6195388D20070C39A - - isa - PBXGroup - path - Tests - sourceTree - <group> - - 6003F5B6195388D20070C39A - - children - - 6003F5B7195388D20070C39A - 6003F5B8195388D20070C39A - 606FC2411953D9B200FFA9A0 - - isa - PBXGroup - name - Supporting Files - sourceTree - <group> - - 6003F5B7195388D20070C39A - - isa - PBXFileReference - lastKnownFileType - text.plist.xml - path - Tests-Info.plist - sourceTree - <group> - - 6003F5B8195388D20070C39A - - children - - 6003F5B9195388D20070C39A - - isa - PBXVariantGroup - name - InfoPlist.strings - sourceTree - <group> - - 6003F5B9195388D20070C39A - - isa - PBXFileReference - lastKnownFileType - text.plist.strings - name - en - path - en.lproj/InfoPlist.strings - sourceTree - <group> - - 6003F5BA195388D20070C39A - - fileRef - 6003F5B8195388D20070C39A - isa - PBXBuildFile - - 6003F5BB195388D20070C39A - - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - Tests.m - sourceTree - <group> - - 6003F5BC195388D20070C39A - - fileRef - 6003F5BB195388D20070C39A - isa - PBXBuildFile - - 6003F5BD195388D20070C39A - - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - YES - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES_ERROR - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES_ERROR - CLANG_WARN__DUPLICATE_METHOD_MATCH - YES - CODE_SIGN_IDENTITY[sdk=iphoneos*] - iPhone Developer - COPY_PHASE_STRIP - NO - ENABLE_TESTABILITY - YES - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES_ERROR - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES_AGGRESSIVE - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - IPHONEOS_DEPLOYMENT_TARGET - 7.1 - ONLY_ACTIVE_ARCH - YES - SDKROOT - iphoneos - TARGETED_DEVICE_FAMILY - 1,2 - - isa - XCBuildConfiguration - name - Debug - - 6003F5BE195388D20070C39A - - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - YES - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES_ERROR - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES_ERROR - CLANG_WARN__DUPLICATE_METHOD_MATCH - YES - CODE_SIGN_IDENTITY[sdk=iphoneos*] - iPhone Developer - COPY_PHASE_STRIP - YES - ENABLE_NS_ASSERTIONS - NO - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES_ERROR - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES_AGGRESSIVE - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - IPHONEOS_DEPLOYMENT_TARGET - 7.1 - SDKROOT - iphoneos - TARGETED_DEVICE_FAMILY - 1,2 - VALIDATE_PRODUCT - YES - - isa - XCBuildConfiguration - name - Release - - 6003F5BF195388D20070C39A - - buildConfigurations - - 6003F5C0195388D20070C39A - 6003F5C1195388D20070C39A - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 6003F5C0195388D20070C39A - - baseConfigurationReference - 6E2C60685D353B336094E4E7 - buildSettings - - ASSETCATALOG_COMPILER_APPICON_NAME - AppIcon - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME - LaunchImage - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - MWPhotoBrowser/MWPhotoBrowser-Prefix.pch - INFOPLIST_FILE - MWPhotoBrowser/MWPhotoBrowser-Info.plist - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MODULE_NAME - ExampleApp - PRODUCT_BUNDLE_IDENTIFIER - org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier} - PRODUCT_NAME - $(TARGET_NAME) - WRAPPER_EXTENSION - app - - isa - XCBuildConfiguration - name - Debug - - 6003F5C1195388D20070C39A - - baseConfigurationReference - 4D7FBE8AC8249BBC4ADD838E - buildSettings - - ASSETCATALOG_COMPILER_APPICON_NAME - AppIcon - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME - LaunchImage - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - MWPhotoBrowser/MWPhotoBrowser-Prefix.pch - INFOPLIST_FILE - MWPhotoBrowser/MWPhotoBrowser-Info.plist - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MODULE_NAME - ExampleApp - PRODUCT_BUNDLE_IDENTIFIER - org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier} - PRODUCT_NAME - $(TARGET_NAME) - WRAPPER_EXTENSION - app - - isa - XCBuildConfiguration - name - Release - - 6003F5C2195388D20070C39A - - buildConfigurations - - 6003F5C3195388D20070C39A - 6003F5C4195388D20070C39A - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 6003F5C3195388D20070C39A - - baseConfigurationReference - CA6EC4575DA50FD5A6F8685B - buildSettings - - BUNDLE_LOADER - $(TEST_HOST) - FRAMEWORK_SEARCH_PATHS - - $(SDKROOT)/Developer/Library/Frameworks - $(inherited) - $(DEVELOPER_FRAMEWORKS_DIR) - - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - Tests/Tests-Prefix.pch - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - INFOPLIST_FILE - Tests/Tests-Info.plist - PRODUCT_BUNDLE_IDENTIFIER - org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier} - PRODUCT_NAME - $(TARGET_NAME) - TEST_HOST - $(BUILT_PRODUCTS_DIR)/MWPhotoBrowser_Example.app/MWPhotoBrowser_Example - WRAPPER_EXTENSION - xctest - - isa - XCBuildConfiguration - name - Debug - - 6003F5C4195388D20070C39A - - baseConfigurationReference - 234A7CACC7671133BED1A091 - buildSettings - - BUNDLE_LOADER - $(TEST_HOST) - FRAMEWORK_SEARCH_PATHS - - $(SDKROOT)/Developer/Library/Frameworks - $(inherited) - $(DEVELOPER_FRAMEWORKS_DIR) - - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_PREFIX_HEADER - Tests/Tests-Prefix.pch - INFOPLIST_FILE - Tests/Tests-Info.plist - PRODUCT_BUNDLE_IDENTIFIER - org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier} - PRODUCT_NAME - $(TARGET_NAME) - TEST_HOST - $(BUILT_PRODUCTS_DIR)/MWPhotoBrowser_Example.app/MWPhotoBrowser_Example - WRAPPER_EXTENSION - xctest - - isa - XCBuildConfiguration - name - Release - - 606FC2411953D9B200FFA9A0 - - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - Tests-Prefix.pch - sourceTree - <group> - - 6E2C60685D353B336094E4E7 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - name - Pods-MWPhotoBrowser_Example.debug.xcconfig - path - Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example.debug.xcconfig - sourceTree - <group> - - 81B3EFFED33BEA59184A897C - - buildActionMask - 2147483647 - files - - inputPaths - - isa - PBXShellScriptBuildPhase - name - Check Pods Manifest.lock - outputPaths - - runOnlyForDeploymentPostprocessing - 0 - shellPath - /bin/sh - shellScript - diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null -if [[ $? != 0 ]] ; then - cat << EOM -error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation. -EOM - exit 1 -fi - - showEnvVarsInLog - 0 - - 873B8AEA1B1F5CCA007FD442 - - fileEncoding - 4 - isa - PBXFileReference - lastKnownFileType - file.storyboard - path - Main.storyboard - sourceTree - <group> - - 873B8AEB1B1F5CCA007FD442 - - fileRef - 873B8AEA1B1F5CCA007FD442 - isa - PBXBuildFile - - 9C165E5EE0D40A4673EB6CB0 - - explicitFileType - archive.ar - includeInIndex - 0 - isa - PBXFileReference - path - libPods-MWPhotoBrowser_Example.a - sourceTree - BUILT_PRODUCTS_DIR - - B5C85CB7FE89F584D392C9CF - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - net.daringfireball.markdown - name - README.md - path - ../README.md - sourceTree - <group> - - BBD9ABBBC6D859245030E9BA - - fileRef - 2BD41C6E3DA363EE7B81636E - isa - PBXBuildFile - - BDF7E0625C136532C64B3038 - - fileRef - 9C165E5EE0D40A4673EB6CB0 - isa - PBXBuildFile - - C7E06D0576A92A1C834427BE - - buildActionMask - 2147483647 - files - - inputPaths - - isa - PBXShellScriptBuildPhase - name - Embed Pods Frameworks - outputPaths - - runOnlyForDeploymentPostprocessing - 0 - shellPath - /bin/sh - shellScript - "${SRCROOT}/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-frameworks.sh" - - showEnvVarsInLog - 0 - - CA6EC4575DA50FD5A6F8685B - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - name - Pods-MWPhotoBrowser_Tests.debug.xcconfig - path - Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests.debug.xcconfig - sourceTree - <group> - - F7D70421FEADB9922E5F26C7 - - buildActionMask - 2147483647 - files - - inputPaths - - isa - PBXShellScriptBuildPhase - name - Check Pods Manifest.lock - outputPaths - - runOnlyForDeploymentPostprocessing - 0 - shellPath - /bin/sh - shellScript - diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null -if [[ $? != 0 ]] ; then - cat << EOM -error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation. -EOM - exit 1 -fi - - showEnvVarsInLog - 0 - - - rootObject - 6003F582195388D10070C39A - - +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 0E2C49E141ED41CED7DE2619 /* libPods-MWPhotoBrowser_Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18604B9163F9466AFDF6678E /* libPods-MWPhotoBrowser_Example.a */; }; + 0EC5D4B51B4C46E50092ACC1 /* photo1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4A41B4C46E50092ACC1 /* photo1.jpg */; }; + 0EC5D4B61B4C46E50092ACC1 /* photo1t.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4A51B4C46E50092ACC1 /* photo1t.jpg */; }; + 0EC5D4B71B4C46E50092ACC1 /* photo2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4A61B4C46E50092ACC1 /* photo2.jpg */; }; + 0EC5D4B81B4C46E50092ACC1 /* photo2t.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4A71B4C46E50092ACC1 /* photo2t.jpg */; }; + 0EC5D4B91B4C46E50092ACC1 /* photo3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4A81B4C46E50092ACC1 /* photo3.jpg */; }; + 0EC5D4BA1B4C46E50092ACC1 /* photo3t.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4A91B4C46E50092ACC1 /* photo3t.jpg */; }; + 0EC5D4BB1B4C46E50092ACC1 /* photo4.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4AA1B4C46E50092ACC1 /* photo4.jpg */; }; + 0EC5D4BC1B4C46E50092ACC1 /* photo4t.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4AB1B4C46E50092ACC1 /* photo4t.jpg */; }; + 0EC5D4BD1B4C46E50092ACC1 /* photo5.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4AC1B4C46E50092ACC1 /* photo5.jpg */; }; + 0EC5D4BE1B4C46E50092ACC1 /* photo5t.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4AD1B4C46E50092ACC1 /* photo5t.jpg */; }; + 0EC5D4BF1B4C46E50092ACC1 /* photo6.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4AE1B4C46E50092ACC1 /* photo6.jpg */; }; + 0EC5D4C01B4C46E50092ACC1 /* photo6t.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4AF1B4C46E50092ACC1 /* photo6t.jpg */; }; + 0EC5D4C11B4C46E50092ACC1 /* photo7.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4B01B4C46E50092ACC1 /* photo7.jpg */; }; + 0EC5D4C21B4C46E50092ACC1 /* photo7t.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4B11B4C46E50092ACC1 /* photo7t.jpg */; }; + 0EC5D4C31B4C46E50092ACC1 /* photo8.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4B21B4C46E50092ACC1 /* photo8.jpg */; }; + 0EC5D4C41B4C46E50092ACC1 /* photo8t.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4B31B4C46E50092ACC1 /* photo8t.jpg */; }; + 0EC5D4C51B4C46E50092ACC1 /* video.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4B41B4C46E50092ACC1 /* video.mp4 */; }; + 0EC5D4C91B4C480E0092ACC1 /* video_thumb.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 0EC5D4C81B4C480E0092ACC1 /* video_thumb.jpg */; }; + 4C18E11B1B47E72800E3D63A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C18E1181B47E72800E3D63A /* AppDelegate.m */; }; + 4C18E11C1B47E72800E3D63A /* Menu.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C18E11A1B47E72800E3D63A /* Menu.m */; }; + 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; + 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; }; + 6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; }; + 6003F598195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F596195388D20070C39A /* InfoPlist.strings */; }; + 6003F59A195388D20070C39A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F599195388D20070C39A /* main.m */; }; + 6003F5A9195388D20070C39A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5A8195388D20070C39A /* Images.xcassets */; }; + 6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F5AF195388D20070C39A /* XCTest.framework */; }; + 6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; + 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; }; + 6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; }; + 6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; }; + 7430F50BF88B090772BDF3C0 /* libPods-MWPhotoBrowser_Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 32E16D4EE6C95B049A5F7F25 /* libPods-MWPhotoBrowser_Tests.a */; }; + 873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 6003F5B3195388D20070C39A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6003F582195388D10070C39A /* Project object */; + proxyType = 1; + remoteGlobalIDString = 6003F589195388D20070C39A; + remoteInfo = MWPhotoBrowser; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 0EC5D4A41B4C46E50092ACC1 /* photo1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo1.jpg; path = "MWPhotoBrowser/Local Media/photo1.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4A51B4C46E50092ACC1 /* photo1t.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo1t.jpg; path = "MWPhotoBrowser/Local Media/photo1t.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4A61B4C46E50092ACC1 /* photo2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo2.jpg; path = "MWPhotoBrowser/Local Media/photo2.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4A71B4C46E50092ACC1 /* photo2t.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo2t.jpg; path = "MWPhotoBrowser/Local Media/photo2t.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4A81B4C46E50092ACC1 /* photo3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo3.jpg; path = "MWPhotoBrowser/Local Media/photo3.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4A91B4C46E50092ACC1 /* photo3t.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo3t.jpg; path = "MWPhotoBrowser/Local Media/photo3t.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4AA1B4C46E50092ACC1 /* photo4.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo4.jpg; path = "MWPhotoBrowser/Local Media/photo4.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4AB1B4C46E50092ACC1 /* photo4t.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo4t.jpg; path = "MWPhotoBrowser/Local Media/photo4t.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4AC1B4C46E50092ACC1 /* photo5.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo5.jpg; path = "MWPhotoBrowser/Local Media/photo5.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4AD1B4C46E50092ACC1 /* photo5t.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo5t.jpg; path = "MWPhotoBrowser/Local Media/photo5t.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4AE1B4C46E50092ACC1 /* photo6.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo6.jpg; path = "MWPhotoBrowser/Local Media/photo6.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4AF1B4C46E50092ACC1 /* photo6t.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo6t.jpg; path = "MWPhotoBrowser/Local Media/photo6t.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4B01B4C46E50092ACC1 /* photo7.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo7.jpg; path = "MWPhotoBrowser/Local Media/photo7.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4B11B4C46E50092ACC1 /* photo7t.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo7t.jpg; path = "MWPhotoBrowser/Local Media/photo7t.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4B21B4C46E50092ACC1 /* photo8.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo8.jpg; path = "MWPhotoBrowser/Local Media/photo8.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4B31B4C46E50092ACC1 /* photo8t.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = photo8t.jpg; path = "MWPhotoBrowser/Local Media/photo8t.jpg"; sourceTree = SOURCE_ROOT; }; + 0EC5D4B41B4C46E50092ACC1 /* video.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; name = video.mp4; path = "MWPhotoBrowser/Local Media/video.mp4"; sourceTree = SOURCE_ROOT; }; + 0EC5D4C81B4C480E0092ACC1 /* video_thumb.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = video_thumb.jpg; path = "MWPhotoBrowser/Local Media/video_thumb.jpg"; sourceTree = SOURCE_ROOT; }; + 18604B9163F9466AFDF6678E /* libPods-MWPhotoBrowser_Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MWPhotoBrowser_Example.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2351B14A83007E17840254C1 /* Pods-MWPhotoBrowser_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MWPhotoBrowser_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests.release.xcconfig"; sourceTree = ""; }; + 32E16D4EE6C95B049A5F7F25 /* libPods-MWPhotoBrowser_Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MWPhotoBrowser_Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 36C9CE9BD3BC921FE2C66518 /* Pods-MWPhotoBrowser_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MWPhotoBrowser_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example.debug.xcconfig"; sourceTree = ""; }; + 38F82635CE8F591AD4393608 /* Pods-MWPhotoBrowser_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MWPhotoBrowser_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example.release.xcconfig"; sourceTree = ""; }; + 42FCB8D314CA85E2DF2C6434 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; + 4C18E1171B47E72800E3D63A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 4C18E1181B47E72800E3D63A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 4C18E1191B47E72800E3D63A /* Menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Menu.h; sourceTree = ""; }; + 4C18E11A1B47E72800E3D63A /* Menu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Menu.m; sourceTree = ""; }; + 4E0A14EFB687307A0833E979 /* MWPhotoBrowser.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = MWPhotoBrowser.podspec; path = ../MWPhotoBrowser.podspec; sourceTree = ""; }; + 6003F58A195388D20070C39A /* MWPhotoBrowser_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MWPhotoBrowser_Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 6003F58F195388D20070C39A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + 6003F591195388D20070C39A /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + 6003F595195388D20070C39A /* MWPhotoBrowser-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "MWPhotoBrowser-Info.plist"; sourceTree = ""; }; + 6003F597195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + 6003F599195388D20070C39A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 6003F59B195388D20070C39A /* MWPhotoBrowser-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWPhotoBrowser-Prefix.pch"; sourceTree = ""; }; + 6003F5A8195388D20070C39A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 6003F5AE195388D20070C39A /* MWPhotoBrowser_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MWPhotoBrowser_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 6003F5AF195388D20070C39A /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; + 6003F5B7195388D20070C39A /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = ""; }; + 6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + 6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = ""; }; + 606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = ""; }; + 647D7538E6E02F350F8F1409 /* Pods-MWPhotoBrowser_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MWPhotoBrowser_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests.debug.xcconfig"; sourceTree = ""; }; + 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; + B5C85CB7FE89F584D392C9CF /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 6003F587195388D20070C39A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */, + 6003F592195388D20070C39A /* UIKit.framework in Frameworks */, + 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */, + 0E2C49E141ED41CED7DE2619 /* libPods-MWPhotoBrowser_Example.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 6003F5AB195388D20070C39A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */, + 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */, + 6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */, + 7430F50BF88B090772BDF3C0 /* libPods-MWPhotoBrowser_Tests.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 4C18E1431B47F05900E3D63A /* Local Media */ = { + isa = PBXGroup; + children = ( + 0EC5D4C81B4C480E0092ACC1 /* video_thumb.jpg */, + 0EC5D4A41B4C46E50092ACC1 /* photo1.jpg */, + 0EC5D4A51B4C46E50092ACC1 /* photo1t.jpg */, + 0EC5D4A61B4C46E50092ACC1 /* photo2.jpg */, + 0EC5D4A71B4C46E50092ACC1 /* photo2t.jpg */, + 0EC5D4A81B4C46E50092ACC1 /* photo3.jpg */, + 0EC5D4A91B4C46E50092ACC1 /* photo3t.jpg */, + 0EC5D4AA1B4C46E50092ACC1 /* photo4.jpg */, + 0EC5D4AB1B4C46E50092ACC1 /* photo4t.jpg */, + 0EC5D4AC1B4C46E50092ACC1 /* photo5.jpg */, + 0EC5D4AD1B4C46E50092ACC1 /* photo5t.jpg */, + 0EC5D4AE1B4C46E50092ACC1 /* photo6.jpg */, + 0EC5D4AF1B4C46E50092ACC1 /* photo6t.jpg */, + 0EC5D4B01B4C46E50092ACC1 /* photo7.jpg */, + 0EC5D4B11B4C46E50092ACC1 /* photo7t.jpg */, + 0EC5D4B21B4C46E50092ACC1 /* photo8.jpg */, + 0EC5D4B31B4C46E50092ACC1 /* photo8t.jpg */, + 0EC5D4B41B4C46E50092ACC1 /* video.mp4 */, + ); + name = "Local Media"; + path = Photos; + sourceTree = ""; + }; + 4F68EA5455DFEE6C6DA937AB /* Pods */ = { + isa = PBXGroup; + children = ( + 36C9CE9BD3BC921FE2C66518 /* Pods-MWPhotoBrowser_Example.debug.xcconfig */, + 38F82635CE8F591AD4393608 /* Pods-MWPhotoBrowser_Example.release.xcconfig */, + 647D7538E6E02F350F8F1409 /* Pods-MWPhotoBrowser_Tests.debug.xcconfig */, + 2351B14A83007E17840254C1 /* Pods-MWPhotoBrowser_Tests.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; + 6003F581195388D10070C39A = { + isa = PBXGroup; + children = ( + 4E0A14EFB687307A0833E979 /* MWPhotoBrowser.podspec */, + B5C85CB7FE89F584D392C9CF /* README.md */, + 42FCB8D314CA85E2DF2C6434 /* LICENSE */, + 6003F593195388D20070C39A /* Example */, + 6003F5B5195388D20070C39A /* Tests */, + 6003F58C195388D20070C39A /* Frameworks */, + 6003F58B195388D20070C39A /* Products */, + 4F68EA5455DFEE6C6DA937AB /* Pods */, + ); + sourceTree = ""; + }; + 6003F58B195388D20070C39A /* Products */ = { + isa = PBXGroup; + children = ( + 6003F58A195388D20070C39A /* MWPhotoBrowser_Example.app */, + 6003F5AE195388D20070C39A /* MWPhotoBrowser_Tests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 6003F58C195388D20070C39A /* Frameworks */ = { + isa = PBXGroup; + children = ( + 6003F58D195388D20070C39A /* Foundation.framework */, + 6003F58F195388D20070C39A /* CoreGraphics.framework */, + 6003F591195388D20070C39A /* UIKit.framework */, + 6003F5AF195388D20070C39A /* XCTest.framework */, + 18604B9163F9466AFDF6678E /* libPods-MWPhotoBrowser_Example.a */, + 32E16D4EE6C95B049A5F7F25 /* libPods-MWPhotoBrowser_Tests.a */, + ); + name = Frameworks; + sourceTree = ""; + }; + 6003F593195388D20070C39A /* Example */ = { + isa = PBXGroup; + children = ( + 4C18E1171B47E72800E3D63A /* AppDelegate.h */, + 4C18E1181B47E72800E3D63A /* AppDelegate.m */, + 4C18E1191B47E72800E3D63A /* Menu.h */, + 4C18E11A1B47E72800E3D63A /* Menu.m */, + 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */, + 6003F5A8195388D20070C39A /* Images.xcassets */, + 4C18E1431B47F05900E3D63A /* Local Media */, + 6003F594195388D20070C39A /* Supporting Files */, + ); + name = Example; + path = MWPhotoBrowser; + sourceTree = ""; + }; + 6003F594195388D20070C39A /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 6003F595195388D20070C39A /* MWPhotoBrowser-Info.plist */, + 6003F596195388D20070C39A /* InfoPlist.strings */, + 6003F599195388D20070C39A /* main.m */, + 6003F59B195388D20070C39A /* MWPhotoBrowser-Prefix.pch */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 6003F5B5195388D20070C39A /* Tests */ = { + isa = PBXGroup; + children = ( + 6003F5BB195388D20070C39A /* Tests.m */, + 6003F5B6195388D20070C39A /* Supporting Files */, + ); + path = Tests; + sourceTree = ""; + }; + 6003F5B6195388D20070C39A /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 6003F5B7195388D20070C39A /* Tests-Info.plist */, + 6003F5B8195388D20070C39A /* InfoPlist.strings */, + 606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 6003F589195388D20070C39A /* MWPhotoBrowser_Example */ = { + isa = PBXNativeTarget; + buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "MWPhotoBrowser_Example" */; + buildPhases = ( + 8CEC2DB9D1878E5FD72A4F3C /* [CP] Check Pods Manifest.lock */, + 6003F586195388D20070C39A /* Sources */, + 6003F587195388D20070C39A /* Frameworks */, + 6003F588195388D20070C39A /* Resources */, + CF1AF08FF54F6013168012F4 /* [CP] Embed Pods Frameworks */, + B32830DD35B95440BA824536 /* [CP] Copy Pods Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = MWPhotoBrowser_Example; + productName = MWPhotoBrowser; + productReference = 6003F58A195388D20070C39A /* MWPhotoBrowser_Example.app */; + productType = "com.apple.product-type.application"; + }; + 6003F5AD195388D20070C39A /* MWPhotoBrowser_Tests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "MWPhotoBrowser_Tests" */; + buildPhases = ( + 589A4C1D65C0EEA078A7F803 /* [CP] Check Pods Manifest.lock */, + 6003F5AA195388D20070C39A /* Sources */, + 6003F5AB195388D20070C39A /* Frameworks */, + 6003F5AC195388D20070C39A /* Resources */, + 98FBE21BA5242C57B50A0AA0 /* [CP] Embed Pods Frameworks */, + CC5C009C2D6A102A7C487D3E /* [CP] Copy Pods Resources */, + ); + buildRules = ( + ); + dependencies = ( + 6003F5B4195388D20070C39A /* PBXTargetDependency */, + ); + name = MWPhotoBrowser_Tests; + productName = MWPhotoBrowserTests; + productReference = 6003F5AE195388D20070C39A /* MWPhotoBrowser_Tests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 6003F582195388D10070C39A /* Project object */ = { + isa = PBXProject; + attributes = { + CLASSPREFIX = MW; + LastUpgradeCheck = 0730; + ORGANIZATIONNAME = "Michael Waterfall"; + TargetAttributes = { + 6003F589195388D20070C39A = { + DevelopmentTeam = NAQE7SQSQ8; + }; + 6003F5AD195388D20070C39A = { + TestTargetID = 6003F589195388D20070C39A; + }; + }; + }; + buildConfigurationList = 6003F585195388D10070C39A /* Build configuration list for PBXProject "MWPhotoBrowser" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 6003F581195388D10070C39A; + productRefGroup = 6003F58B195388D20070C39A /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 6003F589195388D20070C39A /* MWPhotoBrowser_Example */, + 6003F5AD195388D20070C39A /* MWPhotoBrowser_Tests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 6003F588195388D20070C39A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 0EC5D4B51B4C46E50092ACC1 /* photo1.jpg in Resources */, + 0EC5D4C31B4C46E50092ACC1 /* photo8.jpg in Resources */, + 0EC5D4B71B4C46E50092ACC1 /* photo2.jpg in Resources */, + 873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */, + 6003F5A9195388D20070C39A /* Images.xcassets in Resources */, + 0EC5D4BD1B4C46E50092ACC1 /* photo5.jpg in Resources */, + 0EC5D4BF1B4C46E50092ACC1 /* photo6.jpg in Resources */, + 0EC5D4BE1B4C46E50092ACC1 /* photo5t.jpg in Resources */, + 6003F598195388D20070C39A /* InfoPlist.strings in Resources */, + 0EC5D4BB1B4C46E50092ACC1 /* photo4.jpg in Resources */, + 0EC5D4C41B4C46E50092ACC1 /* photo8t.jpg in Resources */, + 0EC5D4C51B4C46E50092ACC1 /* video.mp4 in Resources */, + 0EC5D4C21B4C46E50092ACC1 /* photo7t.jpg in Resources */, + 0EC5D4C01B4C46E50092ACC1 /* photo6t.jpg in Resources */, + 0EC5D4C11B4C46E50092ACC1 /* photo7.jpg in Resources */, + 0EC5D4B61B4C46E50092ACC1 /* photo1t.jpg in Resources */, + 0EC5D4C91B4C480E0092ACC1 /* video_thumb.jpg in Resources */, + 0EC5D4BC1B4C46E50092ACC1 /* photo4t.jpg in Resources */, + 0EC5D4BA1B4C46E50092ACC1 /* photo3t.jpg in Resources */, + 0EC5D4B91B4C46E50092ACC1 /* photo3.jpg in Resources */, + 0EC5D4B81B4C46E50092ACC1 /* photo2t.jpg in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 6003F5AC195388D20070C39A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 589A4C1D65C0EEA078A7F803 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + showEnvVarsInLog = 0; + }; + 8CEC2DB9D1878E5FD72A4F3C /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + showEnvVarsInLog = 0; + }; + 98FBE21BA5242C57B50A0AA0 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + B32830DD35B95440BA824536 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + CC5C009C2D6A102A7C487D3E /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + CF1AF08FF54F6013168012F4 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 6003F586195388D20070C39A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 4C18E11B1B47E72800E3D63A /* AppDelegate.m in Sources */, + 6003F59A195388D20070C39A /* main.m in Sources */, + 4C18E11C1B47E72800E3D63A /* Menu.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 6003F5AA195388D20070C39A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6003F5BC195388D20070C39A /* Tests.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 6003F5B4195388D20070C39A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 6003F589195388D20070C39A /* MWPhotoBrowser_Example */; + targetProxy = 6003F5B3195388D20070C39A /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 6003F596195388D20070C39A /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 6003F597195388D20070C39A /* en */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + 6003F5B8195388D20070C39A /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 6003F5B9195388D20070C39A /* en */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 6003F5BD195388D20070C39A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 6003F5BE195388D20070C39A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = YES; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 6003F5C0195388D20070C39A /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 36C9CE9BD3BC921FE2C66518 /* Pods-MWPhotoBrowser_Example.debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + DEVELOPMENT_TEAM = NAQE7SQSQ8; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "MWPhotoBrowser/MWPhotoBrowser-Prefix.pch"; + INFOPLIST_FILE = "MWPhotoBrowser/MWPhotoBrowser-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + MODULE_NAME = ExampleApp; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME)"; + WRAPPER_EXTENSION = app; + }; + name = Debug; + }; + 6003F5C1195388D20070C39A /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 38F82635CE8F591AD4393608 /* Pods-MWPhotoBrowser_Example.release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + DEVELOPMENT_TEAM = NAQE7SQSQ8; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "MWPhotoBrowser/MWPhotoBrowser-Prefix.pch"; + INFOPLIST_FILE = "MWPhotoBrowser/MWPhotoBrowser-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; + MODULE_NAME = ExampleApp; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME)"; + WRAPPER_EXTENSION = app; + }; + name = Release; + }; + 6003F5C3195388D20070C39A /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 647D7538E6E02F350F8F1409 /* Pods-MWPhotoBrowser_Tests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + INFOPLIST_FILE = "Tests/Tests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MWPhotoBrowser_Example.app/MWPhotoBrowser_Example"; + WRAPPER_EXTENSION = xctest; + }; + name = Debug; + }; + 6003F5C4195388D20070C39A /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 2351B14A83007E17840254C1 /* Pods-MWPhotoBrowser_Tests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(SDKROOT)/Developer/Library/Frameworks", + "$(inherited)", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch"; + INFOPLIST_FILE = "Tests/Tests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME)"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MWPhotoBrowser_Example.app/MWPhotoBrowser_Example"; + WRAPPER_EXTENSION = xctest; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 6003F585195388D10070C39A /* Build configuration list for PBXProject "MWPhotoBrowser" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6003F5BD195388D20070C39A /* Debug */, + 6003F5BE195388D20070C39A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "MWPhotoBrowser_Example" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6003F5C0195388D20070C39A /* Debug */, + 6003F5C1195388D20070C39A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "MWPhotoBrowser_Tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6003F5C3195388D20070C39A /* Debug */, + 6003F5C4195388D20070C39A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 6003F582195388D10070C39A /* Project object */; +} diff --git a/Example/MWPhotoBrowser/MWPhotoBrowser-Info.plist b/Example/MWPhotoBrowser/MWPhotoBrowser-Info.plist index 940966cd9..350de3b57 100644 --- a/Example/MWPhotoBrowser/MWPhotoBrowser-Info.plist +++ b/Example/MWPhotoBrowser/MWPhotoBrowser-Info.plist @@ -24,6 +24,10 @@ 1.0 LSRequiresIPhoneOS + NSCameraUsageDescription + MWPhotoBrowser 需要访问相机 + NSPhotoLibraryUsageDescription + MWPhotoBrowser 需要访问相册 UILaunchStoryboardName Main UIMainStoryboardFile diff --git a/Example/MWPhotoBrowser/Menu.m b/Example/MWPhotoBrowser/Menu.m index 76b563539..423ea5cff 100644 --- a/Example/MWPhotoBrowser/Menu.m +++ b/Example/MWPhotoBrowser/Menu.m @@ -21,7 +21,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder { self.title = @"MWPhotoBrowser"; // Clear cache for testing - [[SDImageCache sharedImageCache] clearDisk]; + [[SDImageCache sharedImageCache] clearDiskOnCompletion:nil]; [[SDImageCache sharedImageCache] clearMemory]; _segmentedControl = [[UISegmentedControl alloc] initWithItems:[NSArray arrayWithObjects:@"Push", @"Modal", nil]]; diff --git a/Example/Podfile b/Example/Podfile index b67576b04..8dd886b9e 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,10 +1,10 @@ source 'https://github.com/CocoaPods/Specs.git' -target 'MWPhotoBrowser_Example', :exclusive => true do +target 'MWPhotoBrowser_Example' do pod "MWPhotoBrowser", :path => "../" end -target 'MWPhotoBrowser_Tests', :exclusive => true do +target 'MWPhotoBrowser_Tests' do pod "MWPhotoBrowser", :path => "../" pod 'Specta' diff --git a/Example/Podfile.lock b/Example/Podfile.lock index b2e52edfd..5368edf40 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -5,14 +5,14 @@ PODS: - Expecta (~> 1.0) - FBSnapshotTestCase (~> 1.8) - FBSnapshotTestCase (1.8.1) - - MBProgressHUD (0.9.2) + - MBProgressHUD (1.0.0) - MWPhotoBrowser (2.1.2): - - DACircularProgress (~> 2.3) - - MBProgressHUD (~> 0.9) - - SDWebImage (!= 3.7.2, ~> 3.7) - - SDWebImage (3.7.5): - - SDWebImage/Core (= 3.7.5) - - SDWebImage/Core (3.7.5) + - DACircularProgress (~> 2.3.1) + - MBProgressHUD (~> 1.0.0) + - SDWebImage (~> 4.0.0) + - SDWebImage (4.0.0): + - SDWebImage/Core (= 4.0.0) + - SDWebImage/Core (4.0.0) - Specta (1.0.2) DEPENDENCIES: @@ -31,9 +31,11 @@ SPEC CHECKSUMS: Expecta: 32604574add2c46a36f8d2f716b6c5736eb75024 Expecta+Snapshots: ca15bfb57e7a0f78f86c7699c2c54ffacfa4ad2a FBSnapshotTestCase: 3dc3899168747a0319c5278f5b3445c13a6532dd - MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1 - MWPhotoBrowser: 5836d7aa041dc05a13de380c246826578adc5ea5 - SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461 + MBProgressHUD: 4890f671c94e8a0f3cf959aa731e9de2f036d71a + MWPhotoBrowser: 07ef0151444d6bbc6d49e8239f9cdef13580bcf7 + SDWebImage: 76a6348bdc74eb5a55dd08a091ef298e56b55e41 Specta: 9cec98310dca411f7c7ffd6943552b501622abfe -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: f0528201d484bd48f65798bc253cd3bf45d69fcd + +COCOAPODS: 1.0.1 diff --git a/Example/Pods/Expecta+Snapshots/EXPMatchers+FBSnapshotTest.h b/Example/Pods/Expecta+Snapshots/EXPMatchers+FBSnapshotTest.h index 37466e4d2..547e1f62a 100644 --- a/Example/Pods/Expecta+Snapshots/EXPMatchers+FBSnapshotTest.h +++ b/Example/Pods/Expecta+Snapshots/EXPMatchers+FBSnapshotTest.h @@ -7,6 +7,7 @@ // #import +#import "ExpectaObject+FBSnapshotTest.h" @interface EXPExpectFBSnapshotTest : NSObject @end diff --git a/Example/Pods/Expecta+Snapshots/EXPMatchers+FBSnapshotTest.m b/Example/Pods/Expecta+Snapshots/EXPMatchers+FBSnapshotTest.m index 230d448fa..8ca877f34 100644 --- a/Example/Pods/Expecta+Snapshots/EXPMatchers+FBSnapshotTest.m +++ b/Example/Pods/Expecta+Snapshots/EXPMatchers+FBSnapshotTest.m @@ -32,6 +32,7 @@ + (BOOL)compareSnapshotOfViewOrLayer:(id)viewOrLayer snapshot:(NSString *)snapsh FBSnapshotTestController *snapshotController = [[FBSnapshotTestController alloc] initWithTestClass:[testCase class]]; snapshotController.recordMode = record; snapshotController.referenceImagesDirectory = referenceDirectory; + snapshotController.usesDrawViewHierarchyInRect = [Expecta usesDrawViewHierarchyInRect]; if (! snapshotController.referenceImagesDirectory) { [NSException raise:@"Missing value for referenceImagesDirectory" format:@"Call [[EXPExpectFBSnapshotTest instance] setReferenceImagesDirectory"]; @@ -40,6 +41,7 @@ + (BOOL)compareSnapshotOfViewOrLayer:(id)viewOrLayer snapshot:(NSString *)snapsh return [snapshotController compareSnapshotOfViewOrLayer:viewOrLayer selector:NSSelectorFromString(snapshot) identifier:nil + tolerance:0 error:error]; } diff --git a/Example/Pods/Expecta+Snapshots/README.md b/Example/Pods/Expecta+Snapshots/README.md index ada0015a7..07c526594 100644 --- a/Example/Pods/Expecta+Snapshots/README.md +++ b/Example/Pods/Expecta+Snapshots/README.md @@ -19,6 +19,8 @@ Use `expect(view).to.recordSnapshotNamed(@"unique snapshot name")` to record a s If you project was compiled with Specta included, you have two extra methods that use the spec hierarchy to generate the snapshot name for you: `recordSnapshot()` and `haveValidSnapshot()`. You should only call these once per `it()` block. +If you need the `usesDrawViewHierarchyInRect` property in order to correctly render UIVisualEffect, UIAppearance and Size Classes, call `[Expecta setUsesDrawViewHierarchyInRect:NO];` inside `beforeAll`. + ``` Objective-C #define EXP_SHORTHAND #include diff --git a/Example/Pods/Expecta/Expecta/EXPDoubleTuple.m b/Example/Pods/Expecta/Expecta/EXPDoubleTuple.m index 829e35422..9ebef5000 100644 --- a/Example/Pods/Expecta/Expecta/EXPDoubleTuple.m +++ b/Example/Pods/Expecta/Expecta/EXPDoubleTuple.m @@ -1,6 +1,9 @@ #import "EXPDoubleTuple.h" +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" @implementation EXPDoubleTuple +#pragma clang diagnostic pop @synthesize values = _values, size = _size; diff --git a/Example/Pods/Expecta/Expecta/EXPExpect.m b/Example/Pods/Expecta/Expecta/EXPExpect.m index 729794d69..230e137f1 100644 --- a/Example/Pods/Expecta/Expecta/EXPExpect.m +++ b/Example/Pods/Expecta/Expecta/EXPExpect.m @@ -6,7 +6,10 @@ #import "EXPBlockDefinedMatcher.h" #import +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" @implementation EXPExpect +#pragma clang diagnostic pop @dynamic actual, @@ -42,6 +45,7 @@ - (instancetype)initWithActualBlock:(id)actualBlock testCase:(id)testCase lineNu - (void)dealloc { + [_actualBlock release]; _actualBlock = nil; [super dealloc]; } @@ -176,7 +180,10 @@ - (void)forwardInvocation:(NSInvocation *)anInvocation @end +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" @implementation EXPDynamicPredicateMatcher +#pragma clang diagnostic pop - (instancetype)initWithExpectation:(EXPExpect *)expectation selector:(SEL)selector { diff --git a/Example/Pods/Expecta/Expecta/EXPFloatTuple.m b/Example/Pods/Expecta/Expecta/EXPFloatTuple.m index 8e8505bca..b7ccf0856 100644 --- a/Example/Pods/Expecta/Expecta/EXPFloatTuple.m +++ b/Example/Pods/Expecta/Expecta/EXPFloatTuple.m @@ -1,6 +1,9 @@ #import "EXPFloatTuple.h" +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" @implementation EXPFloatTuple +#pragma clang diagnostic pop @synthesize values = _values, size = _size; diff --git a/Example/Pods/Expecta/Expecta/EXPUnsupportedObject.m b/Example/Pods/Expecta/Expecta/EXPUnsupportedObject.m index 4312beff1..3d062e3ea 100644 --- a/Example/Pods/Expecta/Expecta/EXPUnsupportedObject.m +++ b/Example/Pods/Expecta/Expecta/EXPUnsupportedObject.m @@ -1,6 +1,9 @@ #import "EXPUnsupportedObject.h" +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" @implementation EXPUnsupportedObject +#pragma clang diagnostic pop @synthesize type=_type; diff --git a/Example/Pods/Expecta/Expecta/Expecta.h b/Example/Pods/Expecta/Expecta/Expecta.h index 6e5188e62..066e98837 100644 --- a/Example/Pods/Expecta/Expecta/Expecta.h +++ b/Example/Pods/Expecta/Expecta/Expecta.h @@ -12,4 +12,4 @@ FOUNDATION_EXPORT const unsigned char ExpectaVersionString[]; // Enable shorthand by default #define expect(...) EXP_expect((__VA_ARGS__)) -#define failure(...) EXP_failure((__VA_ARGS__)) \ No newline at end of file +#define failure(...) EXP_failure((__VA_ARGS__)) diff --git a/Example/Pods/Expecta/Expecta/ExpectaObject.h b/Example/Pods/Expecta/Expecta/ExpectaObject.h index ef2a38aaf..e4277a9ae 100644 --- a/Example/Pods/Expecta/Expecta/ExpectaObject.h +++ b/Example/Pods/Expecta/Expecta/ExpectaObject.h @@ -1,7 +1,7 @@ #import #define EXPObjectify(value) _EXPObjectify(@encode(__typeof__((value))), (value)) -#define EXP_expect(actual) _EXP_expect(self, __LINE__, __FILE__, ^id{ return EXPObjectify((actual)); }) +#define EXP_expect(actual) _EXP_expect(self, __LINE__, __FILE__, ^id{ __typeof__((actual)) strongActual = (actual); return EXPObjectify(strongActual); }) #define EXPMatcherInterface(matcherName, matcherArguments) _EXPMatcherInterface(matcherName, matcherArguments) #define EXPMatcherImplementationBegin(matcherName, matcherArguments) _EXPMatcherImplementationBegin(matcherName, matcherArguments) #define EXPMatcherImplementationEnd _EXPMatcherImplementationEnd diff --git a/Example/Pods/Expecta/Expecta/ExpectaSupport.h b/Example/Pods/Expecta/Expecta/ExpectaSupport.h index fb0ef4f46..28fc5e0e4 100644 --- a/Example/Pods/Expecta/Expecta/ExpectaSupport.h +++ b/Example/Pods/Expecta/Expecta/ExpectaSupport.h @@ -53,6 +53,7 @@ EXPFixCategoriesBug(EXPMatcher##matcherName##Matcher); \ #define _EXPMatcherImplementationEnd \ } \ [self applyMatcher:matcher to:&actual]; \ + [[[NSThread currentThread] threadDictionary] removeObjectForKey:@"EXP_currentMatcher"]; \ } copy]; \ _EXP_release(matcher); \ return _EXP_autorelease(matcherBlock); \ diff --git a/Example/Pods/Expecta/Expecta/Matchers/EXPMatchers+equal.m b/Example/Pods/Expecta/Expecta/Matchers/EXPMatchers+equal.m index a610df029..0dc4d33d5 100644 --- a/Example/Pods/Expecta/Expecta/Matchers/EXPMatchers+equal.m +++ b/Example/Pods/Expecta/Expecta/Matchers/EXPMatchers+equal.m @@ -21,7 +21,14 @@ }); failureMessageForTo(^NSString *{ - return [NSString stringWithFormat:@"expected: %@, got: %@", EXPDescribeObject(expected), EXPDescribeObject(actual)]; + NSString *expectedDescription = EXPDescribeObject(expected); + NSString *actualDescription = EXPDescribeObject(actual); + + if (![expectedDescription isEqualToString:actualDescription]) { + return [NSString stringWithFormat:@"expected: %@, got: %@", EXPDescribeObject(expected), EXPDescribeObject(actual)]; + } else { + return [NSString stringWithFormat:@"expected (%@): %@, got (%@): %@", NSStringFromClass([expected class]), EXPDescribeObject(expected), NSStringFromClass([actual class]), EXPDescribeObject(actual)]; + } }); failureMessageForNotTo(^NSString *{ diff --git a/Example/Pods/Expecta/README.md b/Example/Pods/Expecta/README.md index c3eb64862..193370750 100644 --- a/Example/Pods/Expecta/README.md +++ b/Example/Pods/Expecta/README.md @@ -21,7 +21,7 @@ expect(baz).to.equal(3.14159); Expecta is framework-agnostic: it works well with XCTest and XCTest-compatible test frameworks such as [Specta](http://github.com/petejkim/specta/). -## Setup +## Installation You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [CocoaPods](http://github.com/CocoaPods/CocoaPods) or [completely manually](#setting-up-manually). @@ -46,10 +46,10 @@ You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [C end target :MyAppTests do - pod 'Expecta', '~> 0.2.4' + pod 'Expecta', '~> 1.0.0' end ``` - + 2. Run `pod update` or `pod install` in your project directory. ### Setting Up Manually @@ -60,17 +60,17 @@ You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [C 4. For **OS X projects**, copy and add `Expecta.framework` in the `Products/osx` folder to your project's test target. For **iOS projects**, copy and add `Expecta.framework` in the `Products/ios` folder to your project's test target. - + You can also use `libExpecta.a` if you prefer to link Expecta as a static library — iOS 7.x and below require this. - + 6. Add `-ObjC` and `-all_load` to the **Other Linker Flags** build setting for the test target in your Xcode project. 7. You can now use Expecta in your test classes by adding the following import: ```objective-c @import Expecta; // If you're using Expecta.framework - + // OR - + #import // If you're using the static library, or the framework ``` diff --git a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Compare.h b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Compare.h similarity index 95% rename from Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Compare.h rename to Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Compare.h index 11c6fa638..9091d62a2 100644 --- a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Compare.h +++ b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Compare.h @@ -32,6 +32,6 @@ @interface UIImage (Compare) -- (BOOL)compareWithImage:(UIImage *)image; +- (BOOL)fb_compareWithImage:(UIImage *)image tolerance:(CGFloat)tolerance; @end diff --git a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Compare.m b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Compare.m similarity index 61% rename from Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Compare.m rename to Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Compare.m index 2b26e029d..c997f578b 100644 --- a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Compare.m +++ b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Compare.m @@ -28,17 +28,32 @@ // OTHER DEALINGS IN THE SOFTWARE. // -#import "UIImage+Compare.h" +#import + +// This makes debugging much more fun +typedef union { + uint32_t raw; + unsigned char bytes[4]; + struct { + char red; + char green; + char blue; + char alpha; + } __attribute__ ((packed)) pixels; +} FBComparePixel; @implementation UIImage (Compare) -- (BOOL)compareWithImage:(UIImage *)image +- (BOOL)fb_compareWithImage:(UIImage *)image tolerance:(CGFloat)tolerance { NSAssert(CGSizeEqualToSize(self.size, image.size), @"Images must be same size."); + + CGSize referenceImageSize = CGSizeMake(CGImageGetWidth(self.CGImage), CGImageGetHeight(self.CGImage)); + CGSize imageSize = CGSizeMake(CGImageGetWidth(image.CGImage), CGImageGetHeight(image.CGImage)); // The images have the equal size, so we could use the smallest amount of bytes because of byte padding size_t minBytesPerRow = MIN(CGImageGetBytesPerRow(self.CGImage), CGImageGetBytesPerRow(image.CGImage)); - size_t referenceImageSizeBytes = CGImageGetHeight(self.CGImage) * minBytesPerRow; + size_t referenceImageSizeBytes = referenceImageSize.height * minBytesPerRow; void *referenceImagePixels = calloc(1, referenceImageSizeBytes); void *imagePixels = calloc(1, referenceImageSizeBytes); @@ -47,28 +62,24 @@ - (BOOL)compareWithImage:(UIImage *)image free(imagePixels); return NO; } - + CGContextRef referenceImageContext = CGBitmapContextCreate(referenceImagePixels, - CGImageGetWidth(self.CGImage), - CGImageGetHeight(self.CGImage), + referenceImageSize.width, + referenceImageSize.height, CGImageGetBitsPerComponent(self.CGImage), minBytesPerRow, CGImageGetColorSpace(self.CGImage), (CGBitmapInfo)kCGImageAlphaPremultipliedLast ); CGContextRef imageContext = CGBitmapContextCreate(imagePixels, - CGImageGetWidth(image.CGImage), - CGImageGetHeight(image.CGImage), + imageSize.width, + imageSize.height, CGImageGetBitsPerComponent(image.CGImage), minBytesPerRow, CGImageGetColorSpace(image.CGImage), (CGBitmapInfo)kCGImageAlphaPremultipliedLast ); - - CGFloat scaleFactor = [[UIScreen mainScreen] scale]; - CGContextScaleCTM(referenceImageContext, scaleFactor, scaleFactor); - CGContextScaleCTM(imageContext, scaleFactor, scaleFactor); - + if (!referenceImageContext || !imageContext) { CGContextRelease(referenceImageContext); CGContextRelease(imageContext); @@ -76,15 +87,47 @@ - (BOOL)compareWithImage:(UIImage *)image free(imagePixels); return NO; } - - CGContextDrawImage(referenceImageContext, CGRectMake(0, 0, self.size.width, self.size.height), self.CGImage); - CGContextDrawImage(imageContext, CGRectMake(0, 0, image.size.width, image.size.height), image.CGImage); + + CGContextDrawImage(referenceImageContext, CGRectMake(0, 0, referenceImageSize.width, referenceImageSize.height), self.CGImage); + CGContextDrawImage(imageContext, CGRectMake(0, 0, imageSize.width, imageSize.height), image.CGImage); + CGContextRelease(referenceImageContext); CGContextRelease(imageContext); - - BOOL imageEqual = (memcmp(referenceImagePixels, imagePixels, referenceImageSizeBytes) == 0); + + BOOL imageEqual = YES; + + // Do a fast compare if we can + if (tolerance == 0) { + imageEqual = (memcmp(referenceImagePixels, imagePixels, referenceImageSizeBytes) == 0); + } else { + // Go through each pixel in turn and see if it is different + const NSInteger pixelCount = referenceImageSize.width * referenceImageSize.height; + + FBComparePixel *p1 = referenceImagePixels; + FBComparePixel *p2 = imagePixels; + + NSInteger numDiffPixels = 0; + for (int n = 0; n < pixelCount; ++n) { + // If this pixel is different, increment the pixel diff count and see + // if we have hit our limit. + if (p1->raw != p2->raw) { + numDiffPixels ++; + + CGFloat percent = (CGFloat)numDiffPixels / pixelCount; + if (percent > tolerance) { + imageEqual = NO; + break; + } + } + + p1++; + p2++; + } + } + free(referenceImagePixels); free(imagePixels); + return imageEqual; } diff --git a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Diff.h b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Diff.h similarity index 96% rename from Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Diff.h rename to Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Diff.h index 35595843f..a0863f303 100644 --- a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Diff.h +++ b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Diff.h @@ -32,6 +32,6 @@ @interface UIImage (Diff) -- (UIImage *)diffWithImage:(UIImage *)image; +- (UIImage *)fb_diffWithImage:(UIImage *)image; @end diff --git a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Diff.m b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Diff.m similarity index 96% rename from Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Diff.m rename to Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Diff.m index cb3dae53a..ebb72fe3d 100644 --- a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Diff.m +++ b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Diff.m @@ -28,11 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // -#import "UIImage+Diff.h" +#import @implementation UIImage (Diff) -- (UIImage *)diffWithImage:(UIImage *)image +- (UIImage *)fb_diffWithImage:(UIImage *)image { if (!image) { return nil; diff --git a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Snapshot.h b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Snapshot.h new file mode 100644 index 000000000..b0d5b26b2 --- /dev/null +++ b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Snapshot.h @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2015, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + */ + +#import + +@interface UIImage (Snapshot) + +/// Uses renderInContext: to get a snapshot of the layer. ++ (UIImage *)fb_imageForLayer:(CALayer *)layer; + +/// Uses renderInContext: to get a snapshot of the view layer. ++ (UIImage *)fb_imageForViewLayer:(UIView *)view; + +/// Uses drawViewHierarchyInRect: to get a snapshot of the view and adds the view into a window if needed. ++ (UIImage *)fb_imageForView:(UIView *)view; + +@end diff --git a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Snapshot.m b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Snapshot.m new file mode 100644 index 000000000..c79207742 --- /dev/null +++ b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Snapshot.m @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2015, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + */ + +#import + +@implementation UIImage (Snapshot) + ++ (UIImage *)fb_imageForLayer:(CALayer *)layer +{ + CGRect bounds = layer.bounds; + NSAssert1(CGRectGetWidth(bounds), @"Zero width for layer %@", layer); + NSAssert1(CGRectGetHeight(bounds), @"Zero height for layer %@", layer); + + UIGraphicsBeginImageContextWithOptions(bounds.size, NO, 0); + CGContextRef context = UIGraphicsGetCurrentContext(); + NSAssert1(context, @"Could not generate context for layer %@", layer); + CGContextSaveGState(context); + [layer layoutIfNeeded]; + [layer renderInContext:context]; + CGContextRestoreGState(context); + + UIImage *snapshot = UIGraphicsGetImageFromCurrentImageContext(); + UIGraphicsEndImageContext(); + return snapshot; +} + ++ (UIImage *)fb_imageForViewLayer:(UIView *)view +{ + [view layoutIfNeeded]; + return [self fb_imageForLayer:view.layer]; +} + ++ (UIImage *)fb_imageForView:(UIView *)view +{ + CGRect bounds = view.bounds; + NSAssert1(CGRectGetWidth(bounds), @"Zero width for view %@", view); + NSAssert1(CGRectGetHeight(bounds), @"Zero height for view %@", view); + + UIWindow *window = view.window; + if (window == nil) { + window = [[UIWindow alloc] initWithFrame:bounds]; + [window addSubview:view]; + [window makeKeyAndVisible]; + } + + UIGraphicsBeginImageContextWithOptions(bounds.size, NO, 0); + [view layoutIfNeeded]; + [view drawViewHierarchyInRect:view.bounds afterScreenUpdates:YES]; + + UIImage *snapshot = UIGraphicsGetImageFromCurrentImageContext(); + UIGraphicsEndImageContext(); + return snapshot; +} + +@end diff --git a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCase.h b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCase.h index 9fd2e54af..54e301e50 100644 --- a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCase.h +++ b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCase.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Facebook, Inc. + * Copyright (c) 2015, Facebook, Inc. * All rights reserved. * * This source code is licensed under the BSD-style license found in the @@ -16,8 +16,19 @@ #import +/* + There are three ways of setting reference image directories. + + 1. Set the preprocessor macro FB_REFERENCE_IMAGE_DIR to a double quoted + c-string with the path. + 2. Set an environment variable named FB_REFERENCE_IMAGE_DIR with the path. This + takes precedence over the preprocessor macro to allow for run-time override. + 3. Keep everything unset, which will cause the reference images to be looked up + inside the bundle holding the current test, in the + Resources/ReferenceImages_* directories. + */ #ifndef FB_REFERENCE_IMAGE_DIR -#define FB_REFERENCE_IMAGE_DIR "\"$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/ReferenceImages\"" +#define FB_REFERENCE_IMAGE_DIR "" #endif /** @@ -25,57 +36,81 @@ @param view The view to snapshot @param identifier An optional identifier, used if there are multiple snapshot tests in a given -test method. @param suffixes An NSOrderedSet of strings for the different suffixes + @param tolerance The percentage of pixels that can differ and still count as an 'identical' view */ -#define FBSnapshotVerifyViewWithOptions(view__, identifier__, suffixes__) \ -{ \ -NSError *error__ = nil; \ -BOOL comparisonSuccess__; \ -XCTAssertTrue((suffixes__.count > 0), @"Suffixes set cannot be empty %@", suffixes__); \ -for (NSString *suffix__ in suffixes__) { \ -NSString *referenceImagesDirectory__ = [NSString stringWithFormat:@"%s%@", FB_REFERENCE_IMAGE_DIR, suffix__]; \ -comparisonSuccess__ = [self compareSnapshotOfView:(view__) referenceImagesDirectory:referenceImagesDirectory__ identifier:(identifier__) error:&error__]; \ -if (comparisonSuccess__ || self.recordMode) break; \ -} \ -XCTAssertTrue(comparisonSuccess__, @"Snapshot comparison failed: %@", error__); \ -XCTAssertFalse(self.recordMode, @"Test ran in record mode. Reference image is now saved. Disable record mode to perform an actual snapshot comparison!"); \ -} +#define FBSnapshotVerifyViewWithOptions(view__, identifier__, suffixes__, tolerance__) \ + FBSnapshotVerifyViewOrLayerWithOptions(View, view__, identifier__, suffixes__, tolerance__) #define FBSnapshotVerifyView(view__, identifier__) \ -{ \ -FBSnapshotVerifyViewWithOptions(view__, identifier__, FBSnapshotTestCaseDefaultSuffixes()); \ -} + FBSnapshotVerifyViewWithOptions(view__, identifier__, FBSnapshotTestCaseDefaultSuffixes(), 0) + /** Similar to our much-loved XCTAssert() macros. Use this to perform your test. No need to write an explanation, though. @param layer The layer to snapshot @param identifier An optional identifier, used is there are multiple snapshot tests in a given -test method. @param suffixes An NSOrderedSet of strings for the different suffixes + @param tolerance The percentage of pixels that can differ and still count as an 'identical' layer */ -#define FBSnapshotVerifyLayerWithOptions(layer__, identifier__, suffixes__) \ -{ \ -NSError *error__ = nil; \ -BOOL comparisonSuccess__; \ -XCTAssertTrue((suffixes__.count > 0), @"Suffixes set cannot be empty %@", suffixes__); \ -for (NSString *suffix__ in suffixes__) { \ -NSString *referenceImagesDirectory__ = [NSString stringWithFormat:@"%s%@", FB_REFERENCE_IMAGE_DIR, suffix__]; \ -comparisonSuccess__ = [self compareSnapshotOfLayer:(layer__) referenceImagesDirectory:referenceImagesDirectory__ identifier:(identifier__) error:&error__]; \ -if (comparisonSuccess__ || self.recordMode) break; \ -} \ -XCTAssertTrue(comparisonSuccess__, @"Snapshot comparison failed: %@", error__); \ -XCTAssertFalse(self.recordMode, @"Test ran in record mode. Reference image is now saved. Disable record mode to perform an actual snapshot comparison!"); \ -} +#define FBSnapshotVerifyLayerWithOptions(layer__, identifier__, suffixes__, tolerance__) \ + FBSnapshotVerifyViewOrLayerWithOptions(Layer, layer__, identifier__, suffixes__, tolerance__) #define FBSnapshotVerifyLayer(layer__, identifier__) \ + FBSnapshotVerifyLayerWithOptions(layer__, identifier__, FBSnapshotTestCaseDefaultSuffixes(), 0) + + +#define FBSnapshotVerifyViewOrLayerWithOptions(what__, viewOrLayer__, identifier__, suffixes__, tolerance__) \ { \ -FBSnapshotVerifyLayerWithOptions(layer__, identifier__, FBSnapshotTestCaseDefaultSuffixes()); \ + NSString *referenceImageDirectory = [self getReferenceImageDirectoryWithDefault:(@ FB_REFERENCE_IMAGE_DIR)]; \ + XCTAssertNotNil(referenceImageDirectory, @"Missing value for referenceImagesDirectory - Set FB_REFERENCE_IMAGE_DIR as Environment variable in your scheme.");\ + XCTAssertTrue((suffixes__.count > 0), @"Suffixes set cannot be empty %@", suffixes__); \ + \ + BOOL testSuccess__ = NO; \ + NSError *error__ = nil; \ + NSMutableArray *errors__ = [NSMutableArray array]; \ + \ + if (self.recordMode) { \ + \ + NSString *referenceImagesDirectory__ = [NSString stringWithFormat:@"%@%@", referenceImageDirectory, suffixes__.firstObject]; \ + BOOL referenceImageSaved__ = [self compareSnapshotOf ## what__ :(viewOrLayer__) referenceImagesDirectory:referenceImagesDirectory__ identifier:(identifier__) tolerance:(tolerance__) error:&error__]; \ + if (!referenceImageSaved__) { \ + [errors__ addObject:error__]; \ + } \ + } else { \ + \ + for (NSString *suffix__ in suffixes__) { \ + NSString *referenceImagesDirectory__ = [NSString stringWithFormat:@"%@%@", referenceImageDirectory, suffix__]; \ + BOOL referenceImageAvailable = [self referenceImageRecordedInDirectory:referenceImagesDirectory__ identifier:(identifier__) error:&error__]; \ + \ + if (referenceImageAvailable) { \ + BOOL comparisonSuccess__ = [self compareSnapshotOf ## what__ :(viewOrLayer__) referenceImagesDirectory:referenceImagesDirectory__ identifier:(identifier__) tolerance:(tolerance__) error:&error__]; \ + [errors__ removeAllObjects]; \ + if (comparisonSuccess__) { \ + testSuccess__ = YES; \ + break; \ + } else { \ + [errors__ addObject:error__]; \ + } \ + } else { \ + [errors__ addObject:error__]; \ + } \ + } \ + } \ + XCTAssertTrue(testSuccess__, @"Snapshot comparison failed: %@", errors__.firstObject); \ + XCTAssertFalse(self.recordMode, @"Test ran in record mode. Reference image is now saved. Disable record mode to perform an actual snapshot comparison!"); \ } + /** The base class of view snapshotting tests. If you have small UI component, it's often easier to configure it in a test and compare an image of the view to a reference image that write lots of complex layout-code tests. In order to flip the tests in your subclass to record the reference images set @c recordMode to @c YES. + @attention When recording, the reference image directory should be explicitly + set, otherwise the images may be written to somewhere inside the + simulator directory. + For example: @code - (void)setUp @@ -92,17 +127,39 @@ FBSnapshotVerifyLayerWithOptions(layer__, identifier__, FBSnapshotTestCaseDefaul */ @property (readwrite, nonatomic, assign) BOOL recordMode; +/** + When @c YES appends the name of the device model and OS to the snapshot file name. + The default value is @c NO. + */ +@property (readwrite, nonatomic, assign, getter=isDeviceAgnostic) BOOL deviceAgnostic; + +/** + When YES, renders a snapshot of the complete view hierarchy as visible onscreen. + There are several things that do not work if renderInContext: is used. + - UIVisualEffect #70 + - UIAppearance #91 + - Size Classes #92 + + @attention If the view does't belong to a UIWindow, it will create one and add the view as a subview. + */ +@property (readwrite, nonatomic, assign) BOOL usesDrawViewHierarchyInRect; + +- (void)setUp NS_REQUIRES_SUPER; +- (void)tearDown NS_REQUIRES_SUPER; + /** Performs the comparison or records a snapshot of the layer if recordMode is YES. @param layer The Layer to snapshot @param referenceImagesDirectory The directory in which reference images are stored. @param identifier An optional identifier, used if there are multiple snapshot tests in a given -test method. + @param tolerance The percentage difference to still count as identical - 0 mean pixel perfect, 1 means I don't care @param errorPtr An error to log in an XCTAssert() macro if the method fails (missing reference image, images differ, etc). @returns YES if the comparison (or saving of the reference image) succeeded. */ - (BOOL)compareSnapshotOfLayer:(CALayer *)layer referenceImagesDirectory:(NSString *)referenceImagesDirectory identifier:(NSString *)identifier + tolerance:(CGFloat)tolerance error:(NSError **)errorPtr; /** @@ -110,12 +167,34 @@ FBSnapshotVerifyLayerWithOptions(layer__, identifier__, FBSnapshotTestCaseDefaul @param view The view to snapshot @param referenceImagesDirectory The directory in which reference images are stored. @param identifier An optional identifier, used if there are multiple snapshot tests in a given -test method. + @param tolerance The percentage difference to still count as identical - 0 mean pixel perfect, 1 means I don't care @param errorPtr An error to log in an XCTAssert() macro if the method fails (missing reference image, images differ, etc). @returns YES if the comparison (or saving of the reference image) succeeded. */ - (BOOL)compareSnapshotOfView:(UIView *)view referenceImagesDirectory:(NSString *)referenceImagesDirectory identifier:(NSString *)identifier + tolerance:(CGFloat)tolerance error:(NSError **)errorPtr; +/** + Checks if reference image with identifier based name exists in the reference images directory. + @param referenceImagesDirectory The directory in which reference images are stored. + @param identifier An optional identifier, used if there are multiple snapshot tests in a given -test method. + @param errorPtr An error to log in an XCTAssert() macro if the method fails (missing reference image, images differ, etc). + @returns YES if reference image exists. + */ +- (BOOL)referenceImageRecordedInDirectory:(NSString *)referenceImagesDirectory + identifier:(NSString *)identifier + error:(NSError **)errorPtr; + +/** + Returns the reference image directory. + + Helper function used to implement the assert macros. + + @param dir directory to use if environment variable not specified. Ignored if null or empty. + */ +- (NSString *)getReferenceImageDirectoryWithDefault:(NSString *)dir; + @end diff --git a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCase.m b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCase.m index 4e840ce98..3ee351f4b 100644 --- a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCase.m +++ b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCase.m @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Facebook, Inc. + * Copyright (c) 2015, Facebook, Inc. * All rights reserved. * * This source code is licensed under the BSD-style license found in the @@ -8,15 +8,16 @@ * */ -#import "FBSnapshotTestCase.h" - -#import "FBSnapshotTestController.h" +#import +#import @implementation FBSnapshotTestCase { FBSnapshotTestController *_snapshotController; } +#pragma mark - Overrides + - (void)setUp { [super setUp]; @@ -40,40 +41,95 @@ - (void)setRecordMode:(BOOL)recordMode _snapshotController.recordMode = recordMode; } +- (BOOL)isDeviceAgnostic +{ + return _snapshotController.deviceAgnostic; +} + +- (void)setDeviceAgnostic:(BOOL)deviceAgnostic +{ + NSAssert1(_snapshotController, @"%s cannot be called before [super setUp]", __FUNCTION__); + _snapshotController.deviceAgnostic = deviceAgnostic; +} + +- (BOOL)usesDrawViewHierarchyInRect +{ + return _snapshotController.usesDrawViewHierarchyInRect; +} + +- (void)setUsesDrawViewHierarchyInRect:(BOOL)usesDrawViewHierarchyInRect +{ + NSAssert1(_snapshotController, @"%s cannot be called before [super setUp]", __FUNCTION__); + _snapshotController.usesDrawViewHierarchyInRect = usesDrawViewHierarchyInRect; +} + +#pragma mark - Public API + - (BOOL)compareSnapshotOfLayer:(CALayer *)layer referenceImagesDirectory:(NSString *)referenceImagesDirectory identifier:(NSString *)identifier + tolerance:(CGFloat)tolerance error:(NSError **)errorPtr { return [self _compareSnapshotOfViewOrLayer:layer referenceImagesDirectory:referenceImagesDirectory identifier:identifier + tolerance:tolerance error:errorPtr]; } - (BOOL)compareSnapshotOfView:(UIView *)view referenceImagesDirectory:(NSString *)referenceImagesDirectory identifier:(NSString *)identifier + tolerance:(CGFloat)tolerance error:(NSError **)errorPtr { return [self _compareSnapshotOfViewOrLayer:view referenceImagesDirectory:referenceImagesDirectory identifier:identifier + tolerance:tolerance error:errorPtr]; } -#pragma mark - -#pragma mark Private API +- (BOOL)referenceImageRecordedInDirectory:(NSString *)referenceImagesDirectory + identifier:(NSString *)identifier + error:(NSError **)errorPtr +{ + NSAssert1(_snapshotController, @"%s cannot be called before [super setUp]", __FUNCTION__); + _snapshotController.referenceImagesDirectory = referenceImagesDirectory; + UIImage *referenceImage = [_snapshotController referenceImageForSelector:self.invocation.selector + identifier:identifier + error:errorPtr]; + + return (referenceImage != nil); +} + +- (NSString *)getReferenceImageDirectoryWithDefault:(NSString *)dir +{ + NSString *envReferenceImageDirectory = [NSProcessInfo processInfo].environment[@"FB_REFERENCE_IMAGE_DIR"]; + if (envReferenceImageDirectory) { + return envReferenceImageDirectory; + } + if (dir && dir.length > 0) { + return dir; + } + return [[NSBundle bundleForClass:self.class].resourcePath stringByAppendingPathComponent:@"ReferenceImages"]; +} + + +#pragma mark - Private API - (BOOL)_compareSnapshotOfViewOrLayer:(id)viewOrLayer referenceImagesDirectory:(NSString *)referenceImagesDirectory identifier:(NSString *)identifier + tolerance:(CGFloat)tolerance error:(NSError **)errorPtr { _snapshotController.referenceImagesDirectory = referenceImagesDirectory; return [_snapshotController compareSnapshotOfViewOrLayer:viewOrLayer selector:self.invocation.selector identifier:identifier + tolerance:tolerance error:errorPtr]; } diff --git a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCasePlatform.h b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCasePlatform.h index 99f648052..e04acf2f3 100644 --- a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCasePlatform.h +++ b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCasePlatform.h @@ -30,6 +30,14 @@ BOOL FBSnapshotTestCaseIs64Bit(void); @returns An @c NSOrderedSet object containing strings that are appended to the reference images directory. */ NSOrderedSet *FBSnapshotTestCaseDefaultSuffixes(void); + +/** + Returns a fully «normalized» file name. + Strips punctuation and spaces and replaces them with @c _. Also appends the device model, running OS and screen size to the file name. + + @returns An @c NSString object containing the passed @c fileName with the device model, OS and screen size appended at the end. + */ +NSString *FBDeviceAgnosticNormalizedFileName(NSString *fileName); #ifdef __cplusplus } diff --git a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCasePlatform.m b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCasePlatform.m index 95746c811..4f6fb01e8 100644 --- a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCasePlatform.m +++ b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestCasePlatform.m @@ -9,6 +9,7 @@ */ #import +#import BOOL FBSnapshotTestCaseIs64Bit(void) { @@ -29,3 +30,20 @@ BOOL FBSnapshotTestCaseIs64Bit(void) } return [suffixesSet copy]; } + +NSString *FBDeviceAgnosticNormalizedFileName(NSString *fileName) +{ + UIDevice *device = [UIDevice currentDevice]; + CGSize screenSize = [[UIApplication sharedApplication] keyWindow].bounds.size; + NSString *os = device.systemVersion; + + fileName = [NSString stringWithFormat:@"%@_%@%@_%.0fx%.0f", fileName, device.model, os, screenSize.width, screenSize.height]; + + NSMutableCharacterSet *invalidCharacters = [NSMutableCharacterSet new]; + [invalidCharacters formUnionWithCharacterSet:[NSCharacterSet whitespaceCharacterSet]]; + [invalidCharacters formUnionWithCharacterSet:[NSCharacterSet punctuationCharacterSet]]; + NSArray *validComponents = [fileName componentsSeparatedByCharactersInSet:invalidCharacters]; + fileName = [validComponents componentsJoinedByString:@"_"]; + + return fileName; +} \ No newline at end of file diff --git a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestController.h b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestController.h index f9b698464..5719abaca 100644 --- a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestController.h +++ b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestController.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Facebook, Inc. + * Copyright (c) 2015, Facebook, Inc. * All rights reserved. * * This source code is licensed under the BSD-style license found in the @@ -37,9 +37,25 @@ extern NSString *const FBReferenceImageFilePathKey; /** Record snapshots. - **/ + */ @property (readwrite, nonatomic, assign) BOOL recordMode; +/** + When @c YES appends the name of the device model and OS to the snapshot file name. + The default value is @c NO. + */ +@property (readwrite, nonatomic, assign, getter=isDeviceAgnostic) BOOL deviceAgnostic; + +/** + Uses drawViewHierarchyInRect:afterScreenUpdates: to draw the image instead of renderInContext: + */ +@property (readwrite, nonatomic, assign) BOOL usesDrawViewHierarchyInRect; + +/** + The directory in which referfence images are stored. + */ +@property (readwrite, nonatomic, copy) NSString *referenceImagesDirectory; + /** @param testClass The subclass of FBSnapshotTestCase that is using this controller. @returns An instance of FBSnapshotTestController. @@ -53,7 +69,6 @@ extern NSString *const FBReferenceImageFilePathKey; */ - (instancetype)initWithTestName:(NSString *)testName; - /** Performs the comparison of the layer. @param layer The Layer to snapshot. @@ -85,20 +100,16 @@ extern NSString *const FBReferenceImageFilePathKey; @param view The view or layer to snapshot. @param selector The test method being run. @param identifier An optional identifier, used is there are muliptle snapshot tests in a given -test method. + @param tolerance The percentage of pixels that can differ and still be considered 'identical' @param error An error to log in an XCTAssert() macro if the method fails (missing reference image, images differ, etc). @returns YES if the comparison (or saving of the reference image) succeeded. */ - (BOOL)compareSnapshotOfViewOrLayer:(id)viewOrLayer selector:(SEL)selector identifier:(NSString *)identifier + tolerance:(CGFloat)tolerance error:(NSError **)errorPtr; - -/** - The directory in which referfence images are stored. - */ -@property (readwrite, nonatomic, copy) NSString *referenceImagesDirectory; - /** Loads a reference image. @param selector The test method being run. @@ -111,26 +122,16 @@ extern NSString *const FBReferenceImageFilePathKey; error:(NSError **)errorPtr; /** - Saves a reference image. - @param selector The test method being run. - @param identifier The optional identifier, used when multiple images are tested in a single -test method. - @param errorPtr An error, if this methods returns NO, the error will be something useful. - @returns An image. - */ -- (BOOL)saveReferenceImage:(UIImage *)image - selector:(SEL)selector - identifier:(NSString *)identifier - error:(NSError **)errorPtr; - -/** - Performs a pixel-by-pixel comparison of the two images. + Performs a pixel-by-pixel comparison of the two images with an allowable margin of error. @param referenceImage The reference (correct) image. @param image The image to test against the reference. + @param tolerance The percentage of pixels that can differ and still be considered 'identical' @param errorPtr An error that indicates why the comparison failed if it does. - @returns YES if the comparison succeeded and the images are the same. + @returns YES if the comparison succeeded and the images are the same(ish). */ - (BOOL)compareReferenceImage:(UIImage *)referenceImage toImage:(UIImage *)image + tolerance:(CGFloat)tolerance error:(NSError **)errorPtr; /** diff --git a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestController.m b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestController.m index 125f15a6f..4cebe104c 100644 --- a/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestController.m +++ b/Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/FBSnapshotTestController.m @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Facebook, Inc. + * Copyright (c) 2015, Facebook, Inc. * All rights reserved. * * This source code is licensed under the BSD-style license found in the @@ -8,25 +8,31 @@ * */ -#import "FBSnapshotTestController.h" - -#import "UIImage+Compare.h" -#import "UIImage+Diff.h" +#import +#import +#import +#import +#import #import NSString *const FBSnapshotTestControllerErrorDomain = @"FBSnapshotTestControllerErrorDomain"; - NSString *const FBReferenceImageFilePathKey = @"FBReferenceImageFilePathKey"; +typedef NS_ENUM(NSUInteger, FBTestSnapshotFileNameType) { + FBTestSnapshotFileNameTypeReference, + FBTestSnapshotFileNameTypeFailedReference, + FBTestSnapshotFileNameTypeFailedTest, + FBTestSnapshotFileNameTypeFailedTestDiff, +}; + @implementation FBSnapshotTestController { NSString *_testName; NSFileManager *_fileManager; } -#pragma mark - -#pragma mark Lifecycle +#pragma mark - Initializers - (instancetype)initWithTestClass:(Class)testClass; { @@ -35,23 +41,60 @@ - (instancetype)initWithTestClass:(Class)testClass; - (instancetype)initWithTestName:(NSString *)testName { - if ((self = [super init])) { + if (self = [super init]) { _testName = [testName copy]; + _deviceAgnostic = NO; + _fileManager = [[NSFileManager alloc] init]; } return self; } -#pragma mark - -#pragma mark Properties +#pragma mark - Overrides - (NSString *)description { return [NSString stringWithFormat:@"%@ %@", [super description], _referenceImagesDirectory]; } -#pragma mark - -#pragma mark Public API +#pragma mark - Public API + +- (BOOL)compareSnapshotOfLayer:(CALayer *)layer + selector:(SEL)selector + identifier:(NSString *)identifier + error:(NSError **)errorPtr +{ + return [self compareSnapshotOfViewOrLayer:layer + selector:selector + identifier:identifier + tolerance:0 + error:errorPtr]; +} + +- (BOOL)compareSnapshotOfView:(UIView *)view + selector:(SEL)selector + identifier:(NSString *)identifier + error:(NSError **)errorPtr +{ + return [self compareSnapshotOfViewOrLayer:view + selector:selector + identifier:identifier + tolerance:0 + error:errorPtr]; +} + +- (BOOL)compareSnapshotOfViewOrLayer:(id)viewOrLayer + selector:(SEL)selector + identifier:(NSString *)identifier + tolerance:(CGFloat)tolerance + error:(NSError **)errorPtr +{ + if (self.recordMode) { + return [self _recordSnapshotOfViewOrLayer:viewOrLayer selector:selector identifier:identifier error:errorPtr]; + } else { + return [self _performPixelComparisonWithViewOrLayer:viewOrLayer selector:selector identifier:identifier tolerance:tolerance error:errorPtr]; + } +} - (UIImage *)referenceImageForSelector:(SEL)selector identifier:(NSString *)identifier @@ -78,42 +121,33 @@ - (UIImage *)referenceImageForSelector:(SEL)selector return image; } -- (BOOL)saveReferenceImage:(UIImage *)image - selector:(SEL)selector - identifier:(NSString *)identifier - error:(NSError **)errorPtr +- (BOOL)compareReferenceImage:(UIImage *)referenceImage + toImage:(UIImage *)image + tolerance:(CGFloat)tolerance + error:(NSError **)errorPtr { - BOOL didWrite = NO; - if (nil != image) { - NSString *filePath = [self _referenceFilePathForSelector:selector identifier:identifier]; - NSData *pngData = UIImagePNGRepresentation(image); - if (nil != pngData) { - NSError *creationError = nil; - BOOL didCreateDir = [_fileManager createDirectoryAtPath:[filePath stringByDeletingLastPathComponent] - withIntermediateDirectories:YES - attributes:nil - error:&creationError]; - if (!didCreateDir) { - if (NULL != errorPtr) { - *errorPtr = creationError; - } - return NO; - } - didWrite = [pngData writeToFile:filePath options:NSDataWritingAtomic error:errorPtr]; - if (didWrite) { - NSLog(@"Reference image save at: %@", filePath); - } - } else { - if (nil != errorPtr) { - *errorPtr = [NSError errorWithDomain:FBSnapshotTestControllerErrorDomain - code:FBSnapshotTestControllerErrorCodePNGCreationFailed - userInfo:@{ - FBReferenceImageFilePathKey: filePath, - }]; - } + if (CGSizeEqualToSize(referenceImage.size, image.size)) { + BOOL imagesEqual = [referenceImage fb_compareWithImage:image tolerance:tolerance]; + if (NULL != errorPtr) { + *errorPtr = [NSError errorWithDomain:FBSnapshotTestControllerErrorDomain + code:FBSnapshotTestControllerErrorCodeImagesDifferent + userInfo:@{ + NSLocalizedDescriptionKey: @"Images different", + }]; } + return imagesEqual; } - return didWrite; + if (NULL != errorPtr) { + *errorPtr = [NSError errorWithDomain:FBSnapshotTestControllerErrorDomain + code:FBSnapshotTestControllerErrorCodeImagesDifferentSizes + userInfo:@{ + NSLocalizedDescriptionKey: @"Images different sizes", + NSLocalizedFailureReasonErrorKey: [NSString stringWithFormat:@"referenceImage:%@, image:%@", + NSStringFromCGSize(referenceImage.size), + NSStringFromCGSize(image.size)], + }]; + } + return NO; } - (BOOL)saveFailedReferenceImage:(UIImage *)referenceImage @@ -157,7 +191,7 @@ - (BOOL)saveFailedReferenceImage:(UIImage *)referenceImage identifier:identifier fileNameType:FBTestSnapshotFileNameTypeFailedTestDiff]; - UIImage *diffImage = [referenceImage diffWithImage:testImage]; + UIImage *diffImage = [referenceImage fb_diffWithImage:testImage]; NSData *diffImageData = UIImagePNGRepresentation(diffImage); if (![diffImageData writeToFile:diffPath options:NSDataWritingAtomic error:errorPtr]) { @@ -170,42 +204,7 @@ - (BOOL)saveFailedReferenceImage:(UIImage *)referenceImage return YES; } -- (BOOL)compareReferenceImage:(UIImage *)referenceImage toImage:(UIImage *)image error:(NSError **)errorPtr -{ - if (CGSizeEqualToSize(referenceImage.size, image.size)) { - - BOOL imagesEqual = [referenceImage compareWithImage:image]; - if (NULL != errorPtr) { - *errorPtr = [NSError errorWithDomain:FBSnapshotTestControllerErrorDomain - code:FBSnapshotTestControllerErrorCodeImagesDifferent - userInfo:@{ - NSLocalizedDescriptionKey: @"Images different", - }]; - } - return imagesEqual; - } - if (NULL != errorPtr) { - *errorPtr = [NSError errorWithDomain:FBSnapshotTestControllerErrorDomain - code:FBSnapshotTestControllerErrorCodeImagesDifferentSizes - userInfo:@{ - NSLocalizedDescriptionKey: @"Images different sizes", - NSLocalizedFailureReasonErrorKey: [NSString stringWithFormat:@"referenceImage:%@, image:%@", - NSStringFromCGSize(referenceImage.size), - NSStringFromCGSize(image.size)], - }]; - } - return NO; -} - -#pragma mark - -#pragma mark Private API - -typedef NS_ENUM(NSUInteger, FBTestSnapshotFileNameType) { - FBTestSnapshotFileNameTypeReference, - FBTestSnapshotFileNameTypeFailedReference, - FBTestSnapshotFileNameTypeFailedTest, - FBTestSnapshotFileNameTypeFailedTestDiff, -}; +#pragma mark - Private API - (NSString *)_fileNameForSelector:(SEL)selector identifier:(NSString *)identifier @@ -230,6 +229,11 @@ - (NSString *)_fileNameForSelector:(SEL)selector if (0 < identifier.length) { fileName = [fileName stringByAppendingFormat:@"_%@", identifier]; } + + if (self.isDeviceAgnostic) { + fileName = FBDeviceAgnosticNormalizedFileName(fileName); + } + if ([[UIScreen mainScreen] scale] > 1) { fileName = [fileName stringByAppendingFormat:@"@%.fx", [[UIScreen mainScreen] scale]]; } @@ -237,7 +241,8 @@ - (NSString *)_fileNameForSelector:(SEL)selector return fileName; } -- (NSString *)_referenceFilePathForSelector:(SEL)selector identifier:(NSString *)identifier +- (NSString *)_referenceFilePathForSelector:(SEL)selector + identifier:(NSString *)identifier { NSString *fileName = [self _fileNameForSelector:selector identifier:identifier @@ -263,52 +268,16 @@ - (NSString *)_failedFilePathForSelector:(SEL)selector return filePath; } -- (BOOL)compareSnapshotOfLayer:(CALayer *)layer - selector:(SEL)selector - identifier:(NSString *)identifier - error:(NSError **)errorPtr -{ - return [self compareSnapshotOfViewOrLayer:layer - selector:selector - identifier:identifier - error:errorPtr]; -} - -- (BOOL)compareSnapshotOfView:(UIView *)view - selector:(SEL)selector - identifier:(NSString *)identifier - error:(NSError **)errorPtr -{ - return [self compareSnapshotOfViewOrLayer:view - selector:selector - identifier:identifier - error:errorPtr]; -} - -- (BOOL)compareSnapshotOfViewOrLayer:(id)viewOrLayer - selector:(SEL)selector - identifier:(NSString *)identifier - error:(NSError **)errorPtr -{ - if (self.recordMode) { - return [self _recordSnapshotOfViewOrLayer:viewOrLayer selector:selector identifier:identifier error:errorPtr]; - } else { - return [self _performPixelComparisonWithViewOrLayer:viewOrLayer selector:selector identifier:identifier error:errorPtr]; - } -} - -#pragma mark - -#pragma mark Private API - -- (BOOL)_performPixelComparisonWithViewOrLayer:(UIView *)viewOrLayer +- (BOOL)_performPixelComparisonWithViewOrLayer:(id)viewOrLayer selector:(SEL)selector identifier:(NSString *)identifier + tolerance:(CGFloat)tolerance error:(NSError **)errorPtr { UIImage *referenceImage = [self referenceImageForSelector:selector identifier:identifier error:errorPtr]; if (nil != referenceImage) { - UIImage *snapshot = [self _snapshotViewOrLayer:viewOrLayer]; - BOOL imagesSame = [self compareReferenceImage:referenceImage toImage:snapshot error:errorPtr]; + UIImage *snapshot = [self _imageForViewOrLayer:viewOrLayer]; + BOOL imagesSame = [self compareReferenceImage:referenceImage toImage:snapshot tolerance:tolerance error:errorPtr]; if (!imagesSame) { [self saveFailedReferenceImage:referenceImage testImage:snapshot @@ -326,53 +295,62 @@ - (BOOL)_recordSnapshotOfViewOrLayer:(id)viewOrLayer identifier:(NSString *)identifier error:(NSError **)errorPtr { - UIImage *snapshot = [self _snapshotViewOrLayer:viewOrLayer]; - return [self saveReferenceImage:snapshot selector:selector identifier:identifier error:errorPtr]; + UIImage *snapshot = [self _imageForViewOrLayer:viewOrLayer]; + return [self _saveReferenceImage:snapshot selector:selector identifier:identifier error:errorPtr]; } -- (UIImage *)_snapshotViewOrLayer:(id)viewOrLayer +- (BOOL)_saveReferenceImage:(UIImage *)image + selector:(SEL)selector + identifier:(NSString *)identifier + error:(NSError **)errorPtr +{ + BOOL didWrite = NO; + if (nil != image) { + NSString *filePath = [self _referenceFilePathForSelector:selector identifier:identifier]; + NSData *pngData = UIImagePNGRepresentation(image); + if (nil != pngData) { + NSError *creationError = nil; + BOOL didCreateDir = [_fileManager createDirectoryAtPath:[filePath stringByDeletingLastPathComponent] + withIntermediateDirectories:YES + attributes:nil + error:&creationError]; + if (!didCreateDir) { + if (NULL != errorPtr) { + *errorPtr = creationError; + } + return NO; + } + didWrite = [pngData writeToFile:filePath options:NSDataWritingAtomic error:errorPtr]; + if (didWrite) { + NSLog(@"Reference image save at: %@", filePath); + } + } else { + if (nil != errorPtr) { + *errorPtr = [NSError errorWithDomain:FBSnapshotTestControllerErrorDomain + code:FBSnapshotTestControllerErrorCodePNGCreationFailed + userInfo:@{ + FBReferenceImageFilePathKey: filePath, + }]; + } + } + } + return didWrite; +} + +- (UIImage *)_imageForViewOrLayer:(id)viewOrLayer { - CALayer *layer = nil; - if ([viewOrLayer isKindOfClass:[UIView class]]) { - return [self _renderView:viewOrLayer]; + if (_usesDrawViewHierarchyInRect) { + return [UIImage fb_imageForView:viewOrLayer]; + } else { + return [UIImage fb_imageForViewLayer:viewOrLayer]; + } } else if ([viewOrLayer isKindOfClass:[CALayer class]]) { - layer = (CALayer *)viewOrLayer; - [layer layoutIfNeeded]; - return [self _renderLayer:layer]; + return [UIImage fb_imageForLayer:viewOrLayer]; } else { [NSException raise:@"Only UIView and CALayer classes can be snapshotted" format:@"%@", viewOrLayer]; } return nil; } -- (UIImage *)_renderLayer:(CALayer *)layer -{ - CGRect bounds = layer.bounds; - - NSAssert1(CGRectGetWidth(bounds), @"Zero width for layer %@", layer); - NSAssert1(CGRectGetHeight(bounds), @"Zero height for layer %@", layer); - - UIGraphicsBeginImageContextWithOptions(bounds.size, NO, 0); - CGContextRef context = UIGraphicsGetCurrentContext(); - NSAssert1(context, @"Could not generate context for layer %@", layer); - - CGContextSaveGState(context); - { - [layer renderInContext:context]; - } - CGContextRestoreGState(context); - - UIImage *snapshot = UIGraphicsGetImageFromCurrentImageContext(); - UIGraphicsEndImageContext(); - - return snapshot; -} - -- (UIImage *)_renderView:(UIView *)view -{ - [view layoutIfNeeded]; - return [self _renderLayer:view.layer]; -} - @end diff --git a/Example/Pods/FBSnapshotTestCase/README.md b/Example/Pods/FBSnapshotTestCase/README.md index 0a7c6256f..bc23b8378 100644 --- a/Example/Pods/FBSnapshotTestCase/README.md +++ b/Example/Pods/FBSnapshotTestCase/README.md @@ -1,7 +1,7 @@ FBSnapshotTestCase ====================== -[![Build Status](https://travis-ci.org/facebook/ios-snapshot-test-case.svg)](https://travis-ci.org/facebook/ios-snapshot-test-case) +[![Build Status](https://travis-ci.org/facebook/ios-snapshot-test-case.svg)](https://travis-ci.org/facebook/ios-snapshot-test-case) [![Cocoa Pod Version](https://cocoapod-badges.herokuapp.com/v/FBSnapshotTestCase/badge.svg)](http://cocoadocs.org/docsets/FBSnapshotTestCase/) What it does ------------ @@ -40,13 +40,18 @@ Installation with CocoaPods end ``` + If you support iOS 7 use `FBSnapshotTestCase/Core` instead, which doesn't contain Swift support. + Replace "Tests" with the name of your test project. -2. Define `FB_REFERENCE_IMAGE_DIR` in `GCC_PREPROCESSOR_DEFINITIONS`. This should - point to the directory where you want reference images to be stored. At Facebook, - we normally use this: +2. There are [three ways](https://github.com/facebook/ios-snapshot-test-case/blob/master/FBSnapshotTestCase/FBSnapshotTestCase.h#L19-L29) of setting reference image directories, the recommended one is to define `FB_REFERENCE_IMAGE_DIR` in your scheme. This should point to the directory where you want reference images to be stored. At Facebook, we normally use this: + +|Name|Value| +|:---|:----| +|`FB_REFERENCE_IMAGE_DIR`|`$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/ReferenceImages`| + - `GCC_PREPROCESSOR_DEFINITIONS = $(inherited) FB_REFERENCE_IMAGE_DIR="\"$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/ReferenceImages\""` +![](FBSnapshotTestCaseDemo/Scheme_FB_REFERENCE_IMAGE_DIR.png) Creating a snapshot test ------------------------ @@ -68,6 +73,8 @@ Features - Supply an optional "identifier" if you want to perform multiple snapshots in a single test method. - Support for `CALayer` via `FBSnapshotVerifyLayer`. +- `usesDrawViewHierarchyInRect` to handle cases like `UIVisualEffect`, `UIAppearance` and Size Classes. +- `isDeviceAgnostic` to allow appending the device model (`iPhone`, `iPad`, `iPod Touch`, etc), OS version and screen size to the images (allowing to have multiple tests for the same «snapshot» for different `OS`s and devices). Notes ----- diff --git a/Example/Pods/Headers/Private/FBSnapshotTestCase/UIImage+Compare.h b/Example/Pods/Headers/Private/FBSnapshotTestCase/UIImage+Compare.h index a68eafb67..2fd266d77 120000 --- a/Example/Pods/Headers/Private/FBSnapshotTestCase/UIImage+Compare.h +++ b/Example/Pods/Headers/Private/FBSnapshotTestCase/UIImage+Compare.h @@ -1 +1 @@ -../../../FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Compare.h \ No newline at end of file +../../../FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Compare.h \ No newline at end of file diff --git a/Example/Pods/Headers/Private/FBSnapshotTestCase/UIImage+Diff.h b/Example/Pods/Headers/Private/FBSnapshotTestCase/UIImage+Diff.h index f21e64d33..2ecee67cc 120000 --- a/Example/Pods/Headers/Private/FBSnapshotTestCase/UIImage+Diff.h +++ b/Example/Pods/Headers/Private/FBSnapshotTestCase/UIImage+Diff.h @@ -1 +1 @@ -../../../FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Diff.h \ No newline at end of file +../../../FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Diff.h \ No newline at end of file diff --git a/Example/Pods/Headers/Private/FBSnapshotTestCase/UIImage+Snapshot.h b/Example/Pods/Headers/Private/FBSnapshotTestCase/UIImage+Snapshot.h new file mode 120000 index 000000000..577a4cb8d --- /dev/null +++ b/Example/Pods/Headers/Private/FBSnapshotTestCase/UIImage+Snapshot.h @@ -0,0 +1 @@ +../../../FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Snapshot.h \ No newline at end of file diff --git a/Example/Pods/Headers/Private/SDWebImage/NSImage+WebCache.h b/Example/Pods/Headers/Private/SDWebImage/NSImage+WebCache.h new file mode 120000 index 000000000..b7a00e1f3 --- /dev/null +++ b/Example/Pods/Headers/Private/SDWebImage/NSImage+WebCache.h @@ -0,0 +1 @@ +../../../SDWebImage/SDWebImage/NSImage+WebCache.h \ No newline at end of file diff --git a/Example/Pods/Headers/Private/SDWebImage/SDImageCacheConfig.h b/Example/Pods/Headers/Private/SDWebImage/SDImageCacheConfig.h new file mode 120000 index 000000000..f0f1f8f38 --- /dev/null +++ b/Example/Pods/Headers/Private/SDWebImage/SDImageCacheConfig.h @@ -0,0 +1 @@ +../../../SDWebImage/SDWebImage/SDImageCacheConfig.h \ No newline at end of file diff --git a/Example/Pods/Headers/Private/SDWebImage/UIView+WebCache.h b/Example/Pods/Headers/Private/SDWebImage/UIView+WebCache.h new file mode 120000 index 000000000..641671a56 --- /dev/null +++ b/Example/Pods/Headers/Private/SDWebImage/UIView+WebCache.h @@ -0,0 +1 @@ +../../../SDWebImage/SDWebImage/UIView+WebCache.h \ No newline at end of file diff --git a/Example/Pods/Headers/Public/FBSnapshotTestCase/UIImage+Compare.h b/Example/Pods/Headers/Public/FBSnapshotTestCase/UIImage+Compare.h index a68eafb67..2fd266d77 120000 --- a/Example/Pods/Headers/Public/FBSnapshotTestCase/UIImage+Compare.h +++ b/Example/Pods/Headers/Public/FBSnapshotTestCase/UIImage+Compare.h @@ -1 +1 @@ -../../../FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Compare.h \ No newline at end of file +../../../FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Compare.h \ No newline at end of file diff --git a/Example/Pods/Headers/Public/FBSnapshotTestCase/UIImage+Diff.h b/Example/Pods/Headers/Public/FBSnapshotTestCase/UIImage+Diff.h index f21e64d33..2ecee67cc 120000 --- a/Example/Pods/Headers/Public/FBSnapshotTestCase/UIImage+Diff.h +++ b/Example/Pods/Headers/Public/FBSnapshotTestCase/UIImage+Diff.h @@ -1 +1 @@ -../../../FBSnapshotTestCase/FBSnapshotTestCase/UIImage+Diff.h \ No newline at end of file +../../../FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Diff.h \ No newline at end of file diff --git a/Example/Pods/Headers/Public/FBSnapshotTestCase/UIImage+Snapshot.h b/Example/Pods/Headers/Public/FBSnapshotTestCase/UIImage+Snapshot.h new file mode 120000 index 000000000..577a4cb8d --- /dev/null +++ b/Example/Pods/Headers/Public/FBSnapshotTestCase/UIImage+Snapshot.h @@ -0,0 +1 @@ +../../../FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Snapshot.h \ No newline at end of file diff --git a/Example/Pods/Headers/Public/SDWebImage/NSImage+WebCache.h b/Example/Pods/Headers/Public/SDWebImage/NSImage+WebCache.h new file mode 120000 index 000000000..b7a00e1f3 --- /dev/null +++ b/Example/Pods/Headers/Public/SDWebImage/NSImage+WebCache.h @@ -0,0 +1 @@ +../../../SDWebImage/SDWebImage/NSImage+WebCache.h \ No newline at end of file diff --git a/Example/Pods/Headers/Public/SDWebImage/SDImageCacheConfig.h b/Example/Pods/Headers/Public/SDWebImage/SDImageCacheConfig.h new file mode 120000 index 000000000..f0f1f8f38 --- /dev/null +++ b/Example/Pods/Headers/Public/SDWebImage/SDImageCacheConfig.h @@ -0,0 +1 @@ +../../../SDWebImage/SDWebImage/SDImageCacheConfig.h \ No newline at end of file diff --git a/Example/Pods/Headers/Public/SDWebImage/UIView+WebCache.h b/Example/Pods/Headers/Public/SDWebImage/UIView+WebCache.h new file mode 120000 index 000000000..641671a56 --- /dev/null +++ b/Example/Pods/Headers/Public/SDWebImage/UIView+WebCache.h @@ -0,0 +1 @@ +../../../SDWebImage/SDWebImage/UIView+WebCache.h \ No newline at end of file diff --git a/Example/Pods/Local Podspecs/MWPhotoBrowser.podspec.json b/Example/Pods/Local Podspecs/MWPhotoBrowser.podspec.json index 2a29889a6..fc00a050b 100644 --- a/Example/Pods/Local Podspecs/MWPhotoBrowser.podspec.json +++ b/Example/Pods/Local Podspecs/MWPhotoBrowser.podspec.json @@ -40,14 +40,13 @@ "weak_frameworks": "Photos", "dependencies": { "MBProgressHUD": [ - "~> 0.9" + "~> 1.0.0" ], "DACircularProgress": [ - "~> 2.3" + "~> 2.3.1" ], "SDWebImage": [ - "~> 3.7", - "!= 3.7.2" + "~> 4.0.0" ] } } diff --git a/Example/Pods/MBProgressHUD/LICENSE b/Example/Pods/MBProgressHUD/LICENSE index 0e357d1bf..1c0d59bb8 100644 --- a/Example/Pods/MBProgressHUD/LICENSE +++ b/Example/Pods/MBProgressHUD/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2009-2015 Matej Bukovinski +Copyright © 2009-2016 Matej Bukovinski Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Example/Pods/MBProgressHUD/MBProgressHUD.h b/Example/Pods/MBProgressHUD/MBProgressHUD.h index 40e71a9b2..a10744c0c 100644 --- a/Example/Pods/MBProgressHUD/MBProgressHUD.h +++ b/Example/Pods/MBProgressHUD/MBProgressHUD.h @@ -1,12 +1,12 @@ // // MBProgressHUD.h -// Version 0.9.2 +// Version 1.0.0 // Created by Matej Bukovinski on 2.4.09. // // This code is distributed under the terms and conditions of the MIT license. -// Copyright (c) 2009-2015 Matej Bukovinski +// Copyright © 2009-2016 Matej Bukovinski // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -30,90 +30,67 @@ #import #import +@class MBBackgroundView; @protocol MBProgressHUDDelegate; +extern CGFloat const MBProgressMaxOffset; + typedef NS_ENUM(NSInteger, MBProgressHUDMode) { - /** Progress is shown using an UIActivityIndicatorView. This is the default. */ - MBProgressHUDModeIndeterminate, - /** Progress is shown using a round, pie-chart like, progress view. */ - MBProgressHUDModeDeterminate, - /** Progress is shown using a horizontal progress bar */ - MBProgressHUDModeDeterminateHorizontalBar, - /** Progress is shown using a ring-shaped progress view. */ - MBProgressHUDModeAnnularDeterminate, - /** Shows a custom view */ - MBProgressHUDModeCustomView, - /** Shows only labels */ - MBProgressHUDModeText + /// UIActivityIndicatorView. + MBProgressHUDModeIndeterminate, + /// A round, pie-chart like, progress view. + MBProgressHUDModeDeterminate, + /// Horizontal progress bar. + MBProgressHUDModeDeterminateHorizontalBar, + /// Ring-shaped progress view. + MBProgressHUDModeAnnularDeterminate, + /// Shows a custom view. + MBProgressHUDModeCustomView, + /// Shows only labels. + MBProgressHUDModeText }; typedef NS_ENUM(NSInteger, MBProgressHUDAnimation) { - /** Opacity animation */ - MBProgressHUDAnimationFade, - /** Opacity + scale animation */ - MBProgressHUDAnimationZoom, - MBProgressHUDAnimationZoomOut = MBProgressHUDAnimationZoom, - MBProgressHUDAnimationZoomIn + /// Opacity animation + MBProgressHUDAnimationFade, + /// Opacity + scale animation (zoom in when appearing zoom out when disappearing) + MBProgressHUDAnimationZoom, + /// Opacity + scale animation (zoom out style) + MBProgressHUDAnimationZoomOut, + /// Opacity + scale animation (zoom in style) + MBProgressHUDAnimationZoomIn }; +typedef NS_ENUM(NSInteger, MBProgressHUDBackgroundStyle) { + /// Solid color background + MBProgressHUDBackgroundStyleSolidColor, + /// UIVisualEffectView or UIToolbar.layer background view + MBProgressHUDBackgroundStyleBlur +}; -#ifndef MB_INSTANCETYPE -#if __has_feature(objc_instancetype) - #define MB_INSTANCETYPE instancetype -#else - #define MB_INSTANCETYPE id -#endif -#endif - -#ifndef MB_STRONG -#if __has_feature(objc_arc) - #define MB_STRONG strong -#else - #define MB_STRONG retain -#endif -#endif - -#ifndef MB_WEAK -#if __has_feature(objc_arc_weak) - #define MB_WEAK weak -#elif __has_feature(objc_arc) - #define MB_WEAK unsafe_unretained -#else - #define MB_WEAK assign -#endif -#endif - -#if NS_BLOCKS_AVAILABLE typedef void (^MBProgressHUDCompletionBlock)(); -#endif + + +NS_ASSUME_NONNULL_BEGIN /** * Displays a simple HUD window containing a progress indicator and two optional labels for short messages. * * This is a simple drop-in class for displaying a progress HUD view similar to Apple's private UIProgressHUD class. - * The MBProgressHUD window spans over the entire space given to it by the initWithFrame constructor and catches all - * user input on this region, thereby preventing the user operations on components below the view. The HUD itself is - * drawn centered as a rounded semi-transparent view which resizes depending on the user specified content. + * The MBProgressHUD window spans over the entire space given to it by the initWithFrame: constructor and catches all + * user input on this region, thereby preventing the user operations on components below the view. * - * This view supports four modes of operation: - * - MBProgressHUDModeIndeterminate - shows a UIActivityIndicatorView - * - MBProgressHUDModeDeterminate - shows a custom round progress indicator - * - MBProgressHUDModeAnnularDeterminate - shows a custom annular progress indicator - * - MBProgressHUDModeCustomView - shows an arbitrary, user specified view (see `customView`) - * - * All three modes can have optional labels assigned: - * - If the labelText property is set and non-empty then a label containing the provided content is placed below the - * indicator view. - * - If also the detailsLabelText property is set then another label is placed below the first label. + * @note To still allow touches to pass through the HUD, you can set hud.userInteractionEnabled = NO. + * @attention MBProgressHUD is a UI class and should therefore only be accessed on the main thread. */ @interface MBProgressHUD : UIView /** * Creates a new HUD, adds it to provided view and shows it. The counterpart to this method is hideHUDForView:animated:. * - * @note This method sets `removeFromSuperViewOnHide`. The HUD will automatically be removed from the view hierarchy when hidden. + * @note This method sets removeFromSuperViewOnHide. The HUD will automatically be removed from the view hierarchy when hidden. * * @param view The view that the HUD will be added to * @param animated If set to YES the HUD will appear using the current animationType. If set to NO the HUD will not use @@ -123,12 +100,14 @@ typedef void (^MBProgressHUDCompletionBlock)(); * @see hideHUDForView:animated: * @see animationType */ -+ (MB_INSTANCETYPE)showHUDAddedTo:(UIView *)view animated:(BOOL)animated; ++ (instancetype)showHUDAddedTo:(UIView *)view animated:(BOOL)animated; + +/// @name Showing and hiding /** * Finds the top-most HUD subview and hides it. The counterpart to this method is showHUDAddedTo:animated:. * - * @note This method sets `removeFromSuperViewOnHide`. The HUD will automatically be removed from the view hierarchy when hidden. + * @note This method sets removeFromSuperViewOnHide. The HUD will automatically be removed from the view hierarchy when hidden. * * @param view The view that is going to be searched for a HUD subview. * @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use @@ -140,69 +119,39 @@ typedef void (^MBProgressHUDCompletionBlock)(); */ + (BOOL)hideHUDForView:(UIView *)view animated:(BOOL)animated; -/** - * Finds all the HUD subviews and hides them. - * - * @note This method sets `removeFromSuperViewOnHide`. The HUDs will automatically be removed from the view hierarchy when hidden. - * - * @param view The view that is going to be searched for HUD subviews. - * @param animated If set to YES the HUDs will disappear using the current animationType. If set to NO the HUDs will not use - * animations while disappearing. - * @return the number of HUDs found and removed. - * - * @see hideHUDForView:animated: - * @see animationType - */ -+ (NSUInteger)hideAllHUDsForView:(UIView *)view animated:(BOOL)animated; - /** * Finds the top-most HUD subview and returns it. * * @param view The view that is going to be searched. * @return A reference to the last HUD subview discovered. */ -+ (MB_INSTANCETYPE)HUDForView:(UIView *)view; - -/** - * Finds all HUD subviews and returns them. - * - * @param view The view that is going to be searched. - * @return All found HUD views (array of MBProgressHUD objects). - */ -+ (NSArray *)allHUDsForView:(UIView *)view; - -/** - * A convenience constructor that initializes the HUD with the window's bounds. Calls the designated constructor with - * window.bounds as the parameter. - * - * @param window The window instance that will provide the bounds for the HUD. Should be the same instance as - * the HUD's superview (i.e., the window that the HUD will be added to). - */ -- (id)initWithWindow:(UIWindow *)window; ++ (nullable MBProgressHUD *)HUDForView:(UIView *)view; /** * A convenience constructor that initializes the HUD with the view's bounds. Calls the designated constructor with - * view.bounds as the parameter + * view.bounds as the parameter. * * @param view The view instance that will provide the bounds for the HUD. Should be the same instance as * the HUD's superview (i.e., the view that the HUD will be added to). */ -- (id)initWithView:(UIView *)view; +- (instancetype)initWithView:(UIView *)view; /** - * Display the HUD. You need to make sure that the main thread completes its run loop soon after this method call so - * the user interface can be updated. Call this method when your task is already set-up to be executed in a new thread - * (e.g., when using something like NSOperation or calling an asynchronous call like NSURLRequest). + * Displays the HUD. + * + * @note You need to make sure that the main thread completes its run loop soon after this method call so that + * the user interface can be updated. Call this method when your task is already set up to be executed in a new thread + * (e.g., when using something like NSOperation or making an asynchronous call like NSURLRequest). * * @param animated If set to YES the HUD will appear using the current animationType. If set to NO the HUD will not use * animations while appearing. * * @see animationType */ -- (void)show:(BOOL)animated; +- (void)showAnimated:(BOOL)animated; /** - * Hide the HUD. This still calls the hudWasHidden: delegate. This is the counterpart of the show: method. Use it to + * Hides the HUD. This still calls the hudWasHidden: delegate. This is the counterpart of the show: method. Use it to * hide the HUD when your task completes. * * @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use @@ -210,10 +159,10 @@ typedef void (^MBProgressHUDCompletionBlock)(); * * @see animationType */ -- (void)hide:(BOOL)animated; +- (void)hideAnimated:(BOOL)animated; /** - * Hide the HUD after a delay. This still calls the hudWasHidden: delegate. This is the counterpart of the show: method. Use it to + * Hides the HUD after a delay. This still calls the hudWasHidden: delegate. This is the counterpart of the show: method. Use it to * hide the HUD when your task completes. * * @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use @@ -222,228 +171,136 @@ typedef void (^MBProgressHUDCompletionBlock)(); * * @see animationType */ -- (void)hide:(BOOL)animated afterDelay:(NSTimeInterval)delay; - -/** - * Shows the HUD while a background task is executing in a new thread, then hides the HUD. - * - * This method also takes care of autorelease pools so your method does not have to be concerned with setting up a - * pool. - * - * @param method The method to be executed while the HUD is shown. This method will be executed in a new thread. - * @param target The object that the target method belongs to. - * @param object An optional object to be passed to the method. - * @param animated If set to YES the HUD will (dis)appear using the current animationType. If set to NO the HUD will not use - * animations while (dis)appearing. - */ -- (void)showWhileExecuting:(SEL)method onTarget:(id)target withObject:(id)object animated:(BOOL)animated; - -#if NS_BLOCKS_AVAILABLE +- (void)hideAnimated:(BOOL)animated afterDelay:(NSTimeInterval)delay; /** - * Shows the HUD while a block is executing on a background queue, then hides the HUD. - * - * @see showAnimated:whileExecutingBlock:onQueue:completionBlock: + * The HUD delegate object. Receives HUD state notifications. */ -- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block; +@property (weak, nonatomic) id delegate; /** - * Shows the HUD while a block is executing on a background queue, then hides the HUD. - * - * @see showAnimated:whileExecutingBlock:onQueue:completionBlock: + * Called after the HUD is hiden. */ -- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block completionBlock:(MBProgressHUDCompletionBlock)completion; +@property (copy, nullable) MBProgressHUDCompletionBlock completionBlock; -/** - * Shows the HUD while a block is executing on the specified dispatch queue, then hides the HUD. - * - * @see showAnimated:whileExecutingBlock:onQueue:completionBlock: +/* + * Grace period is the time (in seconds) that the invoked method may be run without + * showing the HUD. If the task finishes before the grace time runs out, the HUD will + * not be shown at all. + * This may be used to prevent HUD display for very short tasks. + * Defaults to 0 (no grace time). */ -- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block onQueue:(dispatch_queue_t)queue; +@property (assign, nonatomic) NSTimeInterval graceTime; -/** - * Shows the HUD while a block is executing on the specified dispatch queue, executes completion block on the main queue, and then hides the HUD. - * - * @param animated If set to YES the HUD will (dis)appear using the current animationType. If set to NO the HUD will - * not use animations while (dis)appearing. - * @param block The block to be executed while the HUD is shown. - * @param queue The dispatch queue on which the block should be executed. - * @param completion The block to be executed on completion. - * - * @see completionBlock +/** + * The minimum time (in seconds) that the HUD is shown. + * This avoids the problem of the HUD being shown and than instantly hidden. + * Defaults to 0 (no minimum show time). */ -- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block onQueue:(dispatch_queue_t)queue - completionBlock:(MBProgressHUDCompletionBlock)completion; +@property (assign, nonatomic) NSTimeInterval minShowTime; /** - * A block that gets called after the HUD was completely hidden. + * Removes the HUD from its parent view when hidden. + * Defaults to NO. */ -@property (copy) MBProgressHUDCompletionBlock completionBlock; +@property (assign, nonatomic) BOOL removeFromSuperViewOnHide; -#endif +/// @name Appearance /** * MBProgressHUD operation mode. The default is MBProgressHUDModeIndeterminate. - * - * @see MBProgressHUDMode */ -@property (assign) MBProgressHUDMode mode; +@property (assign, nonatomic) MBProgressHUDMode mode; /** - * The animation type that should be used when the HUD is shown and hidden. - * - * @see MBProgressHUDAnimation + * A color that gets forwarded to all labels and supported indicators. Also sets the tintColor + * for custom views on iOS 7+. Set to nil to manage color individually. + * Defaults to semi-translucent black on iOS 7 and later and white on earlier iOS versions. */ -@property (assign) MBProgressHUDAnimation animationType; +@property (strong, nonatomic, nullable) UIColor *contentColor UI_APPEARANCE_SELECTOR; /** - * The UIView (e.g., a UIImageView) to be shown when the HUD is in MBProgressHUDModeCustomView. - * For best results use a 37 by 37 pixel view (so the bounds match the built in indicator bounds). - */ -@property (MB_STRONG) UIView *customView; - -/** - * The HUD delegate object. - * - * @see MBProgressHUDDelegate - */ -@property (MB_WEAK) id delegate; - -/** - * An optional short message to be displayed below the activity indicator. The HUD is automatically resized to fit - * the entire text. If the text is too long it will get clipped by displaying "..." at the end. If left unchanged or - * set to @"", then no message is displayed. + * The animation type that should be used when the HUD is shown and hidden. */ -@property (copy) NSString *labelText; - -/** - * An optional details message displayed below the labelText message. This message is displayed only if the labelText - * property is also set and is different from an empty string (@""). The details text can span multiple lines. - */ -@property (copy) NSString *detailsLabelText; - -/** - * The opacity of the HUD window. Defaults to 0.8 (80% opacity). - */ -@property (assign) float opacity; +@property (assign, nonatomic) MBProgressHUDAnimation animationType UI_APPEARANCE_SELECTOR; /** - * The color of the HUD window. Defaults to black. If this property is set, color is set using - * this UIColor and the opacity property is not used. using retain because performing copy on - * UIColor base colors (like [UIColor greenColor]) cause problems with the copyZone. - */ -@property (MB_STRONG) UIColor *color; - -/** - * The x-axis offset of the HUD relative to the centre of the superview. + * The bezel offset relative to the center of the view. You can use MBProgressMaxOffset + * and -MBProgressMaxOffset to move the HUD all the way to the screen edge in each direction. + * E.g., CGPointMake(0.f, MBProgressMaxOffset) would position the HUD centered on the bottom edge. */ -@property (assign) float xOffset; +@property (assign, nonatomic) CGPoint offset UI_APPEARANCE_SELECTOR; -/** - * The y-axis offset of the HUD relative to the centre of the superview. +/** + * The amount of space between the HUD edge and the HUD elements (labels, indicators or custom views). + * This also represents the minimum bezel distance to the edge of the HUD view. + * Defaults to 20.f */ -@property (assign) float yOffset; +@property (assign, nonatomic) CGFloat margin UI_APPEARANCE_SELECTOR; /** - * The amount of space between the HUD edge and the HUD elements (labels, indicators or custom views). - * Defaults to 20.0 + * The minimum size of the HUD bezel. Defaults to CGSizeZero (no minimum size). */ -@property (assign) float margin; +@property (assign, nonatomic) CGSize minSize UI_APPEARANCE_SELECTOR; /** - * The corner radius for the HUD - * Defaults to 10.0 + * Force the HUD dimensions to be equal if possible. */ -@property (assign) float cornerRadius; +@property (assign, nonatomic, getter = isSquare) BOOL square UI_APPEARANCE_SELECTOR; -/** - * Cover the HUD background view with a radial gradient. +/** + * When enabled, the bezel center gets slightly affected by the device accelerometer data. + * Has no effect on iOS < 7.0. Defaults to YES. */ -@property (assign) BOOL dimBackground; +@property (assign, nonatomic, getter=areDefaultMotionEffectsEnabled) BOOL defaultMotionEffectsEnabled UI_APPEARANCE_SELECTOR; -/* - * Grace period is the time (in seconds) that the invoked method may be run without - * showing the HUD. If the task finishes before the grace time runs out, the HUD will - * not be shown at all. - * This may be used to prevent HUD display for very short tasks. - * Defaults to 0 (no grace time). - * Grace time functionality is only supported when the task status is known! - * @see taskInProgress - */ -@property (assign) float graceTime; +/// @name Progress /** - * The minimum time (in seconds) that the HUD is shown. - * This avoids the problem of the HUD being shown and than instantly hidden. - * Defaults to 0 (no minimum show time). + * The progress of the progress indicator, from 0.0 to 1.0. Defaults to 0.0. */ -@property (assign) float minShowTime; +@property (assign, nonatomic) float progress; -/** - * Indicates that the executed operation is in progress. Needed for correct graceTime operation. - * If you don't set a graceTime (different than 0.0) this does nothing. - * This property is automatically set when using showWhileExecuting:onTarget:withObject:animated:. - * When threading is done outside of the HUD (i.e., when the show: and hide: methods are used directly), - * you need to set this property when your task starts and completes in order to have normal graceTime - * functionality. - */ -@property (assign) BOOL taskInProgress; +/// @name ProgressObject /** - * Removes the HUD from its parent view when hidden. - * Defaults to NO. + * The NSProgress object feeding the progress information to the progress indicator. */ -@property (assign) BOOL removeFromSuperViewOnHide; +@property (strong, nonatomic, nullable) NSProgress *progressObject; -/** - * Font to be used for the main label. Set this property if the default is not adequate. - */ -@property (MB_STRONG) UIFont* labelFont; +/// @name Views /** - * Color to be used for the main label. Set this property if the default is not adequate. + * The view containing the labels and indicator (or customView). */ -@property (MB_STRONG) UIColor* labelColor; +@property (strong, nonatomic, readonly) MBBackgroundView *bezelView; /** - * Font to be used for the details label. Set this property if the default is not adequate. - */ -@property (MB_STRONG) UIFont* detailsLabelFont; - -/** - * Color to be used for the details label. Set this property if the default is not adequate. + * View covering the entire HUD area, placed behind bezelView. */ -@property (MB_STRONG) UIColor* detailsLabelColor; +@property (strong, nonatomic, readonly) MBBackgroundView *backgroundView; /** - * The color of the activity indicator. Defaults to [UIColor whiteColor] - * Does nothing on pre iOS 5. - */ -@property (MB_STRONG) UIColor *activityIndicatorColor; - -/** - * The progress of the progress indicator, from 0.0 to 1.0. Defaults to 0.0. + * The UIView (e.g., a UIImageView) to be shown when the HUD is in MBProgressHUDModeCustomView. + * The view should implement intrinsicContentSize for proper sizing. For best results use approximately 37 by 37 pixels. */ -@property (assign) float progress; +@property (strong, nonatomic, nullable) UIView *customView; /** - * The minimum size of the HUD bezel. Defaults to CGSizeZero (no minimum size). + * A label that holds an optional short message to be displayed below the activity indicator. The HUD is automatically resized to fit + * the entire text. */ -@property (assign) CGSize minSize; - +@property (strong, nonatomic, readonly) UILabel *label; /** - * The actual size of the HUD bezel. - * You can use this to limit touch handling on the bezel area only. - * @see https://github.com/jdg/MBProgressHUD/pull/200 + * A label that holds an optional details message displayed below the labelText message. The details text can span multiple lines. */ -@property (atomic, assign, readonly) CGSize size; - +@property (strong, nonatomic, readonly) UILabel *detailsLabel; /** - * Force the HUD dimensions to be equal if possible. + * A button that is placed below the labels. Visible only if a target / action is added. */ -@property (assign, getter = isSquare) BOOL square; +@property (strong, nonatomic, readonly) UIButton *button; @end @@ -472,15 +329,16 @@ typedef void (^MBProgressHUDCompletionBlock)(); /** * Indicator progress color. - * Defaults to white [UIColor whiteColor] + * Defaults to white [UIColor whiteColor]. */ -@property (nonatomic, MB_STRONG) UIColor *progressTintColor; +@property (nonatomic, strong) UIColor *progressTintColor; /** - * Indicator background (non-progress) color. - * Defaults to translucent white (alpha 0.1) + * Indicator background (non-progress) color. + * Only applicable on iOS versions older than iOS 7. + * Defaults to translucent white (alpha 0.1). */ -@property (nonatomic, MB_STRONG) UIColor *backgroundTintColor; +@property (nonatomic, strong) UIColor *backgroundTintColor; /* * Display mode - NO = round or YES = annular. Defaults to round. @@ -504,18 +362,74 @@ typedef void (^MBProgressHUDCompletionBlock)(); * Bar border line color. * Defaults to white [UIColor whiteColor]. */ -@property (nonatomic, MB_STRONG) UIColor *lineColor; +@property (nonatomic, strong) UIColor *lineColor; /** * Bar background color. * Defaults to clear [UIColor clearColor]; */ -@property (nonatomic, MB_STRONG) UIColor *progressRemainingColor; +@property (nonatomic, strong) UIColor *progressRemainingColor; /** * Bar progress color. * Defaults to white [UIColor whiteColor]. */ -@property (nonatomic, MB_STRONG) UIColor *progressColor; +@property (nonatomic, strong) UIColor *progressColor; @end + + +@interface MBBackgroundView : UIView + +/** + * The background style. + * Defaults to MBProgressHUDBackgroundStyleBlur on iOS 7 or later and MBProgressHUDBackgroundStyleSolidColor otherwise. + * @note Due to iOS 7 not supporting UIVisualEffectView, the blur effect differs slightly between iOS 7 and later versions. + */ +@property (nonatomic) MBProgressHUDBackgroundStyle style; + +/** + * The background color or the blur tint color. + * @note Due to iOS 7 not supporting UIVisualEffectView, the blur effect differs slightly between iOS 7 and later versions. + */ +@property (nonatomic, strong) UIColor *color; + +@end + +@interface MBProgressHUD (Deprecated) + ++ (NSArray *)allHUDsForView:(UIView *)view __attribute__((deprecated("Store references when using more than one HUD per view."))); ++ (NSUInteger)hideAllHUDsForView:(UIView *)view animated:(BOOL)animated __attribute__((deprecated("Store references when using more than one HUD per view."))); + +- (id)initWithWindow:(UIWindow *)window __attribute__((deprecated("Use initWithView: instead."))); + +- (void)show:(BOOL)animated __attribute__((deprecated("Use showAnimated: instead."))); +- (void)hide:(BOOL)animated __attribute__((deprecated("Use hideAnimated: instead."))); +- (void)hide:(BOOL)animated afterDelay:(NSTimeInterval)delay __attribute__((deprecated("Use hideAnimated:afterDelay: instead."))); + +- (void)showWhileExecuting:(SEL)method onTarget:(id)target withObject:(id)object animated:(BOOL)animated __attribute__((deprecated("Use GCD directly."))); +- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block __attribute__((deprecated("Use GCD directly."))); +- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block completionBlock:(nullable MBProgressHUDCompletionBlock)completion __attribute__((deprecated("Use GCD directly."))); +- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block onQueue:(dispatch_queue_t)queue __attribute__((deprecated("Use GCD directly."))); +- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block onQueue:(dispatch_queue_t)queue + completionBlock:(nullable MBProgressHUDCompletionBlock)completion __attribute__((deprecated("Use GCD directly."))); +@property (assign) BOOL taskInProgress __attribute__((deprecated("No longer needed."))); + +@property (nonatomic, copy) NSString *labelText __attribute__((deprecated("Use label.text instead."))); +@property (nonatomic, strong) UIFont *labelFont __attribute__((deprecated("Use label.font instead."))); +@property (nonatomic, strong) UIColor *labelColor __attribute__((deprecated("Use label.textColor instead."))); +@property (nonatomic, copy) NSString *detailsLabelText __attribute__((deprecated("Use detailsLabel.text instead."))); +@property (nonatomic, strong) UIFont *detailsLabelFont __attribute__((deprecated("Use detailsLabel.font instead."))); +@property (nonatomic, strong) UIColor *detailsLabelColor __attribute__((deprecated("Use detailsLabel.textColor instead."))); +@property (assign, nonatomic) CGFloat opacity __attribute__((deprecated("Customize bezelView properties instead."))); +@property (strong, nonatomic) UIColor *color __attribute__((deprecated("Customize the bezelView color instead."))); +@property (assign, nonatomic) CGFloat xOffset __attribute__((deprecated("Set offset.x instead."))); +@property (assign, nonatomic) CGFloat yOffset __attribute__((deprecated("Set offset.y instead."))); +@property (assign, nonatomic) CGFloat cornerRadius __attribute__((deprecated("Set bezelView.layer.cornerRadius instead."))); +@property (assign, nonatomic) BOOL dimBackground __attribute__((deprecated("Customize HUD background properties instead."))); +@property (strong, nonatomic) UIColor *activityIndicatorColor __attribute__((deprecated("Use UIAppearance to customize UIActivityIndicatorView. E.g.: [UIActivityIndicatorView appearanceWhenContainedIn:[MBProgressHUD class], nil].color = [UIColor redColor];"))); +@property (atomic, assign, readonly) CGSize size __attribute__((deprecated("Get the bezelView.frame.size instead."))); + +@end + +NS_ASSUME_NONNULL_END diff --git a/Example/Pods/MBProgressHUD/MBProgressHUD.m b/Example/Pods/MBProgressHUD/MBProgressHUD.m index bf5f7fff1..a94f9217a 100644 --- a/Example/Pods/MBProgressHUD/MBProgressHUD.m +++ b/Example/Pods/MBProgressHUD/MBProgressHUD.m @@ -1,6 +1,6 @@ // // MBProgressHUD.m -// Version 0.9.2 +// Version 1.0.0 // Created by Matej Bukovinski on 2.4.09. // @@ -8,293 +8,193 @@ #import -#if __has_feature(objc_arc) - #define MB_AUTORELEASE(exp) exp - #define MB_RELEASE(exp) exp - #define MB_RETAIN(exp) exp -#else - #define MB_AUTORELEASE(exp) [exp autorelease] - #define MB_RELEASE(exp) [exp release] - #define MB_RETAIN(exp) [exp retain] -#endif - -#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000 - #define MBLabelAlignmentCenter NSTextAlignmentCenter -#else - #define MBLabelAlignmentCenter UITextAlignmentCenter -#endif - -#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000 - #define MB_TEXTSIZE(text, font) [text length] > 0 ? [text \ - sizeWithAttributes:@{NSFontAttributeName:font}] : CGSizeZero; -#else - #define MB_TEXTSIZE(text, font) [text length] > 0 ? [text sizeWithFont:font] : CGSizeZero; -#endif - -#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000 - #define MB_MULTILINE_TEXTSIZE(text, font, maxSize, mode) [text length] > 0 ? [text \ - boundingRectWithSize:maxSize options:(NSStringDrawingUsesLineFragmentOrigin) \ - attributes:@{NSFontAttributeName:font} context:nil].size : CGSizeZero; -#else - #define MB_MULTILINE_TEXTSIZE(text, font, maxSize, mode) [text length] > 0 ? [text \ - sizeWithFont:font constrainedToSize:maxSize lineBreakMode:mode] : CGSizeZero; -#endif - #ifndef kCFCoreFoundationVersionNumber_iOS_7_0 - #define kCFCoreFoundationVersionNumber_iOS_7_0 847.20 + #define kCFCoreFoundationVersionNumber_iOS_7_0 847.20 #endif #ifndef kCFCoreFoundationVersionNumber_iOS_8_0 - #define kCFCoreFoundationVersionNumber_iOS_8_0 1129.15 + #define kCFCoreFoundationVersionNumber_iOS_8_0 1129.15 #endif +#define MBMainThreadAssert() NSAssert([NSThread isMainThread], @"MBProgressHUD needs to be accessed on the main thread."); -static const CGFloat kPadding = 4.f; -static const CGFloat kLabelFontSize = 16.f; -static const CGFloat kDetailsLabelFontSize = 12.f; +CGFloat const MBProgressMaxOffset = 1000000.f; + +static const CGFloat MBDefaultPadding = 4.f; +static const CGFloat MBDefaultLabelFontSize = 16.f; +static const CGFloat MBDefaultDetailsLabelFontSize = 12.f; @interface MBProgressHUD () { - BOOL useAnimation; - SEL methodForExecution; - id targetForExecution; - id objectForExecution; - UILabel *label; - UILabel *detailsLabel; - BOOL isFinished; - CGAffineTransform rotationTransform; + // Deprecated + UIColor *_activityIndicatorColor; + CGFloat _opacity; } -@property (atomic, MB_STRONG) UIView *indicator; -@property (atomic, MB_STRONG) NSTimer *graceTimer; -@property (atomic, MB_STRONG) NSTimer *minShowTimer; -@property (atomic, MB_STRONG) NSDate *showStarted; +@property (nonatomic, assign) BOOL useAnimation; +@property (nonatomic, assign, getter=hasFinished) BOOL finished; +@property (nonatomic, strong) UIView *indicator; +@property (nonatomic, strong) NSDate *showStarted; +@property (nonatomic, strong) NSArray *paddingConstraints; +@property (nonatomic, strong) NSArray *bezelConstraints; +@property (nonatomic, strong) UIView *topSpacer; +@property (nonatomic, strong) UIView *bottomSpacer; +@property (nonatomic, weak) NSTimer *graceTimer; +@property (nonatomic, weak) NSTimer *minShowTimer; +@property (nonatomic, weak) NSTimer *hideDelayTimer; +@property (nonatomic, weak) CADisplayLink *progressObjectDisplayLink; + +// Deprecated +@property (assign) BOOL taskInProgress; @end -@implementation MBProgressHUD +@interface MBProgressHUDRoundedButton : UIButton +@end -#pragma mark - Properties -@synthesize animationType; -@synthesize delegate; -@synthesize opacity; -@synthesize color; -@synthesize labelFont; -@synthesize labelColor; -@synthesize detailsLabelFont; -@synthesize detailsLabelColor; -@synthesize indicator; -@synthesize xOffset; -@synthesize yOffset; -@synthesize minSize; -@synthesize square; -@synthesize margin; -@synthesize dimBackground; -@synthesize graceTime; -@synthesize minShowTime; -@synthesize graceTimer; -@synthesize minShowTimer; -@synthesize taskInProgress; -@synthesize removeFromSuperViewOnHide; -@synthesize customView; -@synthesize showStarted; -@synthesize mode; -@synthesize labelText; -@synthesize detailsLabelText; -@synthesize progress; -@synthesize size; -@synthesize activityIndicatorColor; -#if NS_BLOCKS_AVAILABLE -@synthesize completionBlock; -#endif +@implementation MBProgressHUD #pragma mark - Class methods -+ (MB_INSTANCETYPE)showHUDAddedTo:(UIView *)view animated:(BOOL)animated { - MBProgressHUD *hud = [[self alloc] initWithView:view]; - hud.removeFromSuperViewOnHide = YES; - [view addSubview:hud]; - [hud show:animated]; - return MB_AUTORELEASE(hud); ++ (instancetype)showHUDAddedTo:(UIView *)view animated:(BOOL)animated { + MBProgressHUD *hud = [[self alloc] initWithView:view]; + hud.removeFromSuperViewOnHide = YES; + [view addSubview:hud]; + [hud showAnimated:animated]; + return hud; } + (BOOL)hideHUDForView:(UIView *)view animated:(BOOL)animated { - MBProgressHUD *hud = [self HUDForView:view]; - if (hud != nil) { - hud.removeFromSuperViewOnHide = YES; - [hud hide:animated]; - return YES; - } - return NO; + MBProgressHUD *hud = [self HUDForView:view]; + if (hud != nil) { + hud.removeFromSuperViewOnHide = YES; + [hud hideAnimated:animated]; + return YES; + } + return NO; } -+ (NSUInteger)hideAllHUDsForView:(UIView *)view animated:(BOOL)animated { - NSArray *huds = [MBProgressHUD allHUDsForView:view]; - for (MBProgressHUD *hud in huds) { - hud.removeFromSuperViewOnHide = YES; - [hud hide:animated]; - } - return [huds count]; ++ (MBProgressHUD *)HUDForView:(UIView *)view { + NSEnumerator *subviewsEnum = [view.subviews reverseObjectEnumerator]; + for (UIView *subview in subviewsEnum) { + if ([subview isKindOfClass:self]) { + return (MBProgressHUD *)subview; + } + } + return nil; } -+ (MB_INSTANCETYPE)HUDForView:(UIView *)view { - NSEnumerator *subviewsEnum = [view.subviews reverseObjectEnumerator]; - for (UIView *subview in subviewsEnum) { - if ([subview isKindOfClass:self]) { - return (MBProgressHUD *)subview; - } - } - return nil; -} +#pragma mark - Lifecycle -+ (NSArray *)allHUDsForView:(UIView *)view { - NSMutableArray *huds = [NSMutableArray array]; - NSArray *subviews = view.subviews; - for (UIView *aView in subviews) { - if ([aView isKindOfClass:self]) { - [huds addObject:aView]; - } - } - return [NSArray arrayWithArray:huds]; +- (void)commonInit { + // Set default values for properties + _animationType = MBProgressHUDAnimationFade; + _mode = MBProgressHUDModeIndeterminate; + _margin = 20.0f; + _opacity = 1.f; + _defaultMotionEffectsEnabled = YES; + + // Default color, depending on the current iOS version + BOOL isLegacy = kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iOS_7_0; + _contentColor = isLegacy ? [UIColor whiteColor] : [UIColor colorWithWhite:0.f alpha:0.7f]; + // Transparent background + self.opaque = NO; + self.backgroundColor = [UIColor clearColor]; + // Make it invisible for now + self.alpha = 0.0f; + self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; + self.layer.allowsGroupOpacity = NO; + + [self setupViews]; + [self updateIndicators]; + [self registerForNotifications]; } -#pragma mark - Lifecycle - -- (id)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - // Set default values for properties - self.animationType = MBProgressHUDAnimationFade; - self.mode = MBProgressHUDModeIndeterminate; - self.labelText = nil; - self.detailsLabelText = nil; - self.opacity = 0.8f; - self.color = nil; - self.labelFont = [UIFont boldSystemFontOfSize:kLabelFontSize]; - self.labelColor = [UIColor whiteColor]; - self.detailsLabelFont = [UIFont boldSystemFontOfSize:kDetailsLabelFontSize]; - self.detailsLabelColor = [UIColor whiteColor]; - self.activityIndicatorColor = [UIColor whiteColor]; - self.xOffset = 0.0f; - self.yOffset = 0.0f; - self.dimBackground = NO; - self.margin = 20.0f; - self.cornerRadius = 10.0f; - self.graceTime = 0.0f; - self.minShowTime = 0.0f; - self.removeFromSuperViewOnHide = NO; - self.minSize = CGSizeZero; - self.square = NO; - self.contentMode = UIViewContentModeCenter; - self.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin - | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin; - - // Transparent background - self.opaque = NO; - self.backgroundColor = [UIColor clearColor]; - // Make it invisible for now - self.alpha = 0.0f; - - taskInProgress = NO; - rotationTransform = CGAffineTransformIdentity; - - [self setupLabels]; - [self updateIndicators]; - [self registerForKVO]; - [self registerForNotifications]; - } - return self; +- (instancetype)initWithFrame:(CGRect)frame { + if ((self = [super initWithFrame:frame])) { + [self commonInit]; + } + return self; } -- (id)initWithView:(UIView *)view { - NSAssert(view, @"View must not be nil."); - return [self initWithFrame:view.bounds]; +- (instancetype)initWithCoder:(NSCoder *)aDecoder { + if ((self = [super initWithCoder:aDecoder])) { + [self commonInit]; + } + return self; } -- (id)initWithWindow:(UIWindow *)window { - return [self initWithView:window]; +- (id)initWithView:(UIView *)view { + NSAssert(view, @"View must not be nil."); + return [self initWithFrame:view.bounds]; } - (void)dealloc { - [self unregisterFromNotifications]; - [self unregisterFromKVO]; -#if !__has_feature(objc_arc) - [color release]; - [indicator release]; - [label release]; - [detailsLabel release]; - [labelText release]; - [detailsLabelText release]; - [graceTimer release]; - [minShowTimer release]; - [showStarted release]; - [customView release]; - [labelFont release]; - [labelColor release]; - [detailsLabelFont release]; - [detailsLabelColor release]; -#if NS_BLOCKS_AVAILABLE - [completionBlock release]; -#endif - [super dealloc]; -#endif + [self unregisterFromNotifications]; } #pragma mark - Show & hide -- (void)show:(BOOL)animated { - NSAssert([NSThread isMainThread], @"MBProgressHUD needs to be accessed on the main thread."); - useAnimation = animated; - // If the grace time is set postpone the HUD display - if (self.graceTime > 0.0) { - NSTimer *newGraceTimer = [NSTimer timerWithTimeInterval:self.graceTime target:self selector:@selector(handleGraceTimer:) userInfo:nil repeats:NO]; - [[NSRunLoop currentRunLoop] addTimer:newGraceTimer forMode:NSRunLoopCommonModes]; - self.graceTimer = newGraceTimer; - } - // ... otherwise show the HUD imediately - else { - [self showUsingAnimation:useAnimation]; - } -} - -- (void)hide:(BOOL)animated { - NSAssert([NSThread isMainThread], @"MBProgressHUD needs to be accessed on the main thread."); - useAnimation = animated; - // If the minShow time is set, calculate how long the hud was shown, - // and pospone the hiding operation if necessary - if (self.minShowTime > 0.0 && showStarted) { - NSTimeInterval interv = [[NSDate date] timeIntervalSinceDate:showStarted]; - if (interv < self.minShowTime) { - self.minShowTimer = [NSTimer scheduledTimerWithTimeInterval:(self.minShowTime - interv) target:self - selector:@selector(handleMinShowTimer:) userInfo:nil repeats:NO]; - return; - } - } - // ... otherwise hide the HUD immediately - [self hideUsingAnimation:useAnimation]; +- (void)showAnimated:(BOOL)animated { + MBMainThreadAssert(); + [self.minShowTimer invalidate]; + self.useAnimation = animated; + self.finished = NO; + // If the grace time is set, postpone the HUD display + if (self.graceTime > 0.0) { + NSTimer *timer = [NSTimer timerWithTimeInterval:self.graceTime target:self selector:@selector(handleGraceTimer:) userInfo:nil repeats:NO]; + [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSRunLoopCommonModes]; + self.graceTimer = timer; + } + // ... otherwise show the HUD immediately + else { + [self showUsingAnimation:self.useAnimation]; + } } -- (void)hide:(BOOL)animated afterDelay:(NSTimeInterval)delay { - [self performSelector:@selector(hideDelayed:) withObject:[NSNumber numberWithBool:animated] afterDelay:delay]; +- (void)hideAnimated:(BOOL)animated { + MBMainThreadAssert(); + [self.graceTimer invalidate]; + self.useAnimation = animated; + self.finished = YES; + // If the minShow time is set, calculate how long the HUD was shown, + // and postpone the hiding operation if necessary + if (self.minShowTime > 0.0 && self.showStarted) { + NSTimeInterval interv = [[NSDate date] timeIntervalSinceDate:self.showStarted]; + if (interv < self.minShowTime) { + NSTimer *timer = [NSTimer timerWithTimeInterval:(self.minShowTime - interv) target:self selector:@selector(handleMinShowTimer:) userInfo:nil repeats:NO]; + [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSRunLoopCommonModes]; + self.minShowTimer = timer; + return; + } + } + // ... otherwise hide the HUD immediately + [self hideUsingAnimation:self.useAnimation]; } -- (void)hideDelayed:(NSNumber *)animated { - [self hide:[animated boolValue]]; +- (void)hideAnimated:(BOOL)animated afterDelay:(NSTimeInterval)delay { + NSTimer *timer = [NSTimer timerWithTimeInterval:delay target:self selector:@selector(handleHideTimer:) userInfo:@(animated) repeats:NO]; + [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSRunLoopCommonModes]; + self.hideDelayTimer = timer; } #pragma mark - Timer callbacks - (void)handleGraceTimer:(NSTimer *)theTimer { - // Show the HUD only if the task is still running - if (taskInProgress) { - [self showUsingAnimation:useAnimation]; - } + // Show the HUD only if the task is still running + if (!self.hasFinished) { + [self showUsingAnimation:self.useAnimation]; + } } - (void)handleMinShowTimer:(NSTimer *)theTimer { - [self hideUsingAnimation:useAnimation]; + [self hideUsingAnimation:self.useAnimation]; +} + +- (void)handleHideTimer:(NSTimer *)timer { + [self hideAnimated:[timer.userInfo boolValue]]; } #pragma mark - View Hierrarchy @@ -306,440 +206,578 @@ - (void)didMoveToSuperview { #pragma mark - Internal show & hide operations - (void)showUsingAnimation:(BOOL)animated { + // Cancel any previous animations + [self.bezelView.layer removeAllAnimations]; + [self.backgroundView.layer removeAllAnimations]; + // Cancel any scheduled hideDelayed: calls - [NSObject cancelPreviousPerformRequestsWithTarget:self]; - [self setNeedsDisplay]; - - if (animated && animationType == MBProgressHUDAnimationZoomIn) { - self.transform = CGAffineTransformConcat(rotationTransform, CGAffineTransformMakeScale(0.5f, 0.5f)); - } else if (animated && animationType == MBProgressHUDAnimationZoomOut) { - self.transform = CGAffineTransformConcat(rotationTransform, CGAffineTransformMakeScale(1.5f, 1.5f)); - } - self.showStarted = [NSDate date]; - // Fade in - if (animated) { - [UIView beginAnimations:nil context:NULL]; - [UIView setAnimationDuration:0.30]; - self.alpha = 1.0f; - if (animationType == MBProgressHUDAnimationZoomIn || animationType == MBProgressHUDAnimationZoomOut) { - self.transform = rotationTransform; - } - [UIView commitAnimations]; - } - else { - self.alpha = 1.0f; - } + [self.hideDelayTimer invalidate]; + + self.showStarted = [NSDate date]; + self.alpha = 1.f; + + // Needed in case we hide and re-show with the same NSProgress object attached. + [self setNSProgressDisplayLinkEnabled:YES]; + + if (animated) { + [self animateIn:YES withType:self.animationType completion:NULL]; + } else { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + self.bezelView.alpha = self.opacity; +#pragma clang diagnostic pop + self.backgroundView.alpha = 1.f; + } } - (void)hideUsingAnimation:(BOOL)animated { - // Fade out - if (animated && showStarted) { - [UIView beginAnimations:nil context:NULL]; - [UIView setAnimationDuration:0.30]; - [UIView setAnimationDelegate:self]; - [UIView setAnimationDidStopSelector:@selector(animationFinished:finished:context:)]; - // 0.02 prevents the hud from passing through touches during the animation the hud will get completely hidden - // in the done method - if (animationType == MBProgressHUDAnimationZoomIn) { - self.transform = CGAffineTransformConcat(rotationTransform, CGAffineTransformMakeScale(1.5f, 1.5f)); - } else if (animationType == MBProgressHUDAnimationZoomOut) { - self.transform = CGAffineTransformConcat(rotationTransform, CGAffineTransformMakeScale(0.5f, 0.5f)); - } - - self.alpha = 0.02f; - [UIView commitAnimations]; - } - else { - self.alpha = 0.0f; - [self done]; - } - self.showStarted = nil; -} - -- (void)animationFinished:(NSString *)animationID finished:(BOOL)finished context:(void*)context { - [self done]; + if (animated && self.showStarted) { + self.showStarted = nil; + [self animateIn:NO withType:self.animationType completion:^(BOOL finished) { + [self done]; + }]; + } else { + self.showStarted = nil; + self.bezelView.alpha = 0.f; + self.backgroundView.alpha = 1.f; + [self done]; + } +} + +- (void)animateIn:(BOOL)animatingIn withType:(MBProgressHUDAnimation)type completion:(void(^)(BOOL finished))completion { + // Automatically determine the correct zoom animation type + if (type == MBProgressHUDAnimationZoom) { + type = animatingIn ? MBProgressHUDAnimationZoomIn : MBProgressHUDAnimationZoomOut; + } + + CGAffineTransform small = CGAffineTransformMakeScale(0.5f, 0.5f); + CGAffineTransform large = CGAffineTransformMakeScale(1.5f, 1.5f); + + // Set starting state + UIView *bezelView = self.bezelView; + if (animatingIn && bezelView.alpha == 0.f && type == MBProgressHUDAnimationZoomIn) { + bezelView.transform = small; + } else if (animatingIn && bezelView.alpha == 0.f && type == MBProgressHUDAnimationZoomOut) { + bezelView.transform = large; + } + + // Perform animations + dispatch_block_t animations = ^{ + if (animatingIn) { + bezelView.transform = CGAffineTransformIdentity; + } else if (!animatingIn && type == MBProgressHUDAnimationZoomIn) { + bezelView.transform = large; + } else if (!animatingIn && type == MBProgressHUDAnimationZoomOut) { + bezelView.transform = small; + } +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + bezelView.alpha = animatingIn ? self.opacity : 0.f; +#pragma clang diagnostic pop + self.backgroundView.alpha = animatingIn ? 1.f : 0.f; + }; + + // Spring animations are nicer, but only available on iOS 7+ +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 || TARGET_OS_TV + if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_7_0) { + [UIView animateWithDuration:0.3 delay:0. usingSpringWithDamping:1.f initialSpringVelocity:0.f options:UIViewAnimationOptionBeginFromCurrentState animations:animations completion:completion]; + return; + } +#endif + [UIView animateWithDuration:0.3 delay:0. options:UIViewAnimationOptionBeginFromCurrentState animations:animations completion:completion]; } - (void)done { - [NSObject cancelPreviousPerformRequestsWithTarget:self]; - isFinished = YES; - self.alpha = 0.0f; - if (removeFromSuperViewOnHide) { - [self removeFromSuperview]; - } -#if NS_BLOCKS_AVAILABLE - if (self.completionBlock) { - self.completionBlock(); - self.completionBlock = NULL; - } + // Cancel any scheduled hideDelayed: calls + [self.hideDelayTimer invalidate]; + [self setNSProgressDisplayLinkEnabled:NO]; + + if (self.hasFinished) { + self.alpha = 0.0f; + if (self.removeFromSuperViewOnHide) { + [self removeFromSuperview]; + } + } + MBProgressHUDCompletionBlock completionBlock = self.completionBlock; + if (completionBlock) { + completionBlock(); + } + id delegate = self.delegate; + if ([delegate respondsToSelector:@selector(hudWasHidden:)]) { + [delegate performSelector:@selector(hudWasHidden:) withObject:self]; + } +} + +#pragma mark - UI + +- (void)setupViews { + UIColor *defaultColor = self.contentColor; + + MBBackgroundView *backgroundView = [[MBBackgroundView alloc] initWithFrame:self.bounds]; + backgroundView.style = MBProgressHUDBackgroundStyleSolidColor; + backgroundView.backgroundColor = [UIColor clearColor]; + backgroundView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; + backgroundView.alpha = 0.f; + [self addSubview:backgroundView]; + _backgroundView = backgroundView; + + MBBackgroundView *bezelView = [MBBackgroundView new]; + bezelView.translatesAutoresizingMaskIntoConstraints = NO; + bezelView.layer.cornerRadius = 5.f; + bezelView.alpha = 0.f; + [self addSubview:bezelView]; + _bezelView = bezelView; + [self updateBezelMotionEffects]; + + UILabel *label = [UILabel new]; + label.adjustsFontSizeToFitWidth = NO; + label.textAlignment = NSTextAlignmentCenter; + label.textColor = defaultColor; + label.font = [UIFont boldSystemFontOfSize:MBDefaultLabelFontSize]; + label.opaque = NO; + label.backgroundColor = [UIColor clearColor]; + _label = label; + + UILabel *detailsLabel = [UILabel new]; + detailsLabel.adjustsFontSizeToFitWidth = NO; + detailsLabel.textAlignment = NSTextAlignmentCenter; + detailsLabel.textColor = defaultColor; + detailsLabel.numberOfLines = 0; + detailsLabel.font = [UIFont boldSystemFontOfSize:MBDefaultDetailsLabelFontSize]; + detailsLabel.opaque = NO; + detailsLabel.backgroundColor = [UIColor clearColor]; + _detailsLabel = detailsLabel; + + UIButton *button = [MBProgressHUDRoundedButton buttonWithType:UIButtonTypeCustom]; + button.titleLabel.textAlignment = NSTextAlignmentCenter; + button.titleLabel.font = [UIFont boldSystemFontOfSize:MBDefaultDetailsLabelFontSize]; + [button setTitleColor:defaultColor forState:UIControlStateNormal]; + _button = button; + + for (UIView *view in @[label, detailsLabel, button]) { + view.translatesAutoresizingMaskIntoConstraints = NO; + [view setContentCompressionResistancePriority:998.f forAxis:UILayoutConstraintAxisHorizontal]; + [view setContentCompressionResistancePriority:998.f forAxis:UILayoutConstraintAxisVertical]; + [bezelView addSubview:view]; + } + + UIView *topSpacer = [UIView new]; + topSpacer.translatesAutoresizingMaskIntoConstraints = NO; + topSpacer.hidden = YES; + [bezelView addSubview:topSpacer]; + _topSpacer = topSpacer; + + UIView *bottomSpacer = [UIView new]; + bottomSpacer.translatesAutoresizingMaskIntoConstraints = NO; + bottomSpacer.hidden = YES; + [bezelView addSubview:bottomSpacer]; + _bottomSpacer = bottomSpacer; +} + +- (void)updateIndicators { + UIView *indicator = self.indicator; + BOOL isActivityIndicator = [indicator isKindOfClass:[UIActivityIndicatorView class]]; + BOOL isRoundIndicator = [indicator isKindOfClass:[MBRoundProgressView class]]; + + MBProgressHUDMode mode = self.mode; + if (mode == MBProgressHUDModeIndeterminate) { + if (!isActivityIndicator) { + // Update to indeterminate indicator + [indicator removeFromSuperview]; + indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]; + [(UIActivityIndicatorView *)indicator startAnimating]; + [self.bezelView addSubview:indicator]; + } + } + else if (mode == MBProgressHUDModeDeterminateHorizontalBar) { + // Update to bar determinate indicator + [indicator removeFromSuperview]; + indicator = [[MBBarProgressView alloc] init]; + [self.bezelView addSubview:indicator]; + } + else if (mode == MBProgressHUDModeDeterminate || mode == MBProgressHUDModeAnnularDeterminate) { + if (!isRoundIndicator) { + // Update to determinante indicator + [indicator removeFromSuperview]; + indicator = [[MBRoundProgressView alloc] init]; + [self.bezelView addSubview:indicator]; + } + if (mode == MBProgressHUDModeAnnularDeterminate) { + [(MBRoundProgressView *)indicator setAnnular:YES]; + } + } + else if (mode == MBProgressHUDModeCustomView && self.customView != indicator) { + // Update custom view indicator + [indicator removeFromSuperview]; + indicator = self.customView; + [self.bezelView addSubview:indicator]; + } + else if (mode == MBProgressHUDModeText) { + [indicator removeFromSuperview]; + indicator = nil; + } + indicator.translatesAutoresizingMaskIntoConstraints = NO; + self.indicator = indicator; + + if ([indicator respondsToSelector:@selector(setProgress:)]) { + [(id)indicator setValue:@(self.progress) forKey:@"progress"]; + } + + [indicator setContentCompressionResistancePriority:998.f forAxis:UILayoutConstraintAxisHorizontal]; + [indicator setContentCompressionResistancePriority:998.f forAxis:UILayoutConstraintAxisVertical]; + + [self updateViewsForColor:self.contentColor]; + [self setNeedsUpdateConstraints]; +} + +- (void)updateViewsForColor:(UIColor *)color { + if (!color) return; + + self.label.textColor = color; + self.detailsLabel.textColor = color; + [self.button setTitleColor:color forState:UIControlStateNormal]; + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + if (self.activityIndicatorColor) { + color = self.activityIndicatorColor; + } +#pragma clang diagnostic pop + + // UIAppearance settings are prioritized. If they are preset the set color is ignored. + + UIView *indicator = self.indicator; + if ([indicator isKindOfClass:[UIActivityIndicatorView class]]) { + UIActivityIndicatorView *appearance = nil; +#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000 + appearance = [UIActivityIndicatorView appearanceWhenContainedIn:[MBProgressHUD class], nil]; +#else + // For iOS 9+ + appearance = [UIActivityIndicatorView appearanceWhenContainedInInstancesOfClasses:@[[MBProgressHUD class]]]; #endif - if ([delegate respondsToSelector:@selector(hudWasHidden:)]) { - [delegate performSelector:@selector(hudWasHidden:) withObject:self]; - } + + if (appearance.color == nil) { + ((UIActivityIndicatorView *)indicator).color = color; + } + } else if ([indicator isKindOfClass:[MBRoundProgressView class]]) { + MBRoundProgressView *appearance = nil; +#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000 + appearance = [MBRoundProgressView appearanceWhenContainedIn:[MBProgressHUD class], nil]; +#else + appearance = [MBRoundProgressView appearanceWhenContainedInInstancesOfClasses:@[[MBProgressHUD class]]]; +#endif + if (appearance.progressTintColor == nil) { + ((MBRoundProgressView *)indicator).progressTintColor = color; + } + if (appearance.backgroundTintColor == nil) { + ((MBRoundProgressView *)indicator).backgroundTintColor = [color colorWithAlphaComponent:0.1]; + } + } else if ([indicator isKindOfClass:[MBBarProgressView class]]) { + MBBarProgressView *appearance = nil; +#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000 + appearance = [MBBarProgressView appearanceWhenContainedIn:[MBProgressHUD class], nil]; +#else + appearance = [MBBarProgressView appearanceWhenContainedInInstancesOfClasses:@[[MBProgressHUD class]]]; +#endif + if (appearance.progressColor == nil) { + ((MBBarProgressView *)indicator).progressColor = color; + } + if (appearance.lineColor == nil) { + ((MBBarProgressView *)indicator).lineColor = color; + } + } else { +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 || TARGET_OS_TV + if ([indicator respondsToSelector:@selector(setTintColor:)]) { + [indicator setTintColor:color]; + } +#endif + } } -#pragma mark - Threading +- (void)updateBezelMotionEffects { +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 || TARGET_OS_TV + MBBackgroundView *bezelView = self.bezelView; + if (![bezelView respondsToSelector:@selector(addMotionEffect:)]) return; + + if (self.defaultMotionEffectsEnabled) { + CGFloat effectOffset = 10.f; + UIInterpolatingMotionEffect *effectX = [[UIInterpolatingMotionEffect alloc] initWithKeyPath:@"center.x" type:UIInterpolatingMotionEffectTypeTiltAlongHorizontalAxis]; + effectX.maximumRelativeValue = @(effectOffset); + effectX.minimumRelativeValue = @(-effectOffset); + + UIInterpolatingMotionEffect *effectY = [[UIInterpolatingMotionEffect alloc] initWithKeyPath:@"center.y" type:UIInterpolatingMotionEffectTypeTiltAlongVerticalAxis]; + effectY.maximumRelativeValue = @(effectOffset); + effectY.minimumRelativeValue = @(-effectOffset); + + UIMotionEffectGroup *group = [[UIMotionEffectGroup alloc] init]; + group.motionEffects = @[effectX, effectY]; + + [bezelView addMotionEffect:group]; + } else { + NSArray *effects = [bezelView motionEffects]; + for (UIMotionEffect *effect in effects) { + [bezelView removeMotionEffect:effect]; + } + } +#endif +} -- (void)showWhileExecuting:(SEL)method onTarget:(id)target withObject:(id)object animated:(BOOL)animated { - methodForExecution = method; - targetForExecution = MB_RETAIN(target); - objectForExecution = MB_RETAIN(object); - // Launch execution in new thread - self.taskInProgress = YES; - [NSThread detachNewThreadSelector:@selector(launchExecution) toTarget:self withObject:nil]; - // Show HUD view - [self show:animated]; +#pragma mark - Layout + +- (void)updateConstraints { + UIView *bezel = self.bezelView; + UIView *topSpacer = self.topSpacer; + UIView *bottomSpacer = self.bottomSpacer; + CGFloat margin = self.margin; + NSMutableArray *bezelConstraints = [NSMutableArray array]; + NSDictionary *metrics = @{@"margin": @(margin)}; + + NSMutableArray *subviews = [NSMutableArray arrayWithObjects:self.topSpacer, self.label, self.detailsLabel, self.button, self.bottomSpacer, nil]; + if (self.indicator) [subviews insertObject:self.indicator atIndex:1]; + + // Remove existing constraints + [self removeConstraints:self.constraints]; + [topSpacer removeConstraints:topSpacer.constraints]; + [bottomSpacer removeConstraints:bottomSpacer.constraints]; + if (self.bezelConstraints) { + [bezel removeConstraints:self.bezelConstraints]; + self.bezelConstraints = nil; + } + + // Center bezel in container (self), applying the offset if set + CGPoint offset = self.offset; + NSMutableArray *centeringConstraints = [NSMutableArray array]; + [centeringConstraints addObject:[NSLayoutConstraint constraintWithItem:bezel attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeCenterX multiplier:1.f constant:offset.x]]; + [centeringConstraints addObject:[NSLayoutConstraint constraintWithItem:bezel attribute:NSLayoutAttributeCenterY relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeCenterY multiplier:1.f constant:offset.y]]; + [self applyPriority:998.f toConstraints:centeringConstraints]; + [self addConstraints:centeringConstraints]; + + // Ensure minimum side margin is kept + NSMutableArray *sideConstraints = [NSMutableArray array]; + [sideConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"|-(>=margin)-[bezel]-(>=margin)-|" options:0 metrics:metrics views:NSDictionaryOfVariableBindings(bezel)]]; + [sideConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(>=margin)-[bezel]-(>=margin)-|" options:0 metrics:metrics views:NSDictionaryOfVariableBindings(bezel)]]; + [self applyPriority:999.f toConstraints:sideConstraints]; + [self addConstraints:sideConstraints]; + + // Minimum bezel size, if set + CGSize minimumSize = self.minSize; + if (!CGSizeEqualToSize(minimumSize, CGSizeZero)) { + NSMutableArray *minSizeConstraints = [NSMutableArray array]; + [minSizeConstraints addObject:[NSLayoutConstraint constraintWithItem:bezel attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.f constant:minimumSize.width]]; + [minSizeConstraints addObject:[NSLayoutConstraint constraintWithItem:bezel attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.f constant:minimumSize.height]]; + [self applyPriority:997.f toConstraints:minSizeConstraints]; + [bezelConstraints addObjectsFromArray:minSizeConstraints]; + } + + // Square aspect ratio, if set + if (self.square) { + NSLayoutConstraint *square = [NSLayoutConstraint constraintWithItem:bezel attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:bezel attribute:NSLayoutAttributeWidth multiplier:1.f constant:0]; + square.priority = 997.f; + [bezelConstraints addObject:square]; + } + + // Top and bottom spacing + [topSpacer addConstraint:[NSLayoutConstraint constraintWithItem:topSpacer attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.f constant:margin]]; + [bottomSpacer addConstraint:[NSLayoutConstraint constraintWithItem:bottomSpacer attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.f constant:margin]]; + // Top and bottom spaces should be equal + [bezelConstraints addObject:[NSLayoutConstraint constraintWithItem:topSpacer attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:bottomSpacer attribute:NSLayoutAttributeHeight multiplier:1.f constant:0.f]]; + + // Layout subviews in bezel + NSMutableArray *paddingConstraints = [NSMutableArray new]; + [subviews enumerateObjectsUsingBlock:^(UIView *view, NSUInteger idx, BOOL *stop) { + // Center in bezel + [bezelConstraints addObject:[NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:bezel attribute:NSLayoutAttributeCenterX multiplier:1.f constant:0.f]]; + // Ensure the minimum edge margin is kept + [bezelConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"|-(>=margin)-[view]-(>=margin)-|" options:0 metrics:metrics views:NSDictionaryOfVariableBindings(view)]]; + // Element spacing + if (idx == 0) { + // First, ensure spacing to bezel edge + [bezelConstraints addObject:[NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:bezel attribute:NSLayoutAttributeTop multiplier:1.f constant:0.f]]; + } else if (idx == subviews.count - 1) { + // Last, ensure spacing to bezel edge + [bezelConstraints addObject:[NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:bezel attribute:NSLayoutAttributeBottom multiplier:1.f constant:0.f]]; + } + if (idx > 0) { + // Has previous + NSLayoutConstraint *padding = [NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:subviews[idx - 1] attribute:NSLayoutAttributeBottom multiplier:1.f constant:0.f]; + [bezelConstraints addObject:padding]; + [paddingConstraints addObject:padding]; + } + }]; + + [bezel addConstraints:bezelConstraints]; + self.bezelConstraints = bezelConstraints; + + self.paddingConstraints = [paddingConstraints copy]; + [self updatePaddingConstraints]; + + [super updateConstraints]; } -#if NS_BLOCKS_AVAILABLE +- (void)layoutSubviews { + // There is no need to update constraints if they are going to + // be recreated in [super layoutSubviews] due to needsUpdateConstraints being set. + // This also avoids an issue on iOS 8, where updatePaddingConstraints + // would trigger a zombie object access. + if (!self.needsUpdateConstraints) { + [self updatePaddingConstraints]; + } + [super layoutSubviews]; +} -- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block { - dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - [self showAnimated:animated whileExecutingBlock:block onQueue:queue completionBlock:NULL]; +- (void)updatePaddingConstraints { + // Set padding dynamically, depending on whether the view is visible or not + __block BOOL hasVisibleAncestors = NO; + [self.paddingConstraints enumerateObjectsUsingBlock:^(NSLayoutConstraint *padding, NSUInteger idx, BOOL *stop) { + UIView *firstView = (UIView *)padding.firstItem; + UIView *secondView = (UIView *)padding.secondItem; + BOOL firstVisible = !firstView.hidden && !CGSizeEqualToSize(firstView.intrinsicContentSize, CGSizeZero); + BOOL secondVisible = !secondView.hidden && !CGSizeEqualToSize(secondView.intrinsicContentSize, CGSizeZero); + // Set if both views are visible or if there's a visible view on top that doesn't have padding + // added relative to the current view yet + padding.constant = (firstVisible && (secondVisible || hasVisibleAncestors)) ? MBDefaultPadding : 0.f; + hasVisibleAncestors |= secondVisible; + }]; } -- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block completionBlock:(void (^)())completion { - dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); - [self showAnimated:animated whileExecutingBlock:block onQueue:queue completionBlock:completion]; +- (void)applyPriority:(UILayoutPriority)priority toConstraints:(NSArray *)constraints { + for (NSLayoutConstraint *constraint in constraints) { + constraint.priority = priority; + } } -- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block onQueue:(dispatch_queue_t)queue { - [self showAnimated:animated whileExecutingBlock:block onQueue:queue completionBlock:NULL]; +#pragma mark - Properties + +- (void)setMode:(MBProgressHUDMode)mode { + if (mode != _mode) { + _mode = mode; + [self updateIndicators]; + } } -- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block onQueue:(dispatch_queue_t)queue - completionBlock:(MBProgressHUDCompletionBlock)completion { - self.taskInProgress = YES; - self.completionBlock = completion; - dispatch_async(queue, ^(void) { - block(); - dispatch_async(dispatch_get_main_queue(), ^(void) { - [self cleanUp]; - }); - }); - [self show:animated]; +- (void)setCustomView:(UIView *)customView { + if (customView != _customView) { + _customView = customView; + if (self.mode == MBProgressHUDModeCustomView) { + [self updateIndicators]; + } + } } -#endif +- (void)setOffset:(CGPoint)offset { + if (!CGPointEqualToPoint(offset, _offset)) { + _offset = offset; + [self setNeedsUpdateConstraints]; + } +} -- (void)launchExecution { - @autoreleasepool { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Warc-performSelector-leaks" - // Start executing the requested task - [targetForExecution performSelector:methodForExecution withObject:objectForExecution]; -#pragma clang diagnostic pop - // Task completed, update view in main thread (note: view operations should - // be done only in the main thread) - [self performSelectorOnMainThread:@selector(cleanUp) withObject:nil waitUntilDone:NO]; - } +- (void)setMargin:(CGFloat)margin { + if (margin != _margin) { + _margin = margin; + [self setNeedsUpdateConstraints]; + } } -- (void)cleanUp { - taskInProgress = NO; -#if !__has_feature(objc_arc) - [targetForExecution release]; - [objectForExecution release]; -#else - targetForExecution = nil; - objectForExecution = nil; -#endif - [self hide:useAnimation]; +- (void)setMinSize:(CGSize)minSize { + if (!CGSizeEqualToSize(minSize, _minSize)) { + _minSize = minSize; + [self setNeedsUpdateConstraints]; + } } -#pragma mark - UI +- (void)setSquare:(BOOL)square { + if (square != _square) { + _square = square; + [self setNeedsUpdateConstraints]; + } +} -- (void)setupLabels { - label = [[UILabel alloc] initWithFrame:self.bounds]; - label.adjustsFontSizeToFitWidth = NO; - label.textAlignment = MBLabelAlignmentCenter; - label.opaque = NO; - label.backgroundColor = [UIColor clearColor]; - label.textColor = self.labelColor; - label.font = self.labelFont; - label.text = self.labelText; - [self addSubview:label]; - - detailsLabel = [[UILabel alloc] initWithFrame:self.bounds]; - detailsLabel.font = self.detailsLabelFont; - detailsLabel.adjustsFontSizeToFitWidth = NO; - detailsLabel.textAlignment = MBLabelAlignmentCenter; - detailsLabel.opaque = NO; - detailsLabel.backgroundColor = [UIColor clearColor]; - detailsLabel.textColor = self.detailsLabelColor; - detailsLabel.numberOfLines = 0; - detailsLabel.font = self.detailsLabelFont; - detailsLabel.text = self.detailsLabelText; - [self addSubview:detailsLabel]; +- (void)setProgressObjectDisplayLink:(CADisplayLink *)progressObjectDisplayLink { + if (progressObjectDisplayLink != _progressObjectDisplayLink) { + [_progressObjectDisplayLink invalidate]; + + _progressObjectDisplayLink = progressObjectDisplayLink; + + [_progressObjectDisplayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode]; + } } -- (void)updateIndicators { - - BOOL isActivityIndicator = [indicator isKindOfClass:[UIActivityIndicatorView class]]; - BOOL isRoundIndicator = [indicator isKindOfClass:[MBRoundProgressView class]]; - - if (mode == MBProgressHUDModeIndeterminate) { - if (!isActivityIndicator) { - // Update to indeterminate indicator - [indicator removeFromSuperview]; - self.indicator = MB_AUTORELEASE([[UIActivityIndicatorView alloc] - initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge]); - [(UIActivityIndicatorView *)indicator startAnimating]; - [self addSubview:indicator]; - } -#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000 - [(UIActivityIndicatorView *)indicator setColor:self.activityIndicatorColor]; -#endif - } - else if (mode == MBProgressHUDModeDeterminateHorizontalBar) { - // Update to bar determinate indicator - [indicator removeFromSuperview]; - self.indicator = MB_AUTORELEASE([[MBBarProgressView alloc] init]); - [self addSubview:indicator]; - } - else if (mode == MBProgressHUDModeDeterminate || mode == MBProgressHUDModeAnnularDeterminate) { - if (!isRoundIndicator) { - // Update to determinante indicator - [indicator removeFromSuperview]; - self.indicator = MB_AUTORELEASE([[MBRoundProgressView alloc] init]); - [self addSubview:indicator]; - } - if (mode == MBProgressHUDModeAnnularDeterminate) { - [(MBRoundProgressView *)indicator setAnnular:YES]; - } - [(MBRoundProgressView *)indicator setProgressTintColor:self.activityIndicatorColor]; - [(MBRoundProgressView *)indicator setBackgroundTintColor:[self.activityIndicatorColor colorWithAlphaComponent:0.1f]]; - } - else if (mode == MBProgressHUDModeCustomView && customView != indicator) { - // Update custom view indicator - [indicator removeFromSuperview]; - self.indicator = customView; - [self addSubview:indicator]; - } else if (mode == MBProgressHUDModeText) { - [indicator removeFromSuperview]; - self.indicator = nil; - } +- (void)setProgressObject:(NSProgress *)progressObject { + if (progressObject != _progressObject) { + _progressObject = progressObject; + [self setNSProgressDisplayLinkEnabled:YES]; + } } -#pragma mark - Layout +- (void)setProgress:(float)progress { + if (progress != _progress) { + _progress = progress; + UIView *indicator = self.indicator; + if ([indicator respondsToSelector:@selector(setProgress:)]) { + [(id)indicator setValue:@(self.progress) forKey:@"progress"]; + } + } +} -- (void)layoutSubviews { - [super layoutSubviews]; - - // Entirely cover the parent view - UIView *parent = self.superview; - if (parent) { - self.frame = parent.bounds; - } - CGRect bounds = self.bounds; - - // Determine the total width and height needed - CGFloat maxWidth = bounds.size.width - 4 * margin; - CGSize totalSize = CGSizeZero; - - CGRect indicatorF = indicator.bounds; - indicatorF.size.width = MIN(indicatorF.size.width, maxWidth); - totalSize.width = MAX(totalSize.width, indicatorF.size.width); - totalSize.height += indicatorF.size.height; - - CGSize labelSize = MB_TEXTSIZE(label.text, label.font); - labelSize.width = MIN(labelSize.width, maxWidth); - totalSize.width = MAX(totalSize.width, labelSize.width); - totalSize.height += labelSize.height; - if (labelSize.height > 0.f && indicatorF.size.height > 0.f) { - totalSize.height += kPadding; - } - - CGFloat remainingHeight = bounds.size.height - totalSize.height - kPadding - 4 * margin; - CGSize maxSize = CGSizeMake(maxWidth, remainingHeight); - CGSize detailsLabelSize = MB_MULTILINE_TEXTSIZE(detailsLabel.text, detailsLabel.font, maxSize, detailsLabel.lineBreakMode); - totalSize.width = MAX(totalSize.width, detailsLabelSize.width); - totalSize.height += detailsLabelSize.height; - if (detailsLabelSize.height > 0.f && (indicatorF.size.height > 0.f || labelSize.height > 0.f)) { - totalSize.height += kPadding; - } - - totalSize.width += 2 * margin; - totalSize.height += 2 * margin; - - // Position elements - CGFloat yPos = round(((bounds.size.height - totalSize.height) / 2)) + margin + yOffset; - CGFloat xPos = xOffset; - indicatorF.origin.y = yPos; - indicatorF.origin.x = round((bounds.size.width - indicatorF.size.width) / 2) + xPos; - indicator.frame = indicatorF; - yPos += indicatorF.size.height; - - if (labelSize.height > 0.f && indicatorF.size.height > 0.f) { - yPos += kPadding; - } - CGRect labelF; - labelF.origin.y = yPos; - labelF.origin.x = round((bounds.size.width - labelSize.width) / 2) + xPos; - labelF.size = labelSize; - label.frame = labelF; - yPos += labelF.size.height; - - if (detailsLabelSize.height > 0.f && (indicatorF.size.height > 0.f || labelSize.height > 0.f)) { - yPos += kPadding; - } - CGRect detailsLabelF; - detailsLabelF.origin.y = yPos; - detailsLabelF.origin.x = round((bounds.size.width - detailsLabelSize.width) / 2) + xPos; - detailsLabelF.size = detailsLabelSize; - detailsLabel.frame = detailsLabelF; - - // Enforce minsize and quare rules - if (square) { - CGFloat max = MAX(totalSize.width, totalSize.height); - if (max <= bounds.size.width - 2 * margin) { - totalSize.width = max; - } - if (max <= bounds.size.height - 2 * margin) { - totalSize.height = max; - } - } - if (totalSize.width < minSize.width) { - totalSize.width = minSize.width; - } - if (totalSize.height < minSize.height) { - totalSize.height = minSize.height; - } - - size = totalSize; -} - -#pragma mark BG Drawing +- (void)setContentColor:(UIColor *)contentColor { + if (contentColor != _contentColor && ![contentColor isEqual:_contentColor]) { + _contentColor = contentColor; + [self updateViewsForColor:contentColor]; + } +} -- (void)drawRect:(CGRect)rect { - - CGContextRef context = UIGraphicsGetCurrentContext(); - UIGraphicsPushContext(context); - - if (self.dimBackground) { - //Gradient colours - size_t gradLocationsNum = 2; - CGFloat gradLocations[2] = {0.0f, 1.0f}; - CGFloat gradColors[8] = {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.75f}; - CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); - CGGradientRef gradient = CGGradientCreateWithColorComponents(colorSpace, gradColors, gradLocations, gradLocationsNum); - CGColorSpaceRelease(colorSpace); - //Gradient center - CGPoint gradCenter= CGPointMake(self.bounds.size.width/2, self.bounds.size.height/2); - //Gradient radius - float gradRadius = MIN(self.bounds.size.width , self.bounds.size.height) ; - //Gradient draw - CGContextDrawRadialGradient (context, gradient, gradCenter, - 0, gradCenter, gradRadius, - kCGGradientDrawsAfterEndLocation); - CGGradientRelease(gradient); - } - - // Set background rect color - if (self.color) { - CGContextSetFillColorWithColor(context, self.color.CGColor); - } else { - CGContextSetGrayFillColor(context, 0.0f, self.opacity); - } - - - // Center HUD - CGRect allRect = self.bounds; - // Draw rounded HUD backgroud rect - CGRect boxRect = CGRectMake(round((allRect.size.width - size.width) / 2) + self.xOffset, - round((allRect.size.height - size.height) / 2) + self.yOffset, size.width, size.height); - float radius = self.cornerRadius; - CGContextBeginPath(context); - CGContextMoveToPoint(context, CGRectGetMinX(boxRect) + radius, CGRectGetMinY(boxRect)); - CGContextAddArc(context, CGRectGetMaxX(boxRect) - radius, CGRectGetMinY(boxRect) + radius, radius, 3 * (float)M_PI / 2, 0, 0); - CGContextAddArc(context, CGRectGetMaxX(boxRect) - radius, CGRectGetMaxY(boxRect) - radius, radius, 0, (float)M_PI / 2, 0); - CGContextAddArc(context, CGRectGetMinX(boxRect) + radius, CGRectGetMaxY(boxRect) - radius, radius, (float)M_PI / 2, (float)M_PI, 0); - CGContextAddArc(context, CGRectGetMinX(boxRect) + radius, CGRectGetMinY(boxRect) + radius, radius, (float)M_PI, 3 * (float)M_PI / 2, 0); - CGContextClosePath(context); - CGContextFillPath(context); - - UIGraphicsPopContext(); -} - -#pragma mark - KVO - -- (void)registerForKVO { - for (NSString *keyPath in [self observableKeypaths]) { - [self addObserver:self forKeyPath:keyPath options:NSKeyValueObservingOptionNew context:NULL]; - } -} - -- (void)unregisterFromKVO { - for (NSString *keyPath in [self observableKeypaths]) { - [self removeObserver:self forKeyPath:keyPath]; - } -} - -- (NSArray *)observableKeypaths { - return [NSArray arrayWithObjects:@"mode", @"customView", @"labelText", @"labelFont", @"labelColor", - @"detailsLabelText", @"detailsLabelFont", @"detailsLabelColor", @"progress", @"activityIndicatorColor", nil]; -} - -- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { - if (![NSThread isMainThread]) { - [self performSelectorOnMainThread:@selector(updateUIForKeypath:) withObject:keyPath waitUntilDone:NO]; - } else { - [self updateUIForKeypath:keyPath]; - } -} - -- (void)updateUIForKeypath:(NSString *)keyPath { - if ([keyPath isEqualToString:@"mode"] || [keyPath isEqualToString:@"customView"] || - [keyPath isEqualToString:@"activityIndicatorColor"]) { - [self updateIndicators]; - } else if ([keyPath isEqualToString:@"labelText"]) { - label.text = self.labelText; - } else if ([keyPath isEqualToString:@"labelFont"]) { - label.font = self.labelFont; - } else if ([keyPath isEqualToString:@"labelColor"]) { - label.textColor = self.labelColor; - } else if ([keyPath isEqualToString:@"detailsLabelText"]) { - detailsLabel.text = self.detailsLabelText; - } else if ([keyPath isEqualToString:@"detailsLabelFont"]) { - detailsLabel.font = self.detailsLabelFont; - } else if ([keyPath isEqualToString:@"detailsLabelColor"]) { - detailsLabel.textColor = self.detailsLabelColor; - } else if ([keyPath isEqualToString:@"progress"]) { - if ([indicator respondsToSelector:@selector(setProgress:)]) { - [(id)indicator setValue:@(progress) forKey:@"progress"]; - } - return; - } - [self setNeedsLayout]; - [self setNeedsDisplay]; +- (void)setDefaultMotionEffectsEnabled:(BOOL)defaultMotionEffectsEnabled { + if (defaultMotionEffectsEnabled != _defaultMotionEffectsEnabled) { + _defaultMotionEffectsEnabled = defaultMotionEffectsEnabled; + [self updateBezelMotionEffects]; + } +} + +#pragma mark - NSProgress + +- (void)setNSProgressDisplayLinkEnabled:(BOOL)enabled { + // We're using CADisplayLink, because NSProgress can change very quickly and observing it may starve the main thread, + // so we're refreshing the progress only every frame draw + if (enabled && self.progressObject) { + // Only create if not already active. + if (!self.progressObjectDisplayLink) { + self.progressObjectDisplayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(updateProgressFromProgressObject)]; + } + } else { + self.progressObjectDisplayLink = nil; + } +} + +- (void)updateProgressFromProgressObject { + self.progress = self.progressObject.fractionCompleted; } #pragma mark - Notifications - (void)registerForNotifications { #if !TARGET_OS_TV - NSNotificationCenter *nc = [NSNotificationCenter defaultCenter]; + NSNotificationCenter *nc = [NSNotificationCenter defaultCenter]; - [nc addObserver:self selector:@selector(statusBarOrientationDidChange:) + [nc addObserver:self selector:@selector(statusBarOrientationDidChange:) name:UIApplicationDidChangeStatusBarOrientationNotification object:nil]; #endif } - (void)unregisterFromNotifications { #if !TARGET_OS_TV - NSNotificationCenter *nc = [NSNotificationCenter defaultCenter]; + NSNotificationCenter *nc = [NSNotificationCenter defaultCenter]; [nc removeObserver:self name:UIApplicationDidChangeStatusBarOrientationNotification object:nil]; #endif } #if !TARGET_OS_TV - (void)statusBarOrientationDidChange:(NSNotification *)notification { - UIView *superview = self.superview; - if (!superview) { - return; - } else { - [self updateForCurrentOrientationAnimated:YES]; - } + UIView *superview = self.superview; + if (!superview) { + return; + } else { + [self updateForCurrentOrientationAnimated:YES]; + } } #endif @@ -747,37 +785,39 @@ - (void)updateForCurrentOrientationAnimated:(BOOL)animated { // Stay in sync with the superview in any case if (self.superview) { self.bounds = self.superview.bounds; - [self setNeedsDisplay]; } // Not needed on iOS 8+, compile out when the deployment target allows, // to avoid sharedApplication problems on extension targets #if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000 - // Only needed pre iOS 7 when added to a window + // Only needed pre iOS 8 when added to a window BOOL iOS8OrLater = kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_8_0; if (iOS8OrLater || ![self.superview isKindOfClass:[UIWindow class]]) return; - UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation; - CGFloat radians = 0; - if (UIInterfaceOrientationIsLandscape(orientation)) { - if (orientation == UIInterfaceOrientationLandscapeLeft) { radians = -(CGFloat)M_PI_2; } - else { radians = (CGFloat)M_PI_2; } - // Window coordinates differ! - self.bounds = CGRectMake(0, 0, self.bounds.size.height, self.bounds.size.width); - } else { - if (orientation == UIInterfaceOrientationPortraitUpsideDown) { radians = (CGFloat)M_PI; } - else { radians = 0; } - } - rotationTransform = CGAffineTransformMakeRotation(radians); - - if (animated) { - [UIView beginAnimations:nil context:nil]; - [UIView setAnimationDuration:0.3]; - } - [self setTransform:rotationTransform]; - if (animated) { - [UIView commitAnimations]; - } + // Make extension friendly. Will not get called on extensions (iOS 8+) due to the above check. + // This just ensures we don't get a warning about extension-unsafe API. + Class UIApplicationClass = NSClassFromString(@"UIApplication"); + if (!UIApplicationClass || ![UIApplicationClass respondsToSelector:@selector(sharedApplication)]) return; + + UIApplication *application = [UIApplication performSelector:@selector(sharedApplication)]; + UIInterfaceOrientation orientation = application.statusBarOrientation; + CGFloat radians = 0; + + if (UIInterfaceOrientationIsLandscape(orientation)) { + radians = orientation == UIInterfaceOrientationLandscapeLeft ? -(CGFloat)M_PI_2 : (CGFloat)M_PI_2; + // Window coordinates differ! + self.bounds = CGRectMake(0, 0, self.bounds.size.height, self.bounds.size.width); + } else { + radians = orientation == UIInterfaceOrientationPortraitUpsideDown ? (CGFloat)M_PI : 0.f; + } + + if (animated) { + [UIView animateWithDuration:0.3 animations:^{ + self.transform = CGAffineTransformMakeRotation(radians); + }]; + } else { + self.transform = CGAffineTransformMakeRotation(radians); + } #endif } @@ -789,102 +829,117 @@ @implementation MBRoundProgressView #pragma mark - Lifecycle - (id)init { - return [self initWithFrame:CGRectMake(0.f, 0.f, 37.f, 37.f)]; + return [self initWithFrame:CGRectMake(0.f, 0.f, 37.f, 37.f)]; } - (id)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - self.backgroundColor = [UIColor clearColor]; - self.opaque = NO; - _progress = 0.f; - _annular = NO; - _progressTintColor = [[UIColor alloc] initWithWhite:1.f alpha:1.f]; - _backgroundTintColor = [[UIColor alloc] initWithWhite:1.f alpha:.1f]; - [self registerForKVO]; - } - return self; + self = [super initWithFrame:frame]; + if (self) { + self.backgroundColor = [UIColor clearColor]; + self.opaque = NO; + _progress = 0.f; + _annular = NO; + _progressTintColor = [[UIColor alloc] initWithWhite:1.f alpha:1.f]; + _backgroundTintColor = [[UIColor alloc] initWithWhite:1.f alpha:.1f]; + } + return self; } -- (void)dealloc { - [self unregisterFromKVO]; -#if !__has_feature(objc_arc) - [_progressTintColor release]; - [_backgroundTintColor release]; - [super dealloc]; -#endif +#pragma mark - Layout + +- (CGSize)intrinsicContentSize { + return CGSizeMake(37.f, 37.f); +} + +#pragma mark - Properties + +- (void)setProgress:(float)progress { + if (progress != _progress) { + _progress = progress; + [self setNeedsDisplay]; + } +} + +- (void)setProgressTintColor:(UIColor *)progressTintColor { + NSAssert(progressTintColor, @"The color should not be nil."); + if (progressTintColor != _progressTintColor && ![progressTintColor isEqual:_progressTintColor]) { + _progressTintColor = progressTintColor; + [self setNeedsDisplay]; + } +} + +- (void)setBackgroundTintColor:(UIColor *)backgroundTintColor { + NSAssert(backgroundTintColor, @"The color should not be nil."); + if (backgroundTintColor != _backgroundTintColor && ![backgroundTintColor isEqual:_backgroundTintColor]) { + _backgroundTintColor = backgroundTintColor; + [self setNeedsDisplay]; + } } #pragma mark - Drawing - (void)drawRect:(CGRect)rect { - - CGRect allRect = self.bounds; - CGRect circleRect = CGRectInset(allRect, 2.0f, 2.0f); - CGContextRef context = UIGraphicsGetCurrentContext(); - - if (_annular) { - // Draw background - BOOL isPreiOS7 = kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iOS_7_0; - CGFloat lineWidth = isPreiOS7 ? 5.f : 2.f; - UIBezierPath *processBackgroundPath = [UIBezierPath bezierPath]; - processBackgroundPath.lineWidth = lineWidth; - processBackgroundPath.lineCapStyle = kCGLineCapButt; - CGPoint center = CGPointMake(self.bounds.size.width/2, self.bounds.size.height/2); - CGFloat radius = (self.bounds.size.width - lineWidth)/2; - CGFloat startAngle = - ((float)M_PI / 2); // 90 degrees - CGFloat endAngle = (2 * (float)M_PI) + startAngle; - [processBackgroundPath addArcWithCenter:center radius:radius startAngle:startAngle endAngle:endAngle clockwise:YES]; - [_backgroundTintColor set]; - [processBackgroundPath stroke]; - // Draw progress - UIBezierPath *processPath = [UIBezierPath bezierPath]; - processPath.lineCapStyle = isPreiOS7 ? kCGLineCapRound : kCGLineCapSquare; - processPath.lineWidth = lineWidth; - endAngle = (self.progress * 2 * (float)M_PI) + startAngle; - [processPath addArcWithCenter:center radius:radius startAngle:startAngle endAngle:endAngle clockwise:YES]; - [_progressTintColor set]; - [processPath stroke]; - } else { - // Draw background - [_progressTintColor setStroke]; - [_backgroundTintColor setFill]; - CGContextSetLineWidth(context, 2.0f); - CGContextFillEllipseInRect(context, circleRect); - CGContextStrokeEllipseInRect(context, circleRect); - // Draw progress - CGPoint center = CGPointMake(allRect.size.width / 2, allRect.size.height / 2); - CGFloat radius = (allRect.size.width - 4) / 2; - CGFloat startAngle = - ((float)M_PI / 2); // 90 degrees - CGFloat endAngle = (self.progress * 2 * (float)M_PI) + startAngle; - [_progressTintColor setFill]; - CGContextMoveToPoint(context, center.x, center.y); - CGContextAddArc(context, center.x, center.y, radius, startAngle, endAngle, 0); - CGContextClosePath(context); - CGContextFillPath(context); - } -} - -#pragma mark - KVO - -- (void)registerForKVO { - for (NSString *keyPath in [self observableKeypaths]) { - [self addObserver:self forKeyPath:keyPath options:NSKeyValueObservingOptionNew context:NULL]; - } -} - -- (void)unregisterFromKVO { - for (NSString *keyPath in [self observableKeypaths]) { - [self removeObserver:self forKeyPath:keyPath]; - } -} - -- (NSArray *)observableKeypaths { - return [NSArray arrayWithObjects:@"progressTintColor", @"backgroundTintColor", @"progress", @"annular", nil]; -} - -- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { - [self setNeedsDisplay]; + CGContextRef context = UIGraphicsGetCurrentContext(); + BOOL isPreiOS7 = kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iOS_7_0; + + if (_annular) { + // Draw background + CGFloat lineWidth = isPreiOS7 ? 5.f : 2.f; + UIBezierPath *processBackgroundPath = [UIBezierPath bezierPath]; + processBackgroundPath.lineWidth = lineWidth; + processBackgroundPath.lineCapStyle = kCGLineCapButt; + CGPoint center = CGPointMake(CGRectGetMidX(self.bounds), CGRectGetMidY(self.bounds)); + CGFloat radius = (self.bounds.size.width - lineWidth)/2; + CGFloat startAngle = - ((float)M_PI / 2); // 90 degrees + CGFloat endAngle = (2 * (float)M_PI) + startAngle; + [processBackgroundPath addArcWithCenter:center radius:radius startAngle:startAngle endAngle:endAngle clockwise:YES]; + [_backgroundTintColor set]; + [processBackgroundPath stroke]; + // Draw progress + UIBezierPath *processPath = [UIBezierPath bezierPath]; + processPath.lineCapStyle = isPreiOS7 ? kCGLineCapRound : kCGLineCapSquare; + processPath.lineWidth = lineWidth; + endAngle = (self.progress * 2 * (float)M_PI) + startAngle; + [processPath addArcWithCenter:center radius:radius startAngle:startAngle endAngle:endAngle clockwise:YES]; + [_progressTintColor set]; + [processPath stroke]; + } else { + // Draw background + CGFloat lineWidth = 2.f; + CGRect allRect = self.bounds; + CGRect circleRect = CGRectInset(allRect, lineWidth/2.f, lineWidth/2.f); + CGPoint center = CGPointMake(CGRectGetMidX(self.bounds), CGRectGetMidY(self.bounds)); + [_progressTintColor setStroke]; + [_backgroundTintColor setFill]; + CGContextSetLineWidth(context, lineWidth); + if (isPreiOS7) { + CGContextFillEllipseInRect(context, circleRect); + } + CGContextStrokeEllipseInRect(context, circleRect); + // 90 degrees + CGFloat startAngle = - ((float)M_PI / 2.f); + // Draw progress + if (isPreiOS7) { + CGFloat radius = (CGRectGetWidth(self.bounds) / 2.f) - lineWidth; + CGFloat endAngle = (self.progress * 2.f * (float)M_PI) + startAngle; + [_progressTintColor setFill]; + CGContextMoveToPoint(context, center.x, center.y); + CGContextAddArc(context, center.x, center.y, radius, startAngle, endAngle, 0); + CGContextClosePath(context); + CGContextFillPath(context); + } else { + UIBezierPath *processPath = [UIBezierPath bezierPath]; + processPath.lineCapStyle = kCGLineCapButt; + processPath.lineWidth = lineWidth * 2.f; + CGFloat radius = (CGRectGetWidth(self.bounds) / 2.f) - (processPath.lineWidth / 2.f); + CGFloat endAngle = (self.progress * 2.f * (float)M_PI) + startAngle; + [processPath addArcWithCenter:center radius:radius startAngle:startAngle endAngle:endAngle clockwise:YES]; + // Ensure that we don't get color overlaping when _progressTintColor alpha < 1.f. + CGContextSetBlendMode(context, kCGBlendModeCopy); + [_progressTintColor set]; + [processPath stroke]; + } + } } @end @@ -895,139 +950,535 @@ @implementation MBBarProgressView #pragma mark - Lifecycle - (id)init { - return [self initWithFrame:CGRectMake(.0f, .0f, 120.0f, 20.0f)]; + return [self initWithFrame:CGRectMake(.0f, .0f, 120.0f, 20.0f)]; } - (id)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { - _progress = 0.f; - _lineColor = [UIColor whiteColor]; - _progressColor = [UIColor whiteColor]; - _progressRemainingColor = [UIColor clearColor]; - self.backgroundColor = [UIColor clearColor]; - self.opaque = NO; - [self registerForKVO]; - } - return self; + self = [super initWithFrame:frame]; + if (self) { + _progress = 0.f; + _lineColor = [UIColor whiteColor]; + _progressColor = [UIColor whiteColor]; + _progressRemainingColor = [UIColor clearColor]; + self.backgroundColor = [UIColor clearColor]; + self.opaque = NO; + } + return self; } -- (void)dealloc { - [self unregisterFromKVO]; -#if !__has_feature(objc_arc) - [_lineColor release]; - [_progressColor release]; - [_progressRemainingColor release]; - [super dealloc]; -#endif +#pragma mark - Layout + +- (CGSize)intrinsicContentSize { + BOOL isPreiOS7 = kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iOS_7_0; + return CGSizeMake(120.f, isPreiOS7 ? 20.f : 10.f); +} + +#pragma mark - Properties + +- (void)setProgress:(float)progress { + if (progress != _progress) { + _progress = progress; + [self setNeedsDisplay]; + } +} + +- (void)setProgressColor:(UIColor *)progressColor { + NSAssert(progressColor, @"The color should not be nil."); + if (progressColor != _progressColor && ![progressColor isEqual:_progressColor]) { + _progressColor = progressColor; + [self setNeedsDisplay]; + } +} + +- (void)setProgressRemainingColor:(UIColor *)progressRemainingColor { + NSAssert(progressRemainingColor, @"The color should not be nil."); + if (progressRemainingColor != _progressRemainingColor && ![progressRemainingColor isEqual:_progressRemainingColor]) { + _progressRemainingColor = progressRemainingColor; + [self setNeedsDisplay]; + } } #pragma mark - Drawing - (void)drawRect:(CGRect)rect { - CGContextRef context = UIGraphicsGetCurrentContext(); - - CGContextSetLineWidth(context, 2); - CGContextSetStrokeColorWithColor(context,[_lineColor CGColor]); - CGContextSetFillColorWithColor(context, [_progressRemainingColor CGColor]); - - // Draw background - float radius = (rect.size.height / 2) - 2; - CGContextMoveToPoint(context, 2, rect.size.height/2); - CGContextAddArcToPoint(context, 2, 2, radius + 2, 2, radius); - CGContextAddLineToPoint(context, rect.size.width - radius - 2, 2); - CGContextAddArcToPoint(context, rect.size.width - 2, 2, rect.size.width - 2, rect.size.height / 2, radius); - CGContextAddArcToPoint(context, rect.size.width - 2, rect.size.height - 2, rect.size.width - radius - 2, rect.size.height - 2, radius); - CGContextAddLineToPoint(context, radius + 2, rect.size.height - 2); - CGContextAddArcToPoint(context, 2, rect.size.height - 2, 2, rect.size.height/2, radius); - CGContextFillPath(context); - - // Draw border - CGContextMoveToPoint(context, 2, rect.size.height/2); - CGContextAddArcToPoint(context, 2, 2, radius + 2, 2, radius); - CGContextAddLineToPoint(context, rect.size.width - radius - 2, 2); - CGContextAddArcToPoint(context, rect.size.width - 2, 2, rect.size.width - 2, rect.size.height / 2, radius); - CGContextAddArcToPoint(context, rect.size.width - 2, rect.size.height - 2, rect.size.width - radius - 2, rect.size.height - 2, radius); - CGContextAddLineToPoint(context, radius + 2, rect.size.height - 2); - CGContextAddArcToPoint(context, 2, rect.size.height - 2, 2, rect.size.height/2, radius); - CGContextStrokePath(context); - - CGContextSetFillColorWithColor(context, [_progressColor CGColor]); - radius = radius - 2; - float amount = self.progress * rect.size.width; - - // Progress in the middle area - if (amount >= radius + 4 && amount <= (rect.size.width - radius - 4)) { - CGContextMoveToPoint(context, 4, rect.size.height/2); - CGContextAddArcToPoint(context, 4, 4, radius + 4, 4, radius); - CGContextAddLineToPoint(context, amount, 4); - CGContextAddLineToPoint(context, amount, radius + 4); - - CGContextMoveToPoint(context, 4, rect.size.height/2); - CGContextAddArcToPoint(context, 4, rect.size.height - 4, radius + 4, rect.size.height - 4, radius); - CGContextAddLineToPoint(context, amount, rect.size.height - 4); - CGContextAddLineToPoint(context, amount, radius + 4); - - CGContextFillPath(context); - } - - // Progress in the right arc - else if (amount > radius + 4) { - float x = amount - (rect.size.width - radius - 4); - - CGContextMoveToPoint(context, 4, rect.size.height/2); - CGContextAddArcToPoint(context, 4, 4, radius + 4, 4, radius); - CGContextAddLineToPoint(context, rect.size.width - radius - 4, 4); - float angle = -acos(x/radius); - if (isnan(angle)) angle = 0; - CGContextAddArc(context, rect.size.width - radius - 4, rect.size.height/2, radius, M_PI, angle, 0); - CGContextAddLineToPoint(context, amount, rect.size.height/2); - - CGContextMoveToPoint(context, 4, rect.size.height/2); - CGContextAddArcToPoint(context, 4, rect.size.height - 4, radius + 4, rect.size.height - 4, radius); - CGContextAddLineToPoint(context, rect.size.width - radius - 4, rect.size.height - 4); - angle = acos(x/radius); - if (isnan(angle)) angle = 0; - CGContextAddArc(context, rect.size.width - radius - 4, rect.size.height/2, radius, -M_PI, angle, 1); - CGContextAddLineToPoint(context, amount, rect.size.height/2); - - CGContextFillPath(context); - } - - // Progress is in the left arc - else if (amount < radius + 4 && amount > 0) { - CGContextMoveToPoint(context, 4, rect.size.height/2); - CGContextAddArcToPoint(context, 4, 4, radius + 4, 4, radius); - CGContextAddLineToPoint(context, radius + 4, rect.size.height/2); - - CGContextMoveToPoint(context, 4, rect.size.height/2); - CGContextAddArcToPoint(context, 4, rect.size.height - 4, radius + 4, rect.size.height - 4, radius); - CGContextAddLineToPoint(context, radius + 4, rect.size.height/2); - - CGContextFillPath(context); - } -} - -#pragma mark - KVO - -- (void)registerForKVO { - for (NSString *keyPath in [self observableKeypaths]) { - [self addObserver:self forKeyPath:keyPath options:NSKeyValueObservingOptionNew context:NULL]; - } -} - -- (void)unregisterFromKVO { - for (NSString *keyPath in [self observableKeypaths]) { - [self removeObserver:self forKeyPath:keyPath]; - } -} - -- (NSArray *)observableKeypaths { - return [NSArray arrayWithObjects:@"lineColor", @"progressRemainingColor", @"progressColor", @"progress", nil]; -} - -- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { - [self setNeedsDisplay]; + CGContextRef context = UIGraphicsGetCurrentContext(); + + CGContextSetLineWidth(context, 2); + CGContextSetStrokeColorWithColor(context,[_lineColor CGColor]); + CGContextSetFillColorWithColor(context, [_progressRemainingColor CGColor]); + + // Draw background + CGFloat radius = (rect.size.height / 2) - 2; + CGContextMoveToPoint(context, 2, rect.size.height/2); + CGContextAddArcToPoint(context, 2, 2, radius + 2, 2, radius); + CGContextAddLineToPoint(context, rect.size.width - radius - 2, 2); + CGContextAddArcToPoint(context, rect.size.width - 2, 2, rect.size.width - 2, rect.size.height / 2, radius); + CGContextAddArcToPoint(context, rect.size.width - 2, rect.size.height - 2, rect.size.width - radius - 2, rect.size.height - 2, radius); + CGContextAddLineToPoint(context, radius + 2, rect.size.height - 2); + CGContextAddArcToPoint(context, 2, rect.size.height - 2, 2, rect.size.height/2, radius); + CGContextFillPath(context); + + // Draw border + CGContextMoveToPoint(context, 2, rect.size.height/2); + CGContextAddArcToPoint(context, 2, 2, radius + 2, 2, radius); + CGContextAddLineToPoint(context, rect.size.width - radius - 2, 2); + CGContextAddArcToPoint(context, rect.size.width - 2, 2, rect.size.width - 2, rect.size.height / 2, radius); + CGContextAddArcToPoint(context, rect.size.width - 2, rect.size.height - 2, rect.size.width - radius - 2, rect.size.height - 2, radius); + CGContextAddLineToPoint(context, radius + 2, rect.size.height - 2); + CGContextAddArcToPoint(context, 2, rect.size.height - 2, 2, rect.size.height/2, radius); + CGContextStrokePath(context); + + CGContextSetFillColorWithColor(context, [_progressColor CGColor]); + radius = radius - 2; + CGFloat amount = self.progress * rect.size.width; + + // Progress in the middle area + if (amount >= radius + 4 && amount <= (rect.size.width - radius - 4)) { + CGContextMoveToPoint(context, 4, rect.size.height/2); + CGContextAddArcToPoint(context, 4, 4, radius + 4, 4, radius); + CGContextAddLineToPoint(context, amount, 4); + CGContextAddLineToPoint(context, amount, radius + 4); + + CGContextMoveToPoint(context, 4, rect.size.height/2); + CGContextAddArcToPoint(context, 4, rect.size.height - 4, radius + 4, rect.size.height - 4, radius); + CGContextAddLineToPoint(context, amount, rect.size.height - 4); + CGContextAddLineToPoint(context, amount, radius + 4); + + CGContextFillPath(context); + } + + // Progress in the right arc + else if (amount > radius + 4) { + CGFloat x = amount - (rect.size.width - radius - 4); + + CGContextMoveToPoint(context, 4, rect.size.height/2); + CGContextAddArcToPoint(context, 4, 4, radius + 4, 4, radius); + CGContextAddLineToPoint(context, rect.size.width - radius - 4, 4); + CGFloat angle = -acos(x/radius); + if (isnan(angle)) angle = 0; + CGContextAddArc(context, rect.size.width - radius - 4, rect.size.height/2, radius, M_PI, angle, 0); + CGContextAddLineToPoint(context, amount, rect.size.height/2); + + CGContextMoveToPoint(context, 4, rect.size.height/2); + CGContextAddArcToPoint(context, 4, rect.size.height - 4, radius + 4, rect.size.height - 4, radius); + CGContextAddLineToPoint(context, rect.size.width - radius - 4, rect.size.height - 4); + angle = acos(x/radius); + if (isnan(angle)) angle = 0; + CGContextAddArc(context, rect.size.width - radius - 4, rect.size.height/2, radius, -M_PI, angle, 1); + CGContextAddLineToPoint(context, amount, rect.size.height/2); + + CGContextFillPath(context); + } + + // Progress is in the left arc + else if (amount < radius + 4 && amount > 0) { + CGContextMoveToPoint(context, 4, rect.size.height/2); + CGContextAddArcToPoint(context, 4, 4, radius + 4, 4, radius); + CGContextAddLineToPoint(context, radius + 4, rect.size.height/2); + + CGContextMoveToPoint(context, 4, rect.size.height/2); + CGContextAddArcToPoint(context, 4, rect.size.height - 4, radius + 4, rect.size.height - 4, radius); + CGContextAddLineToPoint(context, radius + 4, rect.size.height/2); + + CGContextFillPath(context); + } +} + +@end + + +@interface MBBackgroundView () + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000 || TARGET_OS_TV +@property UIVisualEffectView *effectView; +#endif +#if !TARGET_OS_TV +@property UIToolbar *toolbar; +#endif + +@end + + +@implementation MBBackgroundView + +#pragma mark - Lifecycle + +- (instancetype)initWithFrame:(CGRect)frame { + if ((self = [super initWithFrame:frame])) { + if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_7_0) { + _style = MBProgressHUDBackgroundStyleBlur; + if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_8_0) { + _color = [UIColor colorWithWhite:0.8f alpha:0.6f]; + } else { + _color = [UIColor colorWithWhite:0.95f alpha:0.6f]; + } + } else { + _style = MBProgressHUDBackgroundStyleSolidColor; + _color = [[UIColor blackColor] colorWithAlphaComponent:0.8]; + } + + self.clipsToBounds = YES; + + [self updateForBackgroundStyle]; + } + return self; +} + +#pragma mark - Layout + +- (CGSize)intrinsicContentSize { + // Smallest size possible. Content pushes against this. + return CGSizeZero; +} + +#pragma mark - Appearance + +- (void)setStyle:(MBProgressHUDBackgroundStyle)style { + if (style == MBProgressHUDBackgroundStyleBlur && kCFCoreFoundationVersionNumber < kCFCoreFoundationVersionNumber_iOS_7_0) { + style = MBProgressHUDBackgroundStyleSolidColor; + } + if (_style != style) { + _style = style; + [self updateForBackgroundStyle]; + } +} + +- (void)setColor:(UIColor *)color { + NSAssert(color, @"The color should not be nil."); + if (color != _color && ![color isEqual:_color]) { + _color = color; + [self updateViewsForColor:color]; + } +} + +/////////////////////////////////////////////////////////////////////////////////////////// +#pragma mark - Views + +- (void)updateForBackgroundStyle { + MBProgressHUDBackgroundStyle style = self.style; + if (style == MBProgressHUDBackgroundStyleBlur) { +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000 || TARGET_OS_TV + if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_8_0) { + UIBlurEffect *effect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]; + UIVisualEffectView *effectView = [[UIVisualEffectView alloc] initWithEffect:effect]; + [self addSubview:effectView]; + effectView.frame = self.bounds; + effectView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth; + self.backgroundColor = self.color; + self.layer.allowsGroupOpacity = NO; + self.effectView = effectView; + } else { +#endif +#if !TARGET_OS_TV + UIToolbar *toolbar = [[UIToolbar alloc] initWithFrame:CGRectInset(self.bounds, -100.f, -100.f)]; + toolbar.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth; + toolbar.barTintColor = self.color; + toolbar.translucent = YES; + [self addSubview:toolbar]; + self.toolbar = toolbar; +#endif +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000 || TARGET_OS_TV + } +#endif + } else { +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000 || TARGET_OS_TV + if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_8_0) { + [self.effectView removeFromSuperview]; + self.effectView = nil; + } else { +#endif +#if !TARGET_OS_TV + [self.toolbar removeFromSuperview]; + self.toolbar = nil; +#endif +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000 || TARGET_OS_TV + } +#endif + self.backgroundColor = self.color; + } +} + +- (void)updateViewsForColor:(UIColor *)color { + if (self.style == MBProgressHUDBackgroundStyleBlur) { + if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_8_0) { + self.backgroundColor = self.color; + } else { +#if !TARGET_OS_TV + self.toolbar.barTintColor = color; +#endif + } + } else { + self.backgroundColor = self.color; + } +} + +@end + + +@implementation MBProgressHUD (Deprecated) + +#pragma mark - Class + ++ (NSUInteger)hideAllHUDsForView:(UIView *)view animated:(BOOL)animated { + NSArray *huds = [MBProgressHUD allHUDsForView:view]; + for (MBProgressHUD *hud in huds) { + hud.removeFromSuperViewOnHide = YES; + [hud hideAnimated:animated]; + } + return [huds count]; +} + ++ (NSArray *)allHUDsForView:(UIView *)view { + NSMutableArray *huds = [NSMutableArray array]; + NSArray *subviews = view.subviews; + for (UIView *aView in subviews) { + if ([aView isKindOfClass:self]) { + [huds addObject:aView]; + } + } + return [NSArray arrayWithArray:huds]; +} + +#pragma mark - Lifecycle + +- (id)initWithWindow:(UIWindow *)window { + return [self initWithView:window]; +} + +#pragma mark - Show & hide + +- (void)show:(BOOL)animated { + [self showAnimated:animated]; +} + +- (void)hide:(BOOL)animated { + [self hideAnimated:animated]; +} + +- (void)hide:(BOOL)animated afterDelay:(NSTimeInterval)delay { + [self hideAnimated:animated afterDelay:delay]; +} + +#pragma mark - Threading + +- (void)showWhileExecuting:(SEL)method onTarget:(id)target withObject:(id)object animated:(BOOL)animated { + [self showAnimated:animated whileExecutingBlock:^{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Warc-performSelector-leaks" + // Start executing the requested task + [target performSelector:method withObject:object]; +#pragma clang diagnostic pop + }]; +} + +- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block { + dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); + [self showAnimated:animated whileExecutingBlock:block onQueue:queue completionBlock:NULL]; +} + +- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block completionBlock:(void (^)())completion { + dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); + [self showAnimated:animated whileExecutingBlock:block onQueue:queue completionBlock:completion]; +} + +- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block onQueue:(dispatch_queue_t)queue { + [self showAnimated:animated whileExecutingBlock:block onQueue:queue completionBlock:NULL]; +} + +- (void)showAnimated:(BOOL)animated whileExecutingBlock:(dispatch_block_t)block onQueue:(dispatch_queue_t)queue completionBlock:(nullable MBProgressHUDCompletionBlock)completion { + self.taskInProgress = YES; + self.completionBlock = completion; + dispatch_async(queue, ^(void) { + block(); + dispatch_async(dispatch_get_main_queue(), ^(void) { + [self cleanUp]; + }); + }); + [self showAnimated:animated]; +} + +- (void)cleanUp { + self.taskInProgress = NO; + [self hideAnimated:self.useAnimation]; +} + +#pragma mark - Labels + +- (NSString *)labelText { + return self.label.text; +} + +- (void)setLabelText:(NSString *)labelText { + MBMainThreadAssert(); + self.label.text = labelText; +} + +- (UIFont *)labelFont { + return self.label.font; +} + +- (void)setLabelFont:(UIFont *)labelFont { + MBMainThreadAssert(); + self.label.font = labelFont; +} + +- (UIColor *)labelColor { + return self.label.textColor; +} + +- (void)setLabelColor:(UIColor *)labelColor { + MBMainThreadAssert(); + self.label.textColor = labelColor; +} + +- (NSString *)detailsLabelText { + return self.detailsLabel.text; +} + +- (void)setDetailsLabelText:(NSString *)detailsLabelText { + MBMainThreadAssert(); + self.detailsLabel.text = detailsLabelText; +} + +- (UIFont *)detailsLabelFont { + return self.detailsLabel.font; +} + +- (void)setDetailsLabelFont:(UIFont *)detailsLabelFont { + MBMainThreadAssert(); + self.detailsLabel.font = detailsLabelFont; +} + +- (UIColor *)detailsLabelColor { + return self.detailsLabel.textColor; +} + +- (void)setDetailsLabelColor:(UIColor *)detailsLabelColor { + MBMainThreadAssert(); + self.detailsLabel.textColor = detailsLabelColor; +} + +- (CGFloat)opacity { + return _opacity; +} + +- (void)setOpacity:(CGFloat)opacity { + MBMainThreadAssert(); + _opacity = opacity; +} + +- (UIColor *)color { + return self.bezelView.color; +} + +- (void)setColor:(UIColor *)color { + MBMainThreadAssert(); + self.bezelView.color = color; +} + +- (CGFloat)yOffset { + return self.offset.y; +} + +- (void)setYOffset:(CGFloat)yOffset { + MBMainThreadAssert(); + self.offset = CGPointMake(self.offset.x, yOffset); +} + +- (CGFloat)xOffset { + return self.offset.x; +} + +- (void)setXOffset:(CGFloat)xOffset { + MBMainThreadAssert(); + self.offset = CGPointMake(xOffset, self.offset.y); +} + +- (CGFloat)cornerRadius { + return self.bezelView.layer.cornerRadius; +} + +- (void)setCornerRadius:(CGFloat)cornerRadius { + MBMainThreadAssert(); + self.bezelView.layer.cornerRadius = cornerRadius; +} + +- (BOOL)dimBackground { + MBBackgroundView *backgroundView = self.backgroundView; + UIColor *dimmedColor = [UIColor colorWithWhite:0.f alpha:.2f]; + return backgroundView.style == MBProgressHUDBackgroundStyleSolidColor && [backgroundView.color isEqual:dimmedColor]; +} + +- (void)setDimBackground:(BOOL)dimBackground { + MBMainThreadAssert(); + self.backgroundView.style = MBProgressHUDBackgroundStyleSolidColor; + self.backgroundView.color = dimBackground ? [UIColor colorWithWhite:0.f alpha:.2f] : [UIColor clearColor]; +} + +- (CGSize)size { + return self.bezelView.frame.size; +} + +- (UIColor *)activityIndicatorColor { + return _activityIndicatorColor; +} + +- (void)setActivityIndicatorColor:(UIColor *)activityIndicatorColor { + if (activityIndicatorColor != _activityIndicatorColor) { + _activityIndicatorColor = activityIndicatorColor; + UIActivityIndicatorView *indicator = (UIActivityIndicatorView *)self.indicator; + if ([indicator isKindOfClass:[UIActivityIndicatorView class]]) { + [indicator setColor:activityIndicatorColor]; + } + } +} + +@end + +@implementation MBProgressHUDRoundedButton + +#pragma mark - Lifecycle + +- (instancetype)initWithFrame:(CGRect)frame { + self = [super initWithFrame:frame]; + if (self) { + CALayer *layer = self.layer; + layer.borderWidth = 1.f; + } + return self; +} + +#pragma mark - Layout + +- (void)layoutSubviews { + [super layoutSubviews]; + // Fully rounded corners + CGFloat height = CGRectGetHeight(self.bounds); + self.layer.cornerRadius = ceil(height / 2.f); +} + +- (CGSize)intrinsicContentSize { + // Only show if we have associated control events + if (self.allControlEvents == 0) return CGSizeZero; + CGSize size = [super intrinsicContentSize]; + // Add some side padding + size.width += 20.f; + return size; +} + +#pragma mark - Color + +- (void)setTitleColor:(UIColor *)color forState:(UIControlState)state { + [super setTitleColor:color forState:state]; + // Update related colors + [self setHighlighted:self.highlighted]; + self.layer.borderColor = color.CGColor; +} + +- (void)setHighlighted:(BOOL)highlighted { + [super setHighlighted:highlighted]; + UIColor *baseColor = [self titleColorForState:UIControlStateSelected]; + self.backgroundColor = highlighted ? [baseColor colorWithAlphaComponent:0.1f] : [UIColor clearColor]; } @end diff --git a/Example/Pods/MBProgressHUD/README.mdown b/Example/Pods/MBProgressHUD/README.mdown index df9675675..1c8d10506 100644 --- a/Example/Pods/MBProgressHUD/README.mdown +++ b/Example/Pods/MBProgressHUD/README.mdown @@ -1,55 +1,66 @@ -# MBProgressHUD [![Build Status](https://travis-ci.org/matej/MBProgressHUD.svg?branch=master)](https://travis-ci.org/matej/MBProgressHUD) +# MBProgressHUD -MBProgressHUD is an iOS drop-in class that displays a translucent HUD with an indicator and/or labels while work is being done in a background thread. The HUD is meant as a replacement for the undocumented, private UIKit UIProgressHUD with some additional features. +[![Build Status](https://travis-ci.org/matej/MBProgressHUD.svg?branch=master)](https://travis-ci.org/matej/MBProgressHUD) [![codecov.io](https://codecov.io/github/matej/MBProgressHUD/coverage.svg?branch=master)](https://codecov.io/github/matej/MBProgressHUD?branch=master) + [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application) [![CocoaPods compatible](https://img.shields.io/cocoapods/v/MBProgressHUD.svg?style=flat)](https://cocoapods.org/pods/MBProgressHUD) [![License: MIT](https://img.shields.io/cocoapods/l/MBProgressHUD.svg?style=flat)](http://opensource.org/licenses/MIT) -[![](http://dl.dropbox.com/u/378729/MBProgressHUD/1-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/1.png) -[![](http://dl.dropbox.com/u/378729/MBProgressHUD/2-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/2.png) -[![](http://dl.dropbox.com/u/378729/MBProgressHUD/3-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/3.png) -[![](http://dl.dropbox.com/u/378729/MBProgressHUD/4-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/4.png) -[![](http://dl.dropbox.com/u/378729/MBProgressHUD/5-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/5.png) -[![](http://dl.dropbox.com/u/378729/MBProgressHUD/6-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/6.png) -[![](http://dl.dropbox.com/u/378729/MBProgressHUD/7-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/7.png) +`MBProgressHUD` is an iOS drop-in class that displays a translucent HUD with an indicator and/or labels while work is being done in a background thread. The HUD is meant as a replacement for the undocumented, private `UIKit` `UIProgressHUD` with some additional features. + +[![](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/1-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/1.png) +[![](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/2-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/2.png) +[![](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/3-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/3.png) +[![](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/4-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/4.png) +[![](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/5-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/5.png) +[![](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/6-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/6.png) +[![](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/7-thumb.png)](http://dl.dropbox.com/u/378729/MBProgressHUD/v1/7.png) + +**NOTE:** The class has recently undegone a major rewrite. The old version is available in the [legacy](https://github.com/jdg/MBProgressHUD/tree/legacy) branch, should you need it. ## Requirements -MBProgressHUD works on any iOS version and is compatible with both ARC and non-ARC projects. It depends on the following Apple frameworks, which should already be included with most Xcode templates: +`MBProgressHUD` works on iOS 6+ and requires ARC to build. It depends on the following Apple frameworks, which should already be included with most Xcode templates: * Foundation.framework * UIKit.framework * CoreGraphics.framework -You will need the latest developer tools in order to build MBProgressHUD. Old Xcode versions might work, but compatibility will not be explicitly maintained. +You will need the latest developer tools in order to build `MBProgressHUD`. Old Xcode versions might work, but compatibility will not be explicitly maintained. ## Adding MBProgressHUD to your project -### Cocoapods +### CocoaPods [CocoaPods](http://cocoapods.org) is the recommended way to add MBProgressHUD to your project. -1. Add a pod entry for MBProgressHUD to your Podfile `pod 'MBProgressHUD', '~> 0.9.2'` +1. Add a pod entry for MBProgressHUD to your Podfile `pod 'MBProgressHUD', '~> 1.0.0'` 2. Install the pod(s) by running `pod install`. 3. Include MBProgressHUD wherever you need it with `#import "MBProgressHUD.h"`. +### Carthage + +1. Add MBProgressHUD to your Cartfile. e.g., `github "jdg/MBProgressHUD" ~> 1.0.0` +2. Run `carthage update` +3. Follow the rest of the [standard Carthage installation instructions](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application) to add MBProgressHUD to your project. + ### Source files Alternatively you can directly add the `MBProgressHUD.h` and `MBProgressHUD.m` source files to your project. -1. Download the [latest code version](https://github.com/matej/MBProgressHUD/archive/master.zip) or add the repository as a git submodule to your git-tracked project. -2. Open your project in Xcode, then drag and drop `MBProgressHUD.h` and `MBProgressHUD.m` onto your project (use the "Product Navigator view"). Make sure to select Copy items when asked if you extracted the code archive outside of your project. +1. Download the [latest code version](https://github.com/matej/MBProgressHUD/archive/master.zip) or add the repository as a git submodule to your git-tracked project. +2. Open your project in Xcode, then drag and drop `MBProgressHUD.h` and `MBProgressHUD.m` onto your project (use the "Product Navigator view"). Make sure to select Copy items when asked if you extracted the code archive outside of your project. 3. Include MBProgressHUD wherever you need it with `#import "MBProgressHUD.h"`. ### Static library -You can also add MBProgressHUD as a static library to your project or workspace. +You can also add MBProgressHUD as a static library to your project or workspace. -1. Download the [latest code version](https://github.com/matej/MBProgressHUD/downloads) or add the repository as a git submodule to your git-tracked project. -2. Open your project in Xcode, then drag and drop `MBProgressHUD.xcodeproj` onto your project or workspace (use the "Product Navigator view"). -3. Select your target and go to the Build phases tab. In the Link Binary With Libraries section select the add button. On the sheet find and add `libMBProgressHUD.a`. You might also need to add `MBProgressHUD` to the Target Dependencies list. +1. Download the [latest code version](https://github.com/matej/MBProgressHUD/downloads) or add the repository as a git submodule to your git-tracked project. +2. Open your project in Xcode, then drag and drop `MBProgressHUD.xcodeproj` onto your project or workspace (use the "Product Navigator view"). +3. Select your target and go to the Build phases tab. In the Link Binary With Libraries section select the add button. On the sheet find and add `libMBProgressHUD.a`. You might also need to add `MBProgressHUD` to the Target Dependencies list. 4. Include MBProgressHUD wherever you need it with `#import `. ## Usage -The main guideline you need to follow when dealing with MBProgressHUD while running long-running tasks is keeping the main thread work-free, so the UI can be updated promptly. The recommended way of using MBProgressHUD is therefore to set it up on the main thread and then spinning the task, that you want to perform, off onto a new thread. +The main guideline you need to follow when dealing with MBProgressHUD while running long-running tasks is keeping the main thread work-free, so the UI can be updated promptly. The recommended way of using MBProgressHUD is therefore to set it up on the main thread and then spinning the task, that you want to perform, off onto a new thread. ```objective-c [MBProgressHUD showHUDAddedTo:self.view animated:YES]; @@ -61,7 +72,9 @@ dispatch_async(dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{ }); ``` -If you need to configure the HUD you can do this by using the MBProgressHUD reference that showHUDAddedTo:animated: returns. +You can add the HUD on any view or window. It is however a good idea to avoid adding the HUD to certain `UIKit` views with complex view hierarchies - like `UITableView` or `UICollectionView`. Those can mutate their subviews in unexpected ways and thereby break HUD display. + +If you need to configure the HUD you can do this by using the MBProgressHUD reference that showHUDAddedTo:animated: returns. ```objective-c MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; @@ -74,6 +87,18 @@ hud.labelText = @"Loading"; }]; ``` +You can also use a `NSProgress` object and MBProgressHUD will update itself when there is progress reported through that object. + +```objective-c +MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; +hud.mode = MBProgressHUDModeAnnularDeterminate; +hud.labelText = @"Loading"; +NSProgress *progress = [self doSomethingInBackgroundCompletion:^{ + [hud hide:YES]; +}]; +hud.progressObject = progress; +``` + UI updates should always be done on the main thread. Some MBProgressHUD setters are however considered "thread safe" and can be called from background threads. Those also include `setMode:`, `setCustomView:`, `setLabelText:`, `setLabelFont:`, `setDetailsLabelText:`, `setDetailsLabelFont:` and `setProgress:`. If you need to run your long-running task in the main thread, you should perform it with a slight delay, so UIKit will have enough time to update the UI (i.e., draw the HUD) before you block the main thread with your task. @@ -94,8 +119,8 @@ For more examples, including how to use MBProgressHUD with asynchronous operatio ## License -This code is distributed under the terms and conditions of the [MIT license](LICENSE). +This code is distributed under the terms and conditions of the [MIT license](LICENSE). ## Change-log -A brief summary of each MBProgressHUD release can be found on the [wiki](https://github.com/matej/MBProgressHUD/wiki/Change-log). +A brief summary of each MBProgressHUD release can be found in the [CHANGELOG](CHANGELOG.mdown). diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index b2e52edfd..5368edf40 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -5,14 +5,14 @@ PODS: - Expecta (~> 1.0) - FBSnapshotTestCase (~> 1.8) - FBSnapshotTestCase (1.8.1) - - MBProgressHUD (0.9.2) + - MBProgressHUD (1.0.0) - MWPhotoBrowser (2.1.2): - - DACircularProgress (~> 2.3) - - MBProgressHUD (~> 0.9) - - SDWebImage (!= 3.7.2, ~> 3.7) - - SDWebImage (3.7.5): - - SDWebImage/Core (= 3.7.5) - - SDWebImage/Core (3.7.5) + - DACircularProgress (~> 2.3.1) + - MBProgressHUD (~> 1.0.0) + - SDWebImage (~> 4.0.0) + - SDWebImage (4.0.0): + - SDWebImage/Core (= 4.0.0) + - SDWebImage/Core (4.0.0) - Specta (1.0.2) DEPENDENCIES: @@ -31,9 +31,11 @@ SPEC CHECKSUMS: Expecta: 32604574add2c46a36f8d2f716b6c5736eb75024 Expecta+Snapshots: ca15bfb57e7a0f78f86c7699c2c54ffacfa4ad2a FBSnapshotTestCase: 3dc3899168747a0319c5278f5b3445c13a6532dd - MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1 - MWPhotoBrowser: 5836d7aa041dc05a13de380c246826578adc5ea5 - SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461 + MBProgressHUD: 4890f671c94e8a0f3cf959aa731e9de2f036d71a + MWPhotoBrowser: 07ef0151444d6bbc6d49e8239f9cdef13580bcf7 + SDWebImage: 76a6348bdc74eb5a55dd08a091ef298e56b55e41 Specta: 9cec98310dca411f7c7ffd6943552b501622abfe -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: f0528201d484bd48f65798bc253cd3bf45d69fcd + +COCOAPODS: 1.0.1 diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 4009822f4..3662e3b2a 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -10,50 +10,87 @@ 46 objects - 0043FDF25F85C0B2C11CEAE6B1C54D87 + 00DAAD802A7645CAECEDFD6DDE155D87 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h name - FBSnapshotTestController.m + EXPExpect.h path - FBSnapshotTestCase/FBSnapshotTestController.m + Expecta/EXPExpect.h + sourceTree + <group> + + 00E0E94A414ACEA941F4E3F7524D96D0 + + includeInIndex + 1 + isa + PBXFileReference + path + UIBarButtonItemGrid@3x.png sourceTree <group> - 00518063767430EDC47FCC49F4409458 + 013926AC125E42AFBEEEF485C1DDB972 fileRef - 6CD3EC2C1FBF5655137A99638E9CC950 + D0F3E73DC78D3A2AF2AD0A475F906FD9 isa PBXBuildFile + settings + + ATTRIBUTES + + Public + + - 00641C72D7132E5890F1F7098337C3B5 + 01B7F50C8A337E0862AE5E9DE45812CE fileRef - DF11024BF511A0D2225D4BA84770CED7 + A61A4213784EB2F56D3705CCE82C9197 isa PBXBuildFile - 01F58E863C79FB5A8433D92837FFE619 + 01BA9FAF0441990327A0B9C892EC33CD + includeInIndex + 1 isa - PBXTargetDependency + PBXFileReference + lastKnownFileType + sourcecode.c.objc name - MBProgressHUD - target - FE2F1D7B9D9FCEA148517E4657B243F4 - targetProxy - D47B0B4C04222F6784D38356F02BEB32 + SPTExample.m + path + Specta/Specta/SPTExample.m + sourceTree + <group> + + 01D3F330EEFE0D7FE6817AA3F61B5DD3 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + ExpectaSupport.h + path + Expecta/ExpectaSupport.h + sourceTree + <group> 021C50274FF43A6F07E119D572C3ACB6 fileRef - DA7F16221783A03C084D9BAAF7F404DB + F3AD53C166BBA373F67EF94C58CD70E6 isa PBXBuildFile settings @@ -64,10 +101,47 @@ - 02C7E3EC1E1DFDD7046BD26A67E92686 + 023C639879A22FDFEEC73FD5A74E222B + + fileRef + A7429C31A809059961281DF33002429A + isa + PBXBuildFile + + 025164A0DC53EC68213DD099D6CE537B + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + FBSnapshotTestController.m + path + FBSnapshotTestCase/FBSnapshotTestController.m + sourceTree + <group> + + 026B57D9CC1A7B7E0587E2A2140CF720 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + UIImage+GIF.h + path + SDWebImage/UIImage+GIF.h + sourceTree + <group> + + 02B5E14D6FFCF9AEBCD2848374D826FD fileRef - 981F3EB0C06E97770D2421E673B013A1 + 026B57D9CC1A7B7E0587E2A2140CF720 isa PBXBuildFile settings @@ -78,10 +152,10 @@ - 033AB851ACA0C118D009F781287565DD + 02C7E3EC1E1DFDD7046BD26A67E92686 fileRef - 1E360C94C47826C4CAEEDBFC04C36A42 + EEFE1552FA6CB791AF012FE9726274D9 isa PBXBuildFile settings @@ -92,12 +166,51 @@ - 0364DCB58A865A2830638D2C0CCED41C + 03811E5EA2D5ABD2DEB6CF8BEA6056C1 + + buildActionMask + 2147483647 + files + + F385F52605FA61111578C914763D0C20 + DC44CA1C2969CFCC2A3836A538B2BB23 + 2F2851B279F65136EF6FD3CA85BB12CC + 8EF4ABD9FB7C54F14F4C71AE05A33221 + FC6BD7BAB523ADDB0E77B78521F26AF4 + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 038F47EC159D577EA6F47F06F5D92463 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + NSValue+Expecta.h + path + Expecta/NSValue+Expecta.h + sourceTree + <group> + + 040B7C5860BF4869975F9B0C3BDDE8DE fileRef - DF11024BF511A0D2225D4BA84770CED7 + 1331B671ACD38C99B153E679E3BD2947 isa PBXBuildFile + settings + + ATTRIBUTES + + Public + + 043124F225814F80E4ED4FF4BC40156A @@ -120,60 +233,65 @@ sourceTree <group> - 0498B98EB393D71314953683060EFD58 + 04359FC2EA7B7CE174FC15886814B0F5 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + MWGridCell.h + sourceTree + <group> + + 0468921E3EB17EB9D9222EA88F27CA75 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + UIImageView+HighlightedWebCache.h + path + SDWebImage/UIImageView+HighlightedWebCache.h + sourceTree + <group> + + 04969E3FA5A6426CA279D6D6E7FAD408 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + MWCommon.h + sourceTree + <group> + + 04D98118ED159D36DC0DFF8CEAB3D6D9 fileRef - EC0223776620A3EA741C855D0211CB0A + B8F6457DCF8AEE86B97C7E1BEFCE2E2A isa PBXBuildFile settings - ATTRIBUTES - - Public - - - - 04D4EDE1F05B96EE8BB9DCD368608620 - - baseConfigurationReference - 805AE44C01D7936BA8A238C6C5C4807D - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/Specta/Specta-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MTL_ENABLE_DEBUG_INFO - NO - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES + COMPILER_FLAGS + -DOS_OBJECT_USE_OBJC=0 - isa - XCBuildConfiguration - name - Release 0515A6974CBAF0F2F6F72BF87921704B buildConfigurations - F6045A7604731086F9E1A9412E290302 - 589E7F4856ABE929D7FC9F3A9E506FC9 + 6F9FC34E9C16469B5B4FA55CB5AD7F6E + 90C6FED156961291CACC9830CF6C8CBE defaultConfigurationIsVisible 0 @@ -182,13 +300,6 @@ isa XCConfigurationList - 051AA4E51A019933DD1E5CE99CD7352A - - fileRef - 0B92B054A2338462A743EB368F25A20B - isa - PBXBuildFile - 05257CC76400D71826E603561A0F73E6 buildConfigurationList @@ -213,71 +324,43 @@ productName Expecta+Snapshots productReference - 6CD36438CB08D280978CEE50363D8B8B + 56BA3264350D0B6E865A7B92708EB166 productType com.apple.product-type.library.static - 052A17875CB827423D627183396CEB60 + 0547B8EEB092A5919CE72466F49A0795 + baseConfigurationReference + 81CF95A25497BD4688DA1D8BF1FEC75A buildSettings - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - YES - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES - CLANG_WARN_UNREACHABLE_CODE - YES - CLANG_WARN__DUPLICATE_METHOD_MATCH - YES - COPY_PHASE_STRIP - YES - ENABLE_NS_ASSERTIONS - NO - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_PREPROCESSOR_DEFINITIONS - - RELEASE=1 - - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES - GCC_WARN_UNUSED_FUNCTION + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym + ENABLE_STRICT_OBJC_MSGSEND YES - GCC_WARN_UNUSED_VARIABLE + GCC_NO_COMMON_BLOCKS YES + GCC_PREFIX_HEADER + Target Support Files/Specta/Specta-prefix.pch IPHONEOS_DEPLOYMENT_TARGET - 7.0 - STRIP_INSTALLED_PRODUCT + 4.3 + MTL_ENABLE_DEBUG_INFO NO - SYMROOT - ${SRCROOT}/../build - VALIDATE_PRODUCT + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL YES isa @@ -285,89 +368,49 @@ name Release - 0557FD60A45F62CD51B4972ECE5C2584 + 05C0EC6A10C0F5B6E7A59A0133C5B27F - includeInIndex - 1 + fileRef + 0B5BFB9734BE2A9804B5269D7CD17E6D isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - MBProgressHUD.xcconfig - sourceTree - <group> + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - 05DA7841521B75C4D0C303F32E518117 + 061D9DA8C4A4B42AD2BEBF9CCD7791B5 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h - name - EXPMatchers+respondTo.h path - Expecta/Matchers/EXPMatchers+respondTo.h + ImageSelectedSmallOff.png sourceTree <group> - 060435B6E32CF028837E209B20E10639 - - fileRef - C6FE69AE06A770FF76C19B8039EC0780 - isa - PBXBuildFile - 065410F935EC72489896726380B72CD0 buildActionMask 2147483647 files - 866569443B7D10AB5D6DC7FC0830235B - 9933B0F6DA01EDF804C19260E9515E65 + 2B3217C8CC1BD6DE885445CAABD490DE + 204FB45F31AD554008F6C34FFA39B08F isa PBXFrameworksBuildPhase runOnlyForDeploymentPostprocessing 0 - 0668957FEB1B3CAE2EABBC4AA9ABA7C3 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - SPTCallSite.m - path - Specta/Specta/SPTCallSite.m - sourceTree - <group> - - 0683DF2C9B7FC27B576AB4B7B3B146ED - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - EXPMatchers+beGreaterThan.h - path - Expecta/Matchers/EXPMatchers+beGreaterThan.h - sourceTree - <group> - - 07282695806D1DFBF187BFA004D80641 + 070B10079CF5CACE95AADDF801997D20 fileRef - 700F6F4AFED22AEAA1D8943236F94924 + 628A86155E66266C94DDA5EBCDA72AFD isa PBXBuildFile settings @@ -378,44 +421,46 @@ - 072C184628072EDE522629576F1716DE + 07282695806D1DFBF187BFA004D80641 fileRef - 5E350F03F362C03BE32737DDE72D4632 + 97FB237BF48E4FDD7DCE3CE2DC3599CF isa PBXBuildFile + settings + + ATTRIBUTES + + Public + + - 0732716566238BF76BBF762F85C8ABAF - - buildConfigurations - - 617F18A93D7ABF1322E3C027265893C2 - 85A6795A5CD0C6DEA1F648AD0E6D1248 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 079AA0CF857B4A46F161666C58867CE1 + 077072E0F0AB7FA1462E7CDC3341A509 + explicitFileType + archive.ar includeInIndex - 1 + 0 isa PBXFileReference - lastKnownFileType - sourcecode.c.objc + name + libDACircularProgress-iOS7.0.a path - MWPhotoBrowser-dummy.m + libDACircularProgress-iOS7.0.a sourceTree - <group> + BUILT_PRODUCTS_DIR + + 07808153797F0776AA68C9365E9C7784 + + fileRef + D2D6B98D555A2768E2760397A4145753 + isa + PBXBuildFile 081F2104425CDCB0915354E2FBD7E24E fileRef - 1D536F869C3B7D603AC4630F3F6AB919 + D8368C89A91EC49B6FB459C2E1EEF559 isa PBXBuildFile settings @@ -426,47 +471,49 @@ - 098439AB598DDF1AF51146A2E3E2E562 + 08877E80CE4F8FBEA0236250F69E2C62 - buildActionMask - 2147483647 - files + children - FC214077677D4F02E03C6C85F774E028 - 82FC12F67E83874B93592218E9FB4CA0 + 077072E0F0AB7FA1462E7CDC3341A509 + C4DEA7F0AD7DFDE3AE52970AE55B8AC6 + 6C8F9DE4A48355AEDE9D9923A8F8FBDB + 56BA3264350D0B6E865A7B92708EB166 + 147408A72CFBB199A12910CDF1B9EC82 + F6C622A56E707FE440C99AF4ABD18859 + 4E752C09031D34C5390AB800F63A8BB4 + FA7B80D1B352FF18033709C9EF8533DC + 8C8210CE2F6C12DB3A632074C9ECA496 + 66AC71B16E9F622403ABB8C925C5989B + 85FBF71A5AAE7086230A62148B3BA6DE + 8047F5141351F2667383AB1B516054BE + 2B206C8C4C70D050769CB80E9492E658 + B860A545FCE5CA24A3111308F41FF190 + 6B909FB1F98C3B3E3A8E20832F2958EB + 6B909FB1F98C3B3E3A8E20832F2958EB isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 0A924BC847BA99EBCBD0588603448B05 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h + PBXGroup name - EXPBlockDefinedMatcher.h - path - Expecta/EXPBlockDefinedMatcher.h + Products sourceTree <group> - 0A9B8E3E35177F52A643739AC50B00FA + 08A812968FE76D574689A017F05B507F - includeInIndex - 1 + fileRef + C76558D23D3662CFB44950D35534F7A9 isa - PBXFileReference - path - UIBarButtonItemArrowLeft.png - sourceTree - <group> + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - 0AB1B49E98BEDDFC8A45BB3C1FB54076 + 09D98132C1A65D2CA3C6E5AAC718DB24 includeInIndex 1 @@ -475,25 +522,27 @@ lastKnownFileType sourcecode.c.objc name - EXPMatchers+beSubclassOf.m + EXPMatchers+beNil.m path - Expecta/Matchers/EXPMatchers+beSubclassOf.m + Expecta/Matchers/EXPMatchers+beNil.m sourceTree <group> - 0B3C605995BE46623C50E7658A1CBE96 + 0A10354E74CA3CBC8B24036A333FE834 fileRef - CA8230DE5C83368629EF3E62C4F0E7B7 + 26AC6E873763498678032ABB5C85185C + isa + PBXBuildFile + + 0A5BB13126A30899ED31B49BD1F5B942 + + fileRef + EA435551CC148753597DE1E0AF24A77C isa PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - - 0B7E61991D03B44046913BF3B345F4DB + 0AAEE06FB4F7F495B1AAD1EDDEB2E9D2 isa PBXFileReference @@ -502,145 +551,204 @@ name XCTest.framework path - Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/XCTest.framework + Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/XCTest.framework sourceTree DEVELOPER_DIR - 0B8D4914244FCBC9DCAF2B9AD09F3DD5 - - isa - PBXTargetDependency - name - DACircularProgress - target - 9775596B3CA16905FC8F66DA8E2A3C67 - targetProxy - 96AE2267633A27498E5D45052BDD5BBA - - 0B92B054A2338462A743EB368F25A20B + 0B5BFB9734BE2A9804B5269D7CD17E6D includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h path - PlayButtonOverlayLargeTap@2x.png + MWTapDetectingView.h sourceTree <group> - 0C1A29BFF65C6F2801B1BE0058718A19 + 0C168D0F1D57B07EB86D22102D8C5373 fileRef - 37E4F69B3E6AFDEE8D68A3430CEC8BF5 + EFF7E02E20A76B9E8BA18B06D1BD1205 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - 0DB9AA4B919BA54CFBC8FC6FD7AFB3F6 + 0CAC5CDED0ABB07CC907801F7DEF93A8 + includeInIndex + 1 isa - PBXTargetDependency + PBXFileReference + lastKnownFileType + sourcecode.c.objc name - FBSnapshotTestCase - target - 7D9E32DAA93E15CFCF77A5BCD2D4BAA2 - targetProxy - EE04EE8ADAB8F7DF7FCEFDDD1E801BE6 + EXPMatchers+beSubclassOf.m + path + Expecta/Matchers/EXPMatchers+beSubclassOf.m + sourceTree + <group> - 0DC4183837552F23710F86F9A032C574 + 0CED9579EAF266E1F8314A0C4830A4FA - fileRef - 5D39CEB65ADB521B117CA181C2BB2C9C - isa - PBXBuildFile - settings + baseConfigurationReference + B83D4C05E77991780CA69BF68B431DD2 + buildSettings - ATTRIBUTES - - Public - + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MACH_O_TYPE + staticlib + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PODS_ROOT + $(SRCROOT) + PRODUCT_BUNDLE_IDENTIFIER + org.cocoapods.${PRODUCT_NAME:rfc1034identifier} + PRODUCT_NAME + $(TARGET_NAME) + SDKROOT + iphoneos + SKIP_INSTALL + YES + isa + XCBuildConfiguration + name + Release - 0EAAE557DE1A2949F0793F1230D1D046 + 0D1F40F72A7B770E141CEF1F3F4F00D4 isa PBXTargetDependency name - Expecta + MBProgressHUD-iOS7.0 target - 2F501FE84845EAD97B9087DAFCBBEE0E + 493375293C63883E773D55FB79AF6D25 targetProxy - A6FD2A9ACF0632CB41BE9AF1A13BD166 - - 0EF1CB072B5DE5D0A4EE7053EB0E2364 - - fileRef - 574FFB37A8EF309B1A1EB265267DD353 - isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - + 3A37FF224203D05A83573C250EC4EF67 - 0F43FEACB0C18DD4C724B1655AF47728 + 0D1F7823CAED440DD0F63E570C67B9EE - fileRef - 60ECF290B248258F453088B6258302E6 - isa - PBXBuildFile - settings + baseConfigurationReference + A26B18A9DEC61DE5D947A2E5B3F9C7EC + buildSettings - ATTRIBUTES - - Public - - - - 104AFE24D01F1C4495926B40B53C5945 - - fileRef - 92F064516748B6AA4C6E303A38C3FE6A - isa - PBXBuildFile - settings + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/DACircularProgress-iOS7.1/DACircularProgress-iOS7.1-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 5.0 + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Release + + 0D794A5E1BA709633EF533B09A31137D + + baseConfigurationReference + D239995504700A2E5AAB663DC471FBCA + buildSettings - COMPILER_FLAGS - -fno-objc-arc + CONFIGURATION_BUILD_DIR + $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/MWPhotoBrowser-iOS7.1 + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + INFOPLIST_FILE + Target Support Files/MWPhotoBrowser-iOS7.1/ResourceBundle-MWPhotoBrowser-Info.plist + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + PRODUCT_NAME + MWPhotoBrowser + SDKROOT + iphoneos + SKIP_INSTALL + YES + TARGETED_DEVICE_FAMILY + 1,2 + WRAPPER_EXTENSION + bundle + isa + XCBuildConfiguration + name + Debug - 105B37778FEED1965C8D0AF4C9E4B4F1 + 0D7A9405228F57E10ABD5BB3B15DB0AD - fileRef - 487E0AD53E31FE34EC41B45FC09B9097 isa - PBXBuildFile + PBXTargetDependency + name + Specta + target + 9F94634D61584613303A1CE9E3598593 + targetProxy + 763116CCBC2A9C1721FEC5895A2E858A - 10E446637EC5FF03088009E61B491E75 + 0DB9AA4B919BA54CFBC8FC6FD7AFB3F6 - includeInIndex - 1 isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc + PBXTargetDependency name - SDWebImageCompat.m - path - SDWebImage/SDWebImageCompat.m - sourceTree - <group> + FBSnapshotTestCase + target + 7D9E32DAA93E15CFCF77A5BCD2D4BAA2 + targetProxy + EE04EE8ADAB8F7DF7FCEFDDD1E801BE6 + + 0F93EDA47A438A74C49F63CA326B3DD1 + + buildActionMask + 2147483647 + files + + F43D608BBF8155390B5FEE94753DD348 + + isa + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 10E68FD4A81F628778B6A4992DB9D952 + 0F9DB75A76D2DC0A6F5D4711D3B93815 includeInIndex 1 @@ -648,31 +756,29 @@ PBXFileReference lastKnownFileType sourcecode.c.h - name - EXPMatchers+beTruthy.h path - Expecta/Matchers/EXPMatchers+beTruthy.h + Expecta+Snapshots-prefix.pch sourceTree <group> - 1181CB6FC2D63C42F19EAB56C604A71E + 10006526AF7BDBB1D86E3EB2AD6DE49F fileRef - A09DD0AB6A512D74E5628070EBD56026 + CC08F424CAF98D9993BACA21F8610FD2 isa PBXBuildFile - 1186EC1A35306EBBA8C3DE66F0973361 + 104330F43471684C730346DDC192713D fileRef - B0DFED38A647950C79B13061F923258C + C985ABCEABAC37D230D1BFFF9612BDDD isa PBXBuildFile - 11CF0C44A36897A963C15B74C2AEC415 + 104AFE24D01F1C4495926B40B53C5945 fileRef - 3DEC242716623D70F4CC9F4A1D32805C + DA94D42A7FA0CA4D6545C88275A83A74 isa PBXBuildFile settings @@ -681,34 +787,83 @@ -fno-objc-arc - 123355D7F0D268DB0998FFB1CDD859B9 + 10623A8E9A2D633786F76C6A9D0D5561 - includeInIndex - 1 + fileRef + 7C0F08326F5A918F2A311222533EC950 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - MBProgressHUD-prefix.pch + PBXBuildFile + + 10ADD30DACA1E62D7490166AE3F624FC + + fileRef + A6120AD28ED935A66544A3470214B583 + isa + PBXBuildFile + + 10E3DD3741815B432C1DD49C7D62D9D2 + + fileRef + FAB2C715AB1CECBF81C21D4FA9071B49 + isa + PBXBuildFile + + 112A982649644C3655E800BE47FB127F + + fileRef + 7C0F08326F5A918F2A311222533EC950 + isa + PBXBuildFile + + 11AE4DAD06780148E606FEE88A7342D2 + + children + + AA15102B006F97F7D2C88A4D2B871A14 + BE8191476B080F4505CAF87040FC84FE + 7C0F08326F5A918F2A311222533EC950 + C985ABCEABAC37D230D1BFFF9612BDDD + B89A61B544CE3A653B8129ECFD996694 + B0AD4D3FD51000868948132517923991 + 0AAEE06FB4F7F495B1AAD1EDDEB2E9D2 + + isa + PBXGroup + name + iOS sourceTree <group> - 1246A1C00980422020A6884856143651 + 11CF0C44A36897A963C15B74C2AEC415 + + fileRef + 36EF33AD9610A185983EBA61F85A14E4 + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + + + 12740D328C04A8E60B9C5FD51A39DB79 buildActionMask 2147483647 files - 0C1A29BFF65C6F2801B1BE0058718A19 - 0F43FEACB0C18DD4C724B1655AF47728 + 5FA336AC619B63AF9F9FD57B746B50C6 + 10623A8E9A2D633786F76C6A9D0D5561 + 104330F43471684C730346DDC192713D + E922AE0F12E48E8977454839D564E061 + B5C29AA2E90C37DF2483E6A5EE07F9EA isa - PBXHeadersBuildPhase + PBXFrameworksBuildPhase runOnlyForDeploymentPostprocessing 0 - 1398D1B84667A17FCB66182F776EAC42 + 129854D8DBB08D47DFA818D6EE2724D1 includeInIndex 1 @@ -717,22 +872,134 @@ lastKnownFileType sourcecode.c.h name - SPTSharedExampleGroups.h + EXPMatchers+beSubclassOf.h path - Specta/Specta/SPTSharedExampleGroups.h + Expecta/Matchers/EXPMatchers+beSubclassOf.h sourceTree <group> - 13EA87F4C750EBB98261F8ED14EFE770 + 132E3E0858255FA04DBE604BF36A773D + fileRef + 4E25DDC72AD89138E96E86F9975F114C isa - PBXTargetDependency + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 13318CA706AE68D08ED93A462A8E2B71 + + baseConfigurationReference + 4DA5A362F6C7352C50C0676E95C0E4F5 + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/MWPhotoBrowser-iOS7.0/MWPhotoBrowser-iOS7.0-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration name - Specta - target - E9AAC3590B391F4CFAF5F8348E6A8FE4 - targetProxy - 659BCA5950BB094273E9E83E7D5271CF + Release + + 1331B671ACD38C99B153E679E3BD2947 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + MWPhotoBrowser.h + sourceTree + <group> + + 1370C901B67F7E3DBF4D6989F3E87034 + + buildConfigurations + + AED09A7995E2DF274F5807590CB472A2 + A60573356E8C2F7D6528A15E3193B63B + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + 137FEEC4A488CC7C592F649FA08BD385 + + fileRef + 50A6CB48BD036BA95436D50530B6902A + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 13A9932BC364B2A3BADCA46D5C4F05DF + + fileRef + DE88F9E71ECFEEE995CE8220E301E8ED + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 13B4475A7BE2037F23947B2F5BCDD7BE + + fileRef + 9B484F370BBC1CC43B41A7E80F335BB3 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + 143C0831AA95D723669324010D835391 @@ -781,27 +1048,10 @@ runOnlyForDeploymentPostprocessing 0 - 148F0DEDC306B5A6D48931EFD279E456 + 14434A898B1464D80FF0C2DF360AB50B - children - - EF5AC1222120F3BAB7481DA9615352B0 - 4594A9E3FFD6ABE129882E959BB04B5E - D5DEC16E7CEEFEABBFEBAC3A10358C5A - - isa - PBXGroup - name - Support Files - path - ../Target Support Files/FBSnapshotTestCase - sourceTree - <group> - - 14BD3072FD1820402768B3D7F2E5B4A5 - - fileRef - 8952D588C0E5AD12FD9CF3747FD061F2 + fileRef + 3CE685279BE471748A25FA5F516B3203 isa PBXBuildFile settings @@ -812,87 +1062,71 @@ - 14C609D8F203FD45194E93997EFF744E + 1451AFC6B8E5ECBD410AD4CBF76311A2 - fileRef - 71865C216F48AC822D486C8D9B03B13C isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - + PBXTargetDependency + name + DACircularProgress-iOS7.0 + target + 501BE33907DBD9E3BB1712FC47BF8093 + targetProxy + A4444ACC6162DA753E962E776A9F4C58 - 15082EF0D1C2F7B77B63E0116BDA622C + 147408A72CFBB199A12910CDF1B9EC82 + explicitFileType + archive.ar includeInIndex - 1 + 0 isa PBXFileReference - lastKnownFileType - sourcecode.c.objc name - EXPFloatTuple.m + libFBSnapshotTestCase.a path - Expecta/EXPFloatTuple.m + libFBSnapshotTestCase.a sourceTree - <group> + BUILT_PRODUCTS_DIR - 1580BE8D870658FFFB9EF3D04B9213CC + 149EB70FB77BF58B82891D36A3767810 includeInIndex 1 isa PBXFileReference lastKnownFileType - text.xcconfig + sourcecode.c.h + name + EXPDoubleTuple.h path - Pods-MWPhotoBrowser_Tests.release.xcconfig + Expecta/EXPDoubleTuple.h sourceTree <group> - 1629A676793A787618A75ABDA6E20C56 - - fileRef - 8C4EC29461A90C294949DAE717A1BEC5 - isa - PBXBuildFile - - 164BD2AFD03035E623A90DF1AA095C35 + 14A228046BA50A65ACCE32A2A43E00C3 fileRef - 3B5A7151F8E4FBFE54BF6C2AC80958FA + D4DA65BA155007D24A7798B4EC7F47E6 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - 1684C2FDDE674F14B731CC940021D8C6 + 14A36F2F95F39CF9EDC99EBFCBF7FB20 buildActionMask 2147483647 files - 00641C72D7132E5890F1F7098337C3B5 - 8C4ECAE46CD3BCB39F38F4FF20D074F6 + 2FD5DE5FF578803DD19A9A98BC6A5FF2 isa - PBXFrameworksBuildPhase + PBXHeadersBuildPhase runOnlyForDeploymentPostprocessing 0 - 16A268BA14BC07320BB7FBE44EB37FB4 + 14C609D8F203FD45194E93997EFF744E fileRef - 3CD608194F35F47CEC250368B43C48E9 + 129854D8DBB08D47DFA818D6EE2724D1 isa PBXBuildFile settings @@ -903,7 +1137,7 @@ - 18391089432560093C31CCA48ABB46AE + 14F2D5060BA079F6E75C8E8951FCC4C2 includeInIndex 1 @@ -912,156 +1146,182 @@ lastKnownFileType sourcecode.c.h name - NSValue+Expecta.h + EXPMatchers+beGreaterThanOrEqualTo.h path - Expecta/NSValue+Expecta.h + Expecta/Matchers/EXPMatchers+beGreaterThanOrEqualTo.h sourceTree <group> - 189B7D1A1C865073D7F999A759ACD292 - - buildConfigurations - - FD6FA76757975A1FC954269CE5739798 - 257A97CE59C7E5D5191DC00F15C261BE - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 199EF76AC47B3EE9FA80BE53835AB7B1 + 1580BE8D870658FFFB9EF3D04B9213CC - buildActionMask - 2147483647 - files - - 66081D3480D1FA028C4DE2344BF616D4 - 69363A59A4E2FF95D6A62AA88641A20A - + includeInIndex + 1 isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXFileReference + lastKnownFileType + text.xcconfig + path + Pods-MWPhotoBrowser_Tests.release.xcconfig + sourceTree + <group> - 1A0D2B172232171C3EB6DC4DFE575EE7 + 1629A676793A787618A75ABDA6E20C56 fileRef - 079AA0CF857B4A46F161666C58867CE1 + 790215B6642C5AC0AB66ACFBA94DA16C isa PBXBuildFile - 1A1E6F8D4C651A22BB8CCEF1226FB1EE + 164F49A60006F63EB29CF6488F33113C includeInIndex 1 isa PBXFileReference path - PlayButtonOverlayLarge@2x.png + UIBarButtonItemArrowRight@3x.png sourceTree <group> - 1A1E8E8494B9BFCEBBD8273148D44386 + 1697441AA29177C9A68FDF0E3C04E703 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc name - UIImage+MultiFormat.h + ExpectaSupport.m path - SDWebImage/UIImage+MultiFormat.h + Expecta/ExpectaSupport.m sourceTree <group> - 1AB26E75F7BCD415D6AD6B8BA5F03DDB + 17D4B31093091A9E1D842BD1272E6248 - includeInIndex - 1 + buildActionMask + 2147483647 + files + isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - EXPMatchers+beIdenticalTo.m - path - Expecta/Matchers/EXPMatchers+beIdenticalTo.m - sourceTree - <group> + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 1AFDF0F0EF2A314336EACA38FCC6F784 + 17DE04DD655DDA4495305CEEE6AB3222 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h name - SPTExample.m + SPTSharedExampleGroups.h path - Specta/Specta/SPTExample.m + Specta/Specta/SPTSharedExampleGroups.h sourceTree <group> - 1B030B50B68FB0D602F2E4B1685FA9BA + 182FC73128ED60A5BD20F6DD2DD344C5 + fileRef + 5A9EBFC7ACFA8F737D2F87F775CA091A isa - PBXTargetDependency - name - MWPhotoBrowser - target - E2FE87384A67337831E53490EEA8BF11 - targetProxy - B6CE0371E70FB931CC99A90CEBFD6E83 + PBXBuildFile + + 189B7D1A1C865073D7F999A759ACD292 + + buildConfigurations + + 7AA578A6AEF651F16F03B609BB1E40AE + E2EC2F723658ED4EC8976D555838914E + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList - 1B0ADBF8A991262A6DE5BD0CB101EEE0 + 189ED11A2B46FF2F89923860716BB9D0 children - 0557FD60A45F62CD51B4972ECE5C2584 - FC1172043A5F0542D166D63AE9EBC260 - 123355D7F0D268DB0998FFB1CDD859B9 + 509637F57543102B11D41C0A86BF6AE2 + D83DB981719BF50DFA1B90DF7C1942A7 + 8B013ED88B85B2F00736DDC3EF06ECCD + 75C3EAAAA276564862EBE868F4CB8492 + 6554E9151EB13BE047A0BDA470F6E38D + 3F184CBBBB01F076EBB11C58EBF9881D + 8B39D58452BAB8033EB28FB4491D1CFE + E0FF8A55E4FAC77410368EC41E04EDF2 + D0F3E73DC78D3A2AF2AD0A475F906FD9 + C57858A8BF437152366E40CD2BF2F977 + B8CB2EB954E316B2E45D2F5DE9F3895B + 75A62DBF4256CFBB94A1711686439C88 + 8BB83A8417700D3227B3CC075CC64D16 + CDA05C21D41229CCF5EF9D5971E53D12 + DE88F9E71ECFEEE995CE8220E301E8ED + A7DFC7C3BB5B560F42777B8925C37C9E + 9B484F370BBC1CC43B41A7E80F335BB3 + CF9FD7F65D9A4786AF3DD1C8A6E2ABE4 + 7AC0C9AF6FC29D788CA6CA72790CBDEA + EABDFB8D4ADD0F841ED44A71483A758F + A61A4213784EB2F56D3705CCE82C9197 + C01D38A591E4D8D50451108F3414C015 + F1FF622A2D916131FCDBC6882723CC7E + 026B57D9CC1A7B7E0587E2A2140CF720 + 6C1B2BCDE6F6941A869E0A9471D4EBE8 + BB1C325F8941A0EF3493E5F3A2D46B5C + F35EEBFF3C4E87401FB26B516676CFCF + 0468921E3EB17EB9D9222EA88F27CA75 + 24ED07520C2E02824370A3994F7E7A0E + 328CA8A63029EF5D998A9EED30EE04FE + B458252DB56890ECD0D0D3B1FF3E4FA2 + 76674E127E6C44FC07C408ADE81BEE3A + 741924A073B909B7AFBDDB23C25D9CE2 + FD97BD7042E61F5298DA2ABBC1AA143D + EBD7ABE276C83631D459932245E75FBB isa PBXGroup name - Support Files - path - ../Target Support Files/MBProgressHUD + Core sourceTree <group> - 1BB15402D8C2FB01A198273BA1991DED + 18B2773AE867F4086B9CED447612495C - includeInIndex - 1 + buildActionMask + 2147483647 + files + + C122C0C4443AD49259094EF7D024D5CE + E43664449F204164CFA04C3AAB7A4E98 + isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - EXPMatchers+beginWith.m - path - Expecta/Matchers/EXPMatchers+beginWith.m - sourceTree - <group> + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 1C1837DF96AE65F662773DF1956BFF09 + 19363F17045B7C290526F6CA332905D2 baseConfigurationReference - 805AE44C01D7936BA8A238C6C5C4807D + AC73D8815894F832B4005168AA85F69B buildSettings + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf ENABLE_STRICT_OBJC_MSGSEND YES + GCC_NO_COMMON_BLOCKS + YES GCC_PREFIX_HEADER - Target Support Files/Specta/Specta-prefix.pch + Target Support Files/SDWebImage-iOS7.0/SDWebImage-iOS7.0-prefix.pch IPHONEOS_DEPLOYMENT_TARGET 7.0 MTL_ENABLE_DEBUG_INFO @@ -1086,33 +1346,28 @@ name Debug - 1CCE02DFD89EF9B58809C379D0496685 + 199EF76AC47B3EE9FA80BE53835AB7B1 + buildActionMask + 2147483647 + files + + 7C8990F70B3DFACC64C905887ECE29A7 + F415F451C67C56BD2821DFDC2802FE6C + isa - PBXTargetDependency - name - Expecta+Snapshots - target - 05257CC76400D71826E603561A0F73E6 - targetProxy - FE4A445C1692178764D9C71EAC64ABAC + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 1D536F869C3B7D603AC4630F3F6AB919 + 1AB098D345C36F8A9B5ADCCFB15737A7 - includeInIndex - 1 + fileRef + C6FE69AE06A770FF76C19B8039EC0780 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - ExpectaObject.h - path - Expecta/ExpectaObject.h - sourceTree - <group> + PBXBuildFile - 1D772DC880BCFABF5028DA167DE6B119 + 1B05B0CD8AD64A474D9E605960D58190 includeInIndex 1 @@ -1120,17 +1375,15 @@ PBXFileReference lastKnownFileType sourcecode.c.h - name - SPTExcludeGlobalBeforeAfterEach.h path - Specta/Specta/SPTExcludeGlobalBeforeAfterEach.h + SDWebImage-iOS7.0-prefix.pch sourceTree <group> - 1DD364708B768EB7C94DD9BB48F217F4 + 1BC96AA7ABE5415DC292A71FE5E7895C fileRef - D54993E311EDD8802711B01895286E4E + EABDFB8D4ADD0F841ED44A71483A758F isa PBXBuildFile settings @@ -1141,47 +1394,102 @@ - 1E08912939425D011D7C47713E6CDAF0 + 1BD34A41B9EB7A3BF4EAE0E805DC1B2D fileRef - BD4E094BE48FCAB50C0CEFC92B2C0B04 + B0AD4D3FD51000868948132517923991 isa PBXBuildFile - 1E360C94C47826C4CAEEDBFC04C36A42 + 1C0BE20A7E81BA8AFD0E847EAA2CD797 - includeInIndex - 1 + children + + FF45457A6D21020295150867C0C55328 + 9C09975417C60E793DBDE7DC2FCA193B + D66EBB56C69B57E3278B7D1E3BA5B78C + isa - PBXFileReference - lastKnownFileType - sourcecode.c.h + PBXGroup name - XCTestCase+Specta.h + MWPhotoBrowser path - Specta/Specta/XCTestCase+Specta.h + ../.. sourceTree <group> - 1EF011C5AA1726984A1B50A46191CE9B + 1C2BCA8BF5959F0E9B3B1133F6AD8B13 + + buildActionMask + 2147483647 + files + + 6107FB2EEDC40DCD1F581BD9EEDEEF6F + BBAB845F3EE74389C710D8EC6E63C0ED + 4A278E4929944C26E856A044C7DBAB0C + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 1C4193B07580488BB5EFEFB38D0D46EB includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h - name - XCTest+Private.h + sourcecode.c.objc path - Specta/Specta/XCTest+Private.h + MWPhotoBrowser-iOS7.0-dummy.m sourceTree <group> - 20503FB88D4DCF32DC61DD92AA97A82B + 1C4E4899BE01820151368B07EB14F4A0 + + baseConfigurationReference + 4C9B4AA5421E244A92A44DC30389504F + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/Expecta/Expecta-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 5.1.1 + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Release + + 1D9ADE854EF6B03373686DE21135A210 fileRef - 6C8B1153C440825B90681905FC2F85B9 + 04969E3FA5A6426CA279D6D6E7FAD408 isa PBXBuildFile settings @@ -1192,217 +1500,154 @@ - 2055A9E17F10DAA3DD7884DDF96A0A50 + 1DD226F91120BB620D12A0F8FE7CF336 - includeInIndex - 1 + buildActionMask + 2147483647 + files + + 10ADD30DACA1E62D7490166AE3F624FC + 26A36FA8D35893B3BBCCB33FFA05E7FE + 28A45A7B0343A05E5D4E1292102A00C9 + 04D98118ED159D36DC0DFF8CEAB3D6D9 + C9AA5CE493576094778E1A962ABB1A22 + 72D6E5022953E39835BCF1FD700AAC7F + 2CBCC0A422BD02CEFD9392E9B785C774 + C01029842F9E8EB453C903A7FA59A754 + 1FA887127F6BBEB63AD36344FE82A3A6 + F66C8BD01B8A66DA04A7262AEF20023A + 259B85684A331027CAB066DCBD44811C + isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - MWPhotoBrowser.xcconfig - sourceTree - <group> + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 216490FDC8376C36DB920710C65B92F3 + 1E1312099445C77CADC00F8342CA4311 - includeInIndex - 1 + fileRef + 2C858930677061AD09AC27FE116BAD94 isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - MWTapDetectingImageView.m - sourceTree - <group> + PBXBuildFile - 216D98400141172993D43965B937A9C6 + 1EF0C84473FDF7A67C4055259B955DD0 - containerPortal - D41D8CD98F00B204E9800998ECF8427E + fileRef + 026B57D9CC1A7B7E0587E2A2140CF720 isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - DE3B07ED7FF04F506B0C5E00F4973589 - remoteInfo - SDWebImage + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - 222A85D6DAB7D3AC98EF6D7E68B13740 + 1F1DDDC0D20B580AE127BB14B43C9BEA - includeInIndex - 1 + fileRef + CDA05C21D41229CCF5EF9D5971E53D12 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - SDWebImageManager.h - path - SDWebImage/SDWebImageManager.h - sourceTree - <group> + PBXBuildFile - 2239B5E63C5D2C1323D66F489F075C42 + 1FA887127F6BBEB63AD36344FE82A3A6 fileRef - 7250BEF99A7686EAB50B17986FDCED3E + E272AF35FCE3F97A94369B53F0A934A3 isa PBXBuildFile settings COMPILER_FLAGS - -fno-objc-arc + -DOS_OBJECT_USE_OBJC=0 - 232510EC13760470E86AABE302EF2B8E - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - EXPMatcherHelpers.m - path - Expecta/Matchers/EXPMatcherHelpers.m - sourceTree - <group> - - 237FB063FB365119546C7B5006224F3B + 204FB45F31AD554008F6C34FFA39B08F fileRef - AB8960E6933BD274C11AD9C15CF410AF + 0AAEE06FB4F7F495B1AAD1EDDEB2E9D2 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - 244F3301C3C77C58A95FA7864D67858D + 20E1F60112AF206BFFDDD0E0153D60CD - includeInIndex - 1 + children + + FB6ADEE24FB07E1430D11EDF1F4C7636 + 6671A09ADA325A55D4842D9BAA00A625 + BF29141D751888DFCD02AC4659C5B58F + 60B0663708B59D71E4CDF1092C6CFFFF + 86AC811023033375386F83EE83613D20 + isa - PBXFileReference + PBXGroup + name + DACircularProgress path - ImageSelectedSmallOff@2x.png + DACircularProgress sourceTree <group> - 24FAEADA1249F6042B4B4B135CDD0DF9 + 20F27C938C5B92508B8FDCD6BC472B17 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - EXPMatchers+respondTo.m path - Expecta/Matchers/EXPMatchers+respondTo.m + ImageSelectedSmallOff@3x.png sourceTree <group> - 25003C5ED979935F9483683DD2350697 + 2175A32C1039DDFCDA53B27892268F1A - children - - FDEE1AFEA9C68977819B7D652EE1F6F2 - 2ECFFDC2A7A648A930A461436E2ECC2D - 6C92311B12AB812820A4267248D69CCB - + includeInIndex + 1 isa - PBXGroup - name - MWPhotoBrowser + PBXFileReference path - ../.. + UIBarButtonItemArrowLeft@2x.png sourceTree <group> - 257A97CE59C7E5D5191DC00F15C261BE + 21D8800117D94ECB38C34A0C92B3A6FE - baseConfigurationReference - EF5AC1222120F3BAB7481DA9615352B0 - buildSettings + fileRef + EB7C443793D663559DECA9726CE6643A + isa + PBXBuildFile + settings - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/FBSnapshotTestCase/FBSnapshotTestCase-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MTL_ENABLE_DEBUG_INFO - NO - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES + ATTRIBUTES + + Public + - isa - XCBuildConfiguration - name - Release - 2677C6B3B248613A05ABDFB423C9F02C + 21E12D318DAE2620D63E0BD215841D4D - children - - EB4DE2009B511D62CF6BFE67FA73E321 - 9374BBB3BA16684D1B858CCC9C3E2D8A - 523087C6D186A9F5BEE78D39F9A78F3F - 71BC183B1FB7AB5F8CF9A3383C6B354C - C9B97F514121309E4531C3439E206EC7 - D5EE5F7C5A846B01ACF225DE04E52196 - B83D4C05E77991780CA69BF68B431DD2 - + fileRef + 26AC6E873763498678032ABB5C85185C isa - PBXGroup - name - Pods-MWPhotoBrowser_Example - path - Target Support Files/Pods-MWPhotoBrowser_Example - sourceTree - <group> + PBXBuildFile - 26D004126E0DEF14D67843A444753FFF + 2239B5E63C5D2C1323D66F489F075C42 - buildActionMask - 2147483647 - files - - 8B97E5CA574F06B315C5F1D27B25DEFB - 1629A676793A787618A75ABDA6E20C56 - + fileRef + CAD5A917A7AF591519A67F98E5C8BEF4 isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + - 27499458B06BE275AED9ACF720F09853 + 2243E902BD34A84A9994962E540438DC fileRef - 1D772DC880BCFABF5028DA167DE6B119 + 352DC47B11350801DF2126AF7583BA78 isa PBXBuildFile settings @@ -1413,50 +1658,34 @@ - 2779B434631901F1434BC316E3FB5AE9 + 22658CC272A795BEAB4052DB0B2CE0DF - includeInIndex - 1 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h + PBXTargetDependency name - EXPMatchers+beNil.h - path - Expecta/Matchers/EXPMatchers+beNil.h - sourceTree - <group> + MWPhotoBrowser-iOS7.0-MWPhotoBrowser + target + 5C92E77631D5ABB9DAE27B2AECB681EC + targetProxy + 3576FD050D543C4B07B54399EA380BEE - 28A20AE3D7A1F50CAD0D9D8B71205EC6 + 22C88C33F57CF0085CC8A7158F1C7B60 includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.objc path - ImageSelectedOn@2x.png - sourceTree - <group> - - 29062DA699B861B896758C5A677765BD - - children - - 2677C6B3B248613A05ABDFB423C9F02C - 043124F225814F80E4ED4FF4BC40156A - - isa - PBXGroup - name - Targets Support Files + UIImage+MWPhotoBrowser.m sourceTree <group> - 2945FAA75C956DD6A541EB51E42E6899 + 231B3D6C19C96540751BA861174C3DE4 fileRef - FDE2A8151D1FDB6749FB32276220BE7C + B8CB2EB954E316B2E45D2F5DE9F3895B isa PBXBuildFile settings @@ -1467,49 +1696,28 @@ - 2989492A1A182744E36FD61DF1746D94 - - fileRef - DF11024BF511A0D2225D4BA84770CED7 - isa - PBXBuildFile - - 299B50B04F45E1A2F52075C3B7A1AEB2 - - isa - PBXTargetDependency - name - SDWebImage - target - DE3B07ED7FF04F506B0C5E00F4973589 - targetProxy - 90C5595E0565CBEBB42EFEBB157FF619 - - 29B6CC3E1560257A444A209D97AC271E + 237FB063FB365119546C7B5006224F3B fileRef - 7599165E41821009340AA99FDAC29AE0 + 3DCE30BEC4A66B63ACD53649C778D138 isa PBXBuildFile settings - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 + ATTRIBUTES + + Public + - 29E4E0528D088AE8B2EE6D38E19D375E + 2388F4F4A69BCAD53156600CD142A591 fileRef - 6C982719FDCF6684EB752A0153066FC3 + 2175A32C1039DDFCDA53B27892268F1A isa PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - - 29E6F040DB8ACF8886F7FE628840C480 + 23B16555B9F61B5736971092E8DB5E8A includeInIndex 1 @@ -1518,133 +1726,77 @@ lastKnownFileType sourcecode.c.h name - EXPMatchers+beKindOf.h + EXPMatchers+beGreaterThan.h path - Expecta/Matchers/EXPMatchers+beKindOf.h + Expecta/Matchers/EXPMatchers+beGreaterThan.h sourceTree <group> - 2A17721E4A81DB608CA6D4FB6F0ADAFB + 23F2F6A956EBE8B58AD50C1BE73FC4A5 fileRef - 3E7FFEF7BFB0350CE8FCC2D6D64D1396 + F35EEBFF3C4E87401FB26B516676CFCF isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - 2ACE82A15131DC569A786CB49EFD1804 + 24997E2929A08A1BDE38B83A2E59C51D - includeInIndex - 1 + children + + 189ED11A2B46FF2F89923860716BB9D0 + 5AFC044E0BD00A02CA62AE59CE49F835 + isa - PBXFileReference - lastKnownFileType - sourcecode.c.h + PBXGroup name - SPTCallSite.h + SDWebImage path - Specta/Specta/SPTCallSite.h + SDWebImage sourceTree <group> - 2BFB267A4274D5D4B277138F9D4EEDA1 - - fileRef - 2EDD6193448F7939784FDF1C8016F000 - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - - - 2D5EE41C6DDBA8F159EEA954F335387A - - isa - PBXTargetDependency - name - MBProgressHUD - target - FE2F1D7B9D9FCEA148517E4657B243F4 - targetProxy - FF6817E7D2D11A6D747BFAEA934D0FD1 - - 2D6EC33CA8D9BD953AD29E16068F2CBD + 24ED07520C2E02824370A3994F7E7A0E includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc name - SDImageCache.h + UIImageView+HighlightedWebCache.m path - SDWebImage/SDImageCache.h + SDWebImage/UIImageView+HighlightedWebCache.m sourceTree <group> - 2D8E8EC45A3A1A1D94AE762CB5028504 - - buildConfigurations - - B37F0F91F85060E28F1DAAB522DC7EC1 - 052A17875CB827423D627183396CEB60 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - 2DE374580729793C277006A3481402A3 + 251DEDD6E8EECD8A2FB3B07D0AB661E7 - includeInIndex - 1 + fileRef + A6B81301393464F04727B242313DF8FB isa - PBXFileReference - path - VideoOverlay@2x.png - sourceTree - <group> + PBXBuildFile - 2E7CBF297AA8A0E93C23BFAF1BE94DEE + 258E771B740DFDB2009D494E06509362 - includeInIndex - 1 + fileRef + C985ABCEABAC37D230D1BFFF9612BDDD isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - EXPMatchers+beIdenticalTo.h - path - Expecta/Matchers/EXPMatchers+beIdenticalTo.h - sourceTree - <group> + PBXBuildFile - 2ECFFDC2A7A648A930A461436E2ECC2D + 259B85684A331027CAB066DCBD44811C - children - - 37ACF2CCD5DA793FAF5F71CF8F469294 - + fileRef + 6A1F57A44D1B5C641E9C4BD67D1A8F6A isa - PBXGroup - name - Resources - sourceTree - <group> + PBXBuildFile + settings + + COMPILER_FLAGS + -DOS_OBJECT_USE_OBJC=0 + - 2EDD6193448F7939784FDF1C8016F000 + 25C1953BA899E791C4AEA91E97A093AA includeInIndex 1 @@ -1652,96 +1804,59 @@ PBXFileReference lastKnownFileType sourcecode.c.objc - name - SDWebImageManager.m - path - SDWebImage/SDWebImageManager.m - sourceTree - <group> - - 2F29BE2EDEBA2861368726A4772F4E8E - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - SPTExample.h path - Specta/Specta/SPTExample.h + MWGridViewController.m sourceTree <group> - 2F501FE84845EAD97B9087DAFCBBEE0E - - buildConfigurationList - 57205495CF13B4EE93B13B7B0E3A1BD2 - buildPhases - - 143C0831AA95D723669324010D835391 - 199EF76AC47B3EE9FA80BE53835AB7B1 - C6AD7852D34E8A80DFF3B8376BDE812F - - buildRules - - dependencies - - isa - PBXNativeTarget - name - Expecta - productName - Expecta - productReference - ADEAC9FE1270035973745D0EB3B84395 - productType - com.apple.product-type.library.static - - 2F9D3747596E4E074C3B776949091047 + 2657F2337D4E2CCB582EBFEA5D4DBCF6 fileRef - 44D0D04C0DF98EC05B4909F397D6F7FF + 8BB83A8417700D3227B3CC075CC64D16 isa PBXBuildFile settings - COMPILER_FLAGS - -fno-objc-arc + ATTRIBUTES + + Public + - 2FD7E39AFBAB884FA64CFB5DBDFA1F7B + 2677C6B3B248613A05ABDFB423C9F02C children - CBE0BF23E2B3F39D22B51BC93022DE7D - B73F44C64FD91479CFE63C882F1E5E70 + EB4DE2009B511D62CF6BFE67FA73E321 + 9374BBB3BA16684D1B858CCC9C3E2D8A + 523087C6D186A9F5BEE78D39F9A78F3F + 71BC183B1FB7AB5F8CF9A3383C6B354C + C9B97F514121309E4531C3439E206EC7 + D5EE5F7C5A846B01ACF225DE04E52196 + B83D4C05E77991780CA69BF68B431DD2 isa PBXGroup name - SDWebImage + Pods-MWPhotoBrowser_Example path - SDWebImage + Target Support Files/Pods-MWPhotoBrowser_Example sourceTree <group> - 311D5C7B166178CCB79CFD7E8DD4F641 + 26A36FA8D35893B3BBCCB33FFA05E7FE fileRef - D91F4635A8EDF54921FC9B759BE009F6 + 5D02A92C9AEDDCA311682586732CAE63 isa PBXBuildFile settings - ATTRIBUTES - - Public - + COMPILER_FLAGS + -DOS_OBJECT_USE_OBJC=0 - 3173089CCB6C063D260C58DD7BA3ABF5 + 26AC6E873763498678032ABB5C85185C includeInIndex 1 @@ -1749,43 +1864,36 @@ PBXFileReference lastKnownFileType sourcecode.c.objc - name - EXPMatchers+beKindOf.m path - Expecta/Matchers/EXPMatchers+beKindOf.m + MWZoomingScrollView.m sourceTree <group> - 319D6926D1261EB1150D83F672CCA35E - - fileRef - A09DD0AB6A512D74E5628070EBD56026 - isa - PBXBuildFile - - 32A9515F32A6ACB0753681241864BABA + 26D004126E0DEF14D67843A444753FFF - fileRef - F1948E226356BF652752F9FA7317BC73 + buildActionMask + 2147483647 + files + + 8B97E5CA574F06B315C5F1D27B25DEFB + 1629A676793A787618A75ABDA6E20C56 + isa - PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 33985216BF501EDD56E784D7CAD32FE7 + 2792D87A7A6DE1E504C287C38A07CFD4 fileRef - B1A8AF86363A5D8093FFE48748DC20A1 + 32A3EB07AE8EC60B9A743E187C698739 isa PBXBuildFile - 339A0C1BFF72397A705959E03877DDDB + 27A3721EC06637573F1420548F723526 fileRef - 5F878B29A406784703BC9F07FBFDD99F + 6554E9151EB13BE047A0BDA470F6E38D isa PBXBuildFile settings @@ -1796,24 +1904,30 @@ - 341D7536159B52F41598F730CC45D548 + 27B7809589A47B17A4212E0116A243A6 fileRef - 8136A5BFC35DA48ABC2C0D94EA79B7F0 + 94B3E7FD543C524CF33D079199EE7059 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - 34B2272FAB199A0B69B898BFB9E733E1 + 27CE69326A3F77195A89CDDB359893F9 + + containerPortal + D41D8CD98F00B204E9800998ECF8427E + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 8E6E4E5E1771D7908C7C75660E7B5C90 + remoteInfo + MWPhotoBrowser-iOS7.1-MWPhotoBrowser + + 28A45A7B0343A05E5D4E1292102A00C9 fileRef - DE369A67A17A1EE2351376730BB039A4 + C81138DC2538A91FE1750C57875F7BF8 isa PBXBuildFile settings @@ -1822,10 +1936,44 @@ -DOS_OBJECT_USE_OBJC=0 - 34F30E1314EC4C287E6B89477C2D0FB4 + 29062DA699B861B896758C5A677765BD + + children + + 2677C6B3B248613A05ABDFB423C9F02C + 043124F225814F80E4ED4FF4BC40156A + + isa + PBXGroup + name + Targets Support Files + sourceTree + <group> + + 290EEFC0E1C3BF1683E7693868D583CB + + fileRef + 5B14A0946BD6069275E1664D74DB5DB2 + isa + PBXBuildFile + + 291E63B3BBA5EE2CFE329A52432D1146 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + MWPhotoProtocol.h + sourceTree + <group> + + 2945FAA75C956DD6A541EB51E42E6899 fileRef - 8E485F27A3C78223FB086075C2974A49 + E172841A0D1610F84C17075A4D8DAB74 isa PBXBuildFile settings @@ -1836,7 +1984,7 @@ - 3540CB186FE2EE9EE99381DA600738B8 + 2A012232008EE438D13D2498136877EB includeInIndex 1 @@ -1844,175 +1992,102 @@ PBXFileReference lastKnownFileType sourcecode.c.h + name + EXPMatchers+respondTo.h path - EXPMatchers+FBSnapshotTest.h + Expecta/Matchers/EXPMatchers+respondTo.h sourceTree <group> - 362D9038C23D156F9F055EDF5565A5F1 + 2A0ADAE77C4A9140BB1B3BE5CB54731E - children + buildConfigurations - 7D8198AD59277CB0379442369CF5247E - 730E6CDCF09A029F8976D82EB7DACCF2 - 69C3D12EC1F2F8AE628C05AC390D9D61 - C402F1446422CAB85FC53BD77E5E9018 - FCA01B035C5FC9AF0969977B2C54A7A9 - 5A531485C6A0D185C72E03CD91B49919 - A8B86384F8C46CE8544B59FEB6C657F5 - D8619A771228AD0402C4D464E3C6EE53 - C0A33FBAF4E7C28807891EC8D0B65204 - 9D6702575943BF5C71AD0E2299CB53E2 - AABA7597E19FD75C9F320BCD6BB2759E - C266061F84E4CFB93AF99D21EEB13401 - 564C3E7A9D55850E48FAC93F77A7F478 - 6C8B1153C440825B90681905FC2F85B9 - 216490FDC8376C36DB920710C65B92F3 - 8952D588C0E5AD12FD9CF3747FD061F2 - 94A310E9C2919B9904E9AFBD2837C2B9 - AE6C39B87AE391EC710DA8FB520ED3F5 - A1195ED094D0C8B66BB073959AA2ACCD - E7E794ADE2D5267DF8949DD0A42B935B - 5289709799A254B807701A658BD9D425 + 0D794A5E1BA709633EF533B09A31137D + 6714A6EB032DB017639853BDCCF50838 + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release isa - PBXGroup - name - Classes - path - Classes - sourceTree - <group> + XCConfigurationList - 37726FF893DE97CB8E4497EED1D4F28E + 2A17721E4A81DB608CA6D4FB6F0ADAFB fileRef - 0668957FEB1B3CAE2EABBC4AA9ABA7C3 + 00DAAD802A7645CAECEDFD6DDE155D87 isa PBXBuildFile settings - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 + ATTRIBUTES + + Public + - 37ACF2CCD5DA793FAF5F71CF8F469294 + 2A8501153EBA897AE0E362FF29660F53 children - 4F696B27FDAEF5BE2C52EFF1848239D6 + 93CEE4DD787EF512C9D9AA34A4223E43 + 32A3EB07AE8EC60B9A743E187C698739 + DE865E31A9429063B7FBB7B3B89F5C91 isa PBXGroup name - Pod + Support Files path - Pod + ../Target Support Files/FBSnapshotTestCase sourceTree <group> - 37E4F69B3E6AFDEE8D68A3430CEC8BF5 + 2AF1D3B3F78C6771F92418DF70000249 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h - name - DACircularProgressView.h path - DACircularProgress/DACircularProgressView.h + ImageSelectedOff@3x.png sourceTree <group> - 386634C7797B60DF71C8AD13DAAD315D - - containerPortal - D41D8CD98F00B204E9800998ECF8427E - isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - 9775596B3CA16905FC8F66DA8E2A3C67 - remoteInfo - DACircularProgress - - 38777F32EB3F13ED8D2047C1C9ED6D6D + 2B206C8C4C70D050769CB80E9492E658 + explicitFileType + archive.ar includeInIndex - 1 + 0 isa PBXFileReference - lastKnownFileType - sourcecode.c.objc name - UIView+WebCacheOperation.m + libSDWebImage-iOS7.1.a path - SDWebImage/UIView+WebCacheOperation.m + libSDWebImage-iOS7.1.a sourceTree - <group> - - 3907B3A4464A3069E24142505C76338D - - buildActionMask - 2147483647 - files - - AAF71AC633AFEC1D271F81DA183E75F0 - 5116C7E5987E156AC4BAA9BF327459AD - 5728F0AC6D99470A4AF64DA015991D65 - 16A268BA14BC07320BB7FBE44EB37FB4 - 87A80C8B1F0C635DA56B74807AE426D9 - 45F8F3DCD4679DF7E346A6589E02123D - B2DE78D2D5A5CF173FEBFA2FE4B4023D - 7D56DF05F0071D94121A050CDB772D56 - 27499458B06BE275AED9ACF720F09853 - C2420EB9004B4667C6328B5C0D098C48 - E40400D97F14785D20A7A5594F0E2C56 - 904DB6CCA2AAC8D7B3245ED9628E865A - 4A0F7A4BC9D18113AABC29DECF4E51D1 - FEFA85FDDB15B89CF28DF12C1C2071E1 - 033AB851ACA0C118D009F781287565DD - - isa - PBXHeadersBuildPhase - runOnlyForDeploymentPostprocessing - 0 + BUILT_PRODUCTS_DIR - 3939EE53B37025D6F0E05FF8A4C7DCF0 + 2B3217C8CC1BD6DE885445CAABD490DE fileRef - AE1B7431EAFB4D89A49A9DAD35DBE790 + 7C0F08326F5A918F2A311222533EC950 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - 3A013F13122CDB8EE962F8CB7C6FCC8E + 2B9B06392F1B8AD1B340079A08C4415D fileRef - DFA142DA2A1E6AB454178652BAC9A075 + 35E9F4C6728536D0A225EFDF5DD2AAA6 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - 3B332CC633C291A7A96AD0922CFD8AB0 + 2C53480E319647BD8AE2D8DA1A50B5E8 fileRef - 2D6EC33CA8D9BD953AD29E16068F2CBD + 0468921E3EB17EB9D9222EA88F27CA75 isa PBXBuildFile settings @@ -2023,7 +2098,7 @@ - 3B5A7151F8E4FBFE54BF6C2AC80958FA + 2C7237EAF40D180CD096D5392125E14D includeInIndex 1 @@ -2031,152 +2106,149 @@ PBXFileReference lastKnownFileType sourcecode.c.h - name - UIImage+Diff.h path - FBSnapshotTestCase/UIImage+Diff.h + MWZoomingScrollView.h sourceTree <group> - 3C5A51B8AE7322A210CF01AFBA648598 + 2C858930677061AD09AC27FE116BAD94 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h - name - EXPMatchers+beInstanceOf.h path - Expecta/Matchers/EXPMatchers+beInstanceOf.h + ImageSelectedOn.png sourceTree <group> - 3CAA21F3728659DC1B58A336233AEB79 + 2CBCC0A422BD02CEFD9392E9B785C774 - includeInIndex - 1 + fileRef + 52548D43BC55700DF73633DFBBB74887 isa - PBXFileReference - path - PlayButtonOverlayLarge.png - sourceTree - <group> + PBXBuildFile + settings + + COMPILER_FLAGS + -DOS_OBJECT_USE_OBJC=0 + - 3CD608194F35F47CEC250368B43C48E9 + 2D72A4B75355EC0573143122E741E98B - includeInIndex - 1 + fileRef + 8C52E011985A70FC6CFD3A6D3CB01B44 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - SpectaUtility.h - path - Specta/Specta/SpectaUtility.h - sourceTree - <group> + PBXBuildFile - 3DA2CF997A09E53F375CF0DEEF25AFCF + 2D8E8EC45A3A1A1D94AE762CB5028504 - includeInIndex - 1 + buildConfigurations + + 3FA2475660FFC880302AD18E29B2E5FC + F325026B55060D3B22BEC0BAB5FA7344 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - EXPMatchers+postNotification.m - path - Expecta/Matchers/EXPMatchers+postNotification.m - sourceTree - <group> + XCConfigurationList - 3DEC242716623D70F4CC9F4A1D32805C + 2E6A3131316E7955976CB826F8A7F7F5 - includeInIndex - 1 + baseConfigurationReference + 4DA5A362F6C7352C50C0676E95C0E4F5 + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/MWPhotoBrowser-iOS7.0/MWPhotoBrowser-iOS7.0-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + YES + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc + XCBuildConfiguration name - ExpectaObject.m - path - Expecta/ExpectaObject.m - sourceTree - <group> + Debug - 3E463E2B6917D9AA08A03BA8A8E74A18 + 2EE44928B334B5F8EC6CA9631E400276 fileRef - B5969E17FAFFDC548233DC602AAC6211 + 7C0F08326F5A918F2A311222533EC950 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - - 3E7FFEF7BFB0350CE8FCC2D6D64D1396 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - EXPExpect.h - path - Expecta/EXPExpect.h - sourceTree - <group> - 3EF2F2E1AF840BA0B6AD13D59AA5F80C + 2EEA8C466B398BFCF2EE6424A1983343 - includeInIndex - 1 + buildConfigurations + + 9BB407999D6B6BD83238F9DEBE8DBD99 + 43409202E79A4C4386FFB720299DAE11 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release isa - PBXFileReference - path - PlayButtonOverlayLargeTap@3x.png - sourceTree - <group> + XCConfigurationList - 3F1E0CB31108E6E996D2E7418FE21D2E + 2F2851B279F65136EF6FD3CA85BB12CC fileRef - 661962DFFB8F4AF681F8EA78582EE534 + C985ABCEABAC37D230D1BFFF9612BDDD isa PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - - 40D39B6435EEF47A85F4E3FB684E72FE + 2F501FE84845EAD97B9087DAFCBBEE0E - includeInIndex - 1 + buildConfigurationList + 57205495CF13B4EE93B13B7B0E3A1BD2 + buildPhases + + 143C0831AA95D723669324010D835391 + 199EF76AC47B3EE9FA80BE53835AB7B1 + C6AD7852D34E8A80DFF3B8376BDE812F + + buildRules + + dependencies + isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc + PBXNativeTarget name - DACircularProgressView.m - path - DACircularProgress/DACircularProgressView.m - sourceTree - <group> + Expecta + productName + Expecta + productReference + 6C8F9DE4A48355AEDE9D9923A8F8FBDB + productType + com.apple.product-type.library.static - 40DAD22BCDD38D058B1C9A312C42DF49 + 2F8FE01380F8EF34F8D34A1855F7B917 includeInIndex 1 @@ -2185,16 +2257,16 @@ lastKnownFileType sourcecode.c.objc name - EXPMatchers+beNil.m + EXPMatchers+raise.m path - Expecta/Matchers/EXPMatchers+beNil.m + Expecta/Matchers/EXPMatchers+raise.m sourceTree <group> - 40F505E69B8595361C2A7528DDA222B6 + 2F9D3747596E4E074C3B776949091047 fileRef - B23D9E49B5B3A5C76EAFFC9C7F40B4B9 + 89A3B15DB6754B0B14CE047CBF54D8EA isa PBXBuildFile settings @@ -2203,27 +2275,10 @@ -fno-objc-arc - 4209F7E4332FDC16B4C407CA07C3E8E8 - - children - - 86A1ADA0F8A843FA09BFF9142BEF76D5 - A6A21F67B2A713138BF1A404E3460084 - 990C6F27E60B10F0E4BA0674D80F546B - - isa - PBXGroup - name - Support Files - path - ../Target Support Files/Expecta - sourceTree - <group> - - 4231743B6C143BDB4A5FBB032E6D3799 + 2FD5DE5FF578803DD19A9A98BC6A5FF2 fileRef - 865FAF448207E691D600F40C4ACF7C58 + DCEDF4A10BC8670D9EB6AE8BD88F362E isa PBXBuildFile settings @@ -2234,7 +2289,14 @@ - 427921605A450AEF67D129DACCD87BED + 306AE989BBBEB7928FABE1FB3E9063AE + + fileRef + 2AF1D3B3F78C6771F92418DF70000249 + isa + PBXBuildFile + + 30D028565C3AC56669794F4FB8CE5930 includeInIndex 1 @@ -2243,108 +2305,43 @@ lastKnownFileType sourcecode.c.objc path - MBProgressHUD.m + MWGridCell.m sourceTree <group> - 430CE433DB59FE090A8CC6AFCFA43337 + 312F48D37605F7A2FAFBF1F2AD9B19A7 - fileRef - D10BA2216A9B5F41557B4FC448EE865C - isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - - - 4358F868C1553FF4273B0726E5AD2012 - - includeInIndex - 1 - isa - PBXFileReference - path - ImageError.png - sourceTree - <group> - - 4383E0DB1B07B9EB3155EF5D5F27C7BA - - fileRef - 4BE4F23029A1EDB234CF7F2AEB043EB0 - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - - - 439E7363C4854DD4D1E46F32C2EA2F3B - - fileRef - 8F2B443FA0D511403E4DA2A79DB3302A - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - - - 43A1104CA0C628C2F693902EADA32B8C - - fileRef - 746A80915CF52BE732D200BAA851FBAB - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - - - 4463CD014E8C258B7F8BF0FD64901B8F - - fileRef - 63327617AD4F38D1236E71968B0991E5 - isa - PBXBuildFile - - 44D0D04C0DF98EC05B4909F397D6F7FF - - includeInIndex - 1 + buildConfigurationList + 8B52DAC8A645C24AA93F2FB02B019D9E + buildPhases + + 6511AC2FC83F218549820CFB3EFC4D7F + 1C2BCA8BF5959F0E9B3B1133F6AD8B13 + 14A36F2F95F39CF9EDC99EBFCBF7FB20 + + buildRules + + dependencies + isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc + PBXNativeTarget name - EXPMatchers+beInstanceOf.m - path - Expecta/Matchers/EXPMatchers+beInstanceOf.m - sourceTree - <group> - - 453678659359A72C87495DDD6D9BD0C6 - - fileRef - 730E6CDCF09A029F8976D82EB7DACCF2 - isa - PBXBuildFile + MBProgressHUD-iOS7.1 + productName + MBProgressHUD-iOS7.1 + productReference + 4E752C09031D34C5390AB800F63A8BB4 + productType + com.apple.product-type.library.static - 45548268D1B9EE9D37731231D940A591 + 3167F190790C804AC4A48C77090996BB fileRef - 4594A9E3FFD6ABE129882E959BB04B5E + A11F90DBB6D013BBD02E7F2884FAB882 isa PBXBuildFile - 4594A9E3FFD6ABE129882E959BB04B5E + 319E0B3A0EE31DDBCB51A7A65C686C6E includeInIndex 1 @@ -2352,15 +2349,17 @@ PBXFileReference lastKnownFileType sourcecode.c.objc + name + EXPMatcherHelpers.m path - FBSnapshotTestCase-dummy.m + Expecta/Matchers/EXPMatcherHelpers.m sourceTree <group> - 45F8F3DCD4679DF7E346A6589E02123D + 31D2E317FEF15C45A75508637B338123 fileRef - 569060A075537DFE6A4D25D96C98668B + 291E63B3BBA5EE2CFE329A52432D1146 isa PBXBuildFile settings @@ -2371,112 +2370,151 @@ - 46A2CE1545DEBE5FE9DF073C8EBFE2F0 + 31E5E71216BB01F62D2E0BD4879DEC99 buildActionMask 2147483647 files - F5F4D07451FB3E10EE7C16A83010425F - B8FC063009C06CE659C8CF168A9F8765 + 8F849B417EF1B8544158852484D3AE47 + 2243E902BD34A84A9994962E540438DC + 7B70F66227FEB34E8096CF405B4A1B31 + 137FEEC4A488CC7C592F649FA08BD385 + F1AD284D2F91BF1258E4DE7E57C1A4D8 + 4B85032B158916198CA8EB9E3613CA2F + 5357653FC938503002CBB65889050533 + 21D8800117D94ECB38C34A0C92B3A6FE + C6F2E59C3791A744AC9BC52EC83A5FF2 + C0F26F6CB2B572DA824476035D329FFA + BCFA2BA99EB882221EC319238134C70D + B8436FA73347446587081FDDF98EA9D3 + 773431F2076B312A983DAE1FF254B6AC + 78EDD814F6915CD631A2F9FD8D0B4030 + 08A812968FE76D574689A017F05B507F isa - PBXFrameworksBuildPhase + PBXHeadersBuildPhase runOnlyForDeploymentPostprocessing 0 - 46F312CBB94BAE62B58D3D7AE28E8DBD + 328CA8A63029EF5D998A9EED30EE04FE + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + UIImageView+WebCache.h + path + SDWebImage/UIImageView+WebCache.h + sourceTree + <group> + + 32911CAF3E3471264803FEF3AABBA593 fileRef - 9D5AE460F3B78B02A8AE8E5AD0DCC013 + 6C1B2BCDE6F6941A869E0A9471D4EBE8 isa PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - - 46F871A74D831312A633CCFC0A94F75D + 32A3EB07AE8EC60B9A743E187C698739 includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.objc path - ImageSelectedSmallOn.png + FBSnapshotTestCase-dummy.m sourceTree <group> - 47BC96C02F9C3E09817E3FEC2559E33B + 32DC836D83D213BC101903CE49BF575C includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc name - SDWebImageDownloaderOperation.h + EXPBlockDefinedMatcher.m path - SDWebImage/SDWebImageDownloaderOperation.h + Expecta/EXPBlockDefinedMatcher.m sourceTree <group> - 487899F028C39C1A518547A1AB2F625A + 33709BECCCA619DFEFBF9EA31B1923E1 + + fileRef + A7DFC7C3BB5B560F42777B8925C37C9E + isa + PBXBuildFile + + 337F4B9E59424051D13CDC4754F7CEF8 + + children + + 74325A8C735AC27298B53AE77A62758D + + isa + PBXGroup + name + Pod + path + Pod + sourceTree + <group> + + 339A0C1BFF72397A705959E03877DDDB fileRef - D70BED84191514A998A08D7F3B8BBB17 + 7768E180287F65FB37DCC3EF5E5C5325 isa PBXBuildFile settings - COMPILER_FLAGS - -fno-objc-arc + ATTRIBUTES + + Public + - 487E0AD53E31FE34EC41B45FC09B9097 + 33B12011260397D31635C1A0376728CA includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + DACircularProgress-iOS7.1-dummy.m path - UIBarButtonItemArrowLeft@3x.png + ../DACircularProgress-iOS7.1/DACircularProgress-iOS7.1-dummy.m sourceTree <group> - 49D43B7D98ABA386628BDA9FB6BA411B + 33D70A98285D51C294091A2EE3D7D87D includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h - name - SPTGlobalBeforeAfterEach.h + text.xcconfig path - Specta/Specta/SPTGlobalBeforeAfterEach.h + DACircularProgress-iOS7.0.xcconfig sourceTree <group> - 49EFE75BAF060A33327F3CE8C18436F2 - - fileRef - 232510EC13760470E86AABE302EF2B8E - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - - - 4A0F7A4BC9D18113AABC29DECF4E51D1 + 341D7536159B52F41598F730CC45D548 fileRef - EF75C10714B7CFF9071553F07D94A550 + E7559EE8E94EF4568A698508AB5E5320 isa PBXBuildFile settings @@ -2487,219 +2525,216 @@ - 4B72A26F758BB4CA3663A7FB67696029 + 34FCD34192B3E4510BB703F0B7FC9361 fileRef - DBE203B988A948E71FDDCAE62BA1F4CC + 7AC0C9AF6FC29D788CA6CA72790CBDEA isa PBXBuildFile settings - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 + ATTRIBUTES + + Public + - 4BE4F23029A1EDB234CF7F2AEB043EB0 + 352DC47B11350801DF2126AF7583BA78 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h name - ExpectaSupport.m + SpectaDSL.h path - Expecta/ExpectaSupport.m + Specta/Specta/SpectaDSL.h sourceTree <group> - 4C9C7890ED44DBC3090EEDFD92749F0A + 3576FD050D543C4B07B54399EA380BEE - buildActionMask - 2147483647 - files - - B733330A3935B54DE57E0503C1867DAE - 9C8319C4AFAB3CAE3C7314EAD8D1AB34 - 4B72A26F758BB4CA3663A7FB67696029 - 37726FF893DE97CB8E4497EED1D4F28E - EB75F515760C184B2ED65E8649DC5792 - 67BBF4202A90EC070C5EBE20B57A0255 - E127589B46F33617D24F341DBAE1E90D - 439E7363C4854DD4D1E46F32C2EA2F3B - 32A9515F32A6ACB0753681241864BABA - D9E225250B8DAA16A4D7B6A66EC6574A - 0B3C605995BE46623C50E7658A1CBE96 - + containerPortal + D41D8CD98F00B204E9800998ECF8427E isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 5C92E77631D5ABB9DAE27B2AECB681EC + remoteInfo + MWPhotoBrowser-iOS7.0-MWPhotoBrowser - 4CFA073D420411E3535ABA966BEE98CC + 35E9F4C6728536D0A225EFDF5DD2AAA6 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc name - UIImage+GIF.h + SDWebImage-iOS7.1-dummy.m path - SDWebImage/UIImage+GIF.h + ../SDWebImage-iOS7.1/SDWebImage-iOS7.1-dummy.m sourceTree <group> - 4CFCAA497A77475D017F781F8241A4C0 + 361EBF2070C5609958789A14E4A19248 fileRef - 5E350F03F362C03BE32737DDE72D4632 + 75A62DBF4256CFBB94A1711686439C88 isa PBXBuildFile - 4D720BB8AE19E427E58843509B28FEB6 + 368B6233FA7B7A42321DA1FE5F4071F3 + + fileRef + BDBA1D97314684EAE41BEDC18CE34FCD + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 36EF33AD9610A185983EBA61F85A14E4 - explicitFileType - archive.ar includeInIndex - 0 + 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.objc name - libPods-MWPhotoBrowser_Example.a + ExpectaObject.m path - libPods-MWPhotoBrowser_Example.a + Expecta/ExpectaObject.m sourceTree - BUILT_PRODUCTS_DIR + <group> - 4DCDDE359E1F3BB419E0F7E9DD12CBB6 + 37090385AF66D93707F0C15A5853CB02 fileRef - 6CA9CE30C9B7FD5557F8DD0E06209E36 + D0E862B0A7C9ACC538472981D6086B23 isa PBXBuildFile - 4F696B27FDAEF5BE2C52EFF1848239D6 - - children - - 4358F868C1553FF4273B0726E5AD2012 - ABDF044BC66387B0E03E70BAC09D0AC8 - BA9181C8B2773795F2EACBDE286994AD - 6CA9CE30C9B7FD5557F8DD0E06209E36 - E6798A1D89E725C8EB02146EE4B0E31E - D2307EC60BB4D23E49C1420E6F192943 - F2334A461A36CF285AC6F7E96F8FE0DB - 28A20AE3D7A1F50CAD0D9D8B71205EC6 - C9BF70FB69B8740763B185C23C560434 - BD4E094BE48FCAB50C0CEFC92B2C0B04 - 244F3301C3C77C58A95FA7864D67858D - 60E1461AAED23D358B1A25A48F9DD77F - 46F871A74D831312A633CCFC0A94F75D - E4436D58F27EAC932F3CC2A7619D5FD3 - CB3EA5CC56581FD52BDBA0179D956E7B - 3CAA21F3728659DC1B58A336233AEB79 - 1A1E6F8D4C651A22BB8CCEF1226FB1EE - 75F83323F205A277BEC18AABDA0FA739 - 6D7C34F3A270979025E31A50FFFC7F28 - 0B92B054A2338462A743EB368F25A20B - 3EF2F2E1AF840BA0B6AD13D59AA5F80C - 0A9B8E3E35177F52A643739AC50B00FA - C36BB9623ECA2B27942B66986A784EC9 - 487E0AD53E31FE34EC41B45FC09B9097 - BDD78DD77E210708F222D40A2FDE75B1 - 8DC04A9EEA14F0D2300FB6C0CAEB9CAB - 7323B64F45BBE15A70D98D5E7FBF31C8 - C162177585DC8E186D24CADCC233B0EA - 8439940A3793CF65B24F4185E04317D8 - D64041D7A1004D2C8771C29362B59366 - 8F3064A5B520D1E4290AA240A05B7D6F - 2DE374580729793C277006A3481402A3 - 9604D510A96A637DD9AE0D304B68A5A2 - - isa - PBXGroup - name - Assets - path - Assets - sourceTree - <group> - - 5023A97277B66BB3E83DA779FEBAE80C + 374B79A72CCE5F3CB0CA1EF834AAE975 fileRef - 94A310E9C2919B9904E9AFBD2837C2B9 + BB77A60BFB6B1B88E541338BFB8D00E9 isa PBXBuildFile - 505D7B9189B81314EF02A1E9479972D0 + 37CF1AAA9EAFCF14857EEE4E5E41F784 - children - - 3540CB186FE2EE9EE99381DA600738B8 - 8C4EC29461A90C294949DAE717A1BEC5 - 6772D2471C34E5B39F0D3E7D0E235DA0 - + includeInIndex + 1 isa - PBXGroup - name - Expecta+Snapshots + PBXFileReference + lastKnownFileType + sourcecode.c.objc path - Expecta+Snapshots + DACircularProgress-iOS7.0-dummy.m sourceTree <group> - 50F87BFDC26A0B4CC6DE06D3ACBD0714 + 37F531C126B1896AC3926507C089C886 - explicitFileType - archive.ar includeInIndex - 0 + 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h name - libMWPhotoBrowser.a + EXPMatcherHelpers.h path - libMWPhotoBrowser.a + Expecta/Matchers/EXPMatcherHelpers.h sourceTree - BUILT_PRODUCTS_DIR + <group> - 5116C7E5987E156AC4BAA9BF327459AD + 384C3D4208EC433B53E04D35F03D13D2 - fileRef - 9BF2584F8D336EF737485D7396CFBAFF - isa - PBXBuildFile - settings + baseConfigurationReference + 7BA9D90D9129488AF4FF690D2D8CE373 + buildSettings - ATTRIBUTES - - Public - + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/MBProgressHUD-iOS7.1/MBProgressHUD-iOS7.1-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 6.0 + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + isa + XCBuildConfiguration + name + Release + + 3865B3AEFFE7FEAB11E06342C3EF693D + + containerPortal + D41D8CD98F00B204E9800998ECF8427E + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 5ED50B5F8CF57B6340E4ADE997542BE9 + remoteInfo + SDWebImage-iOS7.1 - 518626B93DA6269F02901D111B4DBF26 + 387B77A2F66A747E6E82D54865A7DF4F includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h - name - UIButton+WebCache.h path - SDWebImage/UIButton+WebCache.h + ImageSelectedSmallOn@3x.png sourceTree <group> - 518937C0924DA3A3DD216697CED9205F + 39050F2962622809DD1F0A8A48B6D075 + + fileRef + C4EE2327AA21B56F96948266BEE8B060 + isa + PBXBuildFile + + 39CD18FF411840FE55349DF7BA9796ED fileRef - D615D83AA6E624C9EEFAB11B6DAB4612 + FB6ADEE24FB07E1430D11EDF1F4C7636 isa PBXBuildFile settings @@ -2710,7 +2745,7 @@ - 523087C6D186A9F5BEE78D39F9A78F3F + 39DF90B59241BC39F89E1BE7D39B8E79 includeInIndex 1 @@ -2718,68 +2753,82 @@ PBXFileReference lastKnownFileType sourcecode.c.objc + name + EXPMatchers+beKindOf.m path - Pods-MWPhotoBrowser_Example-dummy.m + Expecta/Matchers/EXPMatchers+beKindOf.m sourceTree <group> - 5289709799A254B807701A658BD9D425 + 39EA3B0E372F4B7417BCF2F8FDB96E59 - includeInIndex - 1 + fileRef + 2C858930677061AD09AC27FE116BAD94 isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - UIImage+MWPhotoBrowser.m - sourceTree - <group> + PBXBuildFile - 53A65E3DDAAB4288F448625574686617 + 3A013F13122CDB8EE962F8CB7C6FCC8E fileRef - A59CA631962D8BFBF1D8BA4BA8F1F223 + 149EB70FB77BF58B82891D36A3767810 isa PBXBuildFile settings - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 + ATTRIBUTES + + Public + - 53FA1A78374A52A66FBFD0691645BCB8 + 3A37FF224203D05A83573C250EC4EF67 - buildActionMask - 2147483647 - files - - B25B4A401CE0322E5FA936642D8E8A36 - E145A7E23B46A8C1E1549511735A041D - DD7BDEE57A8E95F9F327AC87B6A78256 - BEEAFC79B66B12E6D67D140381BE25F2 - 618AF4F15226C5AED0802286F3763EF4 - B52658FC373BA42C6DBF475CAEA30F09 - FFF549D1FBC0937A99BED40CC44BC155 - 760A4E328E68E43D12295FA08F7475FD - 20503FB88D4DCF32DC61DD92AA97A82B - 14BD3072FD1820402768B3D7F2E5B4A5 - FB42B2F11B39412F3015A082008F1782 - E54B859019C3D44B55F4723880F93D4D - + containerPortal + D41D8CD98F00B204E9800998ECF8427E isa - PBXHeadersBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 493375293C63883E773D55FB79AF6D25 + remoteInfo + MBProgressHUD-iOS7.0 + + 3A3BA8CE3A1B01C0FB49D9189558FE33 + + fileRef + 6554E9151EB13BE047A0BDA470F6E38D + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - 53FB0CBA14BE53F79F4EB4E7B46C523B + 3B001E3B07B00AF473129B56F2CA9F5D fileRef - DF11024BF511A0D2225D4BA84770CED7 + D4DA65BA155007D24A7798B4EC7F47E6 isa PBXBuildFile - 56228B3CBF246784930BFE7B29EFDD04 + 3B2EFE0DAEBBA8D572C58DFF8FB5932F + + containerPortal + D41D8CD98F00B204E9800998ECF8427E + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 501BE33907DBD9E3BB1712FC47BF8093 + remoteInfo + DACircularProgress-iOS7.0 + + 3B372ED237C136CF3F8A0CBA70EA987F includeInIndex 1 @@ -2787,26 +2836,66 @@ PBXFileReference lastKnownFileType sourcecode.c.objc - name - SPTCompiledExample.m path - Specta/Specta/SPTCompiledExample.m + SDWebImage-iOS7.0-dummy.m sourceTree <group> - 562BE99A6F630E709218EB9B3CF36E90 + 3B6785BE773E7C78E9A4DC50CF867507 - fileRef - 6CF3D336192327338965DC88856BDFCF + buildConfigurations + + 19363F17045B7C290526F6CA332905D2 + B323053FE4A89A80DAC8E62109C6942E + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release isa - PBXBuildFile - settings + XCConfigurationList + + 3C6018D65F5311DACE62DD5C9CD12854 + + baseConfigurationReference + A26B18A9DEC61DE5D947A2E5B3F9C7EC + buildSettings - COMPILER_FLAGS - -fno-objc-arc + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/DACircularProgress-iOS7.1/DACircularProgress-iOS7.1-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 5.0 + MTL_ENABLE_DEBUG_INFO + YES + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + isa + XCBuildConfiguration + name + Debug - 564C3E7A9D55850E48FAC93F77A7F478 + 3C85EA12507805BB691E7BF632EDAF13 includeInIndex 1 @@ -2814,12 +2903,14 @@ PBXFileReference lastKnownFileType sourcecode.c.h + name + EXPMatchers+beTruthy.h path - MWPhotoProtocol.h + Expecta/Matchers/EXPMatchers+beTruthy.h sourceTree <group> - 567A47FABAD9EE8B7DF32295CC53F937 + 3C9B34A700598539C6D795D22394E974 includeInIndex 1 @@ -2827,14 +2918,12 @@ PBXFileReference lastKnownFileType sourcecode.c.h - name - EXPMatchers+endWith.h path - Expecta/Matchers/EXPMatchers+endWith.h + EXPMatchers+FBSnapshotTest.h sourceTree <group> - 569060A075537DFE6A4D25D96C98668B + 3CE685279BE471748A25FA5F516B3203 includeInIndex 1 @@ -2843,13 +2932,20 @@ lastKnownFileType sourcecode.c.h name - SPTCompiledExample.h + UIImage+Compare.h path - Specta/Specta/SPTCompiledExample.h + FBSnapshotTestCase/Categories/UIImage+Compare.h sourceTree <group> - 56BD615DEEA3BC153C0B73BAC8A60A13 + 3D1E10A0925F7F4C182687892DF95857 + + fileRef + 55D00A044079BF2E1FBA6C209D7EFE01 + isa + PBXBuildFile + + 3D2832CB35A6EE23A1644AFBCE862715 includeInIndex 1 @@ -2858,59 +2954,67 @@ lastKnownFileType sourcecode.c.objc name - EXPMatchers+endWith.m + EXPMatchers+beTruthy.m path - Expecta/Matchers/EXPMatchers+endWith.m + Expecta/Matchers/EXPMatchers+beTruthy.m sourceTree <group> - 571096112AA1AD00C10596D216783599 + 3D4E71BA64B82CB7D14DBE85DC0806AA + + fileRef + 9E750F640E488EFF0B9C4FD78109AE97 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 3DCE30BEC4A66B63ACD53649C778D138 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h name - SPTExampleGroup.m + EXPMatchers+haveCountOf.h path - Specta/Specta/SPTExampleGroup.m + Expecta/Matchers/EXPMatchers+haveCountOf.h sourceTree <group> - 57205495CF13B4EE93B13B7B0E3A1BD2 + 3E0F390FD74843F61B7AED4188FCC3F8 - buildConfigurations - - F84C57B89A97BB8108482354FFD8E157 - 9D77DAC945EC22411297CBC957C966F0 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release + includeInIndex + 1 isa - XCConfigurationList + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + SPTTestSuite.h + path + Specta/Specta/SPTTestSuite.h + sourceTree + <group> - 5728F0AC6D99470A4AF64DA015991D65 + 3E25F187442F409697101FDD868F9F39 fileRef - 6347B71E8C22BA00F73AB093F101B7D4 + A61A4213784EB2F56D3705CCE82C9197 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - 5748A5F5926815AF7CCC45FA80943763 + 3E463E2B6917D9AA08A03BA8A8E74A18 fileRef - B0329B325C97BC663835390843F985CE + 14F2D5060BA079F6E75C8E8951FCC4C2 isa PBXBuildFile settings @@ -2921,205 +3025,208 @@ - 574FFB37A8EF309B1A1EB265267DD353 + 3E4FB307762A5F3CBBAC12F43B0D78F9 - includeInIndex - 1 + fileRef + 30D028565C3AC56669794F4FB8CE5930 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - SDWebImageDownloader.h - path - SDWebImage/SDWebImageDownloader.h - sourceTree - <group> + PBXBuildFile - 5813251FEA21E4AEE97385709F1912DE + 3E5AC872152DF853E27229DD9C7E1DDE - buildConfigurationList - 9F1294BB80138FB7DEE240DF61EC1523 - buildPhases - - DE0797009C8330FFDB1FC0EB8D2DA9DD - F2BDF8E898C762EFB3844211CE201024 - 9987EAA3314FDCBDC6783C325695E1D8 - - buildRules - - dependencies - + fileRef + 24ED07520C2E02824370A3994F7E7A0E isa - PBXNativeTarget - name - MWPhotoBrowser-MWPhotoBrowser - productName - MWPhotoBrowser-MWPhotoBrowser - productReference - 8261C05543EA69BA5F136A06D5005C50 - productType - com.apple.product-type.bundle + PBXBuildFile - 589CDFB90C98BF58F34B688A2BEF2D04 + 3E617CB6BB320DE432F9CD03EFC31A34 fileRef - DF11024BF511A0D2225D4BA84770CED7 + 24ED07520C2E02824370A3994F7E7A0E isa PBXBuildFile - 589E7F4856ABE929D7FC9F3A9E506FC9 + 3E6E2DB1D748E950C58BC5DA603CFE46 - baseConfigurationReference - FAF77DDAA41AC524C38F1D92F2EE01AB - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/Expecta+Snapshots/Expecta+Snapshots-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MTL_ENABLE_DEBUG_INFO - NO - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - + fileRef + 75C3EAAAA276564862EBE868F4CB8492 isa - XCBuildConfiguration - name - Release + PBXBuildFile - 59DA6D130464A9F97CD181877DD36CB7 + 3F184CBBBB01F076EBB11C58EBF9881D - fileRef - 6B1C830074F8BFC3AE3CB3A5278754A8 + includeInIndex + 1 isa - PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + SDImageCache.m + path + SDWebImage/SDImageCache.m + sourceTree + <group> - 59E65BF5E40AA0C59E0BBC07807714F1 + 3FA2475660FFC880302AD18E29B2E5FC - baseConfigurationReference - D5EE5F7C5A846B01ACF225DE04E52196 buildSettings - ENABLE_STRICT_OBJC_MSGSEND + ALWAYS_SEARCH_USER_PATHS + NO + CLANG_ANALYZER_NONNULL + YES + CLANG_CXX_LANGUAGE_STANDARD + gnu++0x + CLANG_CXX_LIBRARY + libc++ + CLANG_ENABLE_MODULES + YES + CLANG_ENABLE_OBJC_ARC + YES + CLANG_WARN_BOOL_CONVERSION + YES + CLANG_WARN_CONSTANT_CONVERSION + YES + CLANG_WARN_DIRECT_OBJC_ISA_USAGE + YES + CLANG_WARN_EMPTY_BODY + YES + CLANG_WARN_ENUM_CONVERSION + YES + CLANG_WARN_INT_CONVERSION + YES + CLANG_WARN_OBJC_ROOT_CLASS + YES + CLANG_WARN_UNREACHABLE_CODE + YES + CLANG_WARN__DUPLICATE_METHOD_MATCH + YES + COPY_PHASE_STRIP + NO + ENABLE_TESTABILITY + YES + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_DYNAMIC_NO_PIC + NO + GCC_OPTIMIZATION_LEVEL + 0 + GCC_PREPROCESSOR_DEFINITIONS + + POD_CONFIGURATION_DEBUG=1 + DEBUG=1 + $(inherited) + + GCC_SYMBOLS_PRIVATE_EXTERN + NO + GCC_WARN_64_TO_32_BIT_CONVERSION + YES + GCC_WARN_ABOUT_RETURN_TYPE + YES + GCC_WARN_UNDECLARED_SELECTOR + YES + GCC_WARN_UNINITIALIZED_AUTOS + YES + GCC_WARN_UNUSED_FUNCTION + YES + GCC_WARN_UNUSED_VARIABLE YES IPHONEOS_DEPLOYMENT_TARGET 7.0 - MACH_O_TYPE - staticlib - MTL_ENABLE_DEBUG_INFO - YES - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PODS_ROOT - $(SRCROOT) - PRODUCT_NAME - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL + ONLY_ACTIVE_ARCH YES + STRIP_INSTALLED_PRODUCT + NO + SYMROOT + ${SRCROOT}/../build isa XCBuildConfiguration name Debug - 5A06D9F124A077FE3345C713135D7E6C + 40BE40DBAFEC3D9E63A756296424F8C3 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - NSValue+Expecta.m path - Expecta/NSValue+Expecta.m + ImageError.png sourceTree <group> - 5A531485C6A0D185C72E03CD91B49919 + 40F505E69B8595361C2A7528DDA222B6 - includeInIndex - 1 + fileRef + 886B28457E1880775AB779BF4053231E isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - MWGridViewController.h - sourceTree - <group> + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + - 5A859FF87C3507C937241DD78BD95EF3 + 422063ABF368F3A659E0B25D67C9A733 fileRef - 6D7C34F3A270979025E31A50FFFC7F28 + BB77A60BFB6B1B88E541338BFB8D00E9 isa PBXBuildFile - 5CD9AEB21836919899CDA3A9D9510998 + 4231743B6C143BDB4A5FBB032E6D3799 - buildConfigurations - - 59E65BF5E40AA0C59E0BBC07807714F1 - 5DBFCD132D088BC182C9B82D9A6F90D9 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release + fileRef + 8CB41C68CFC5F23CAB80F2E013292F1C isa - XCConfigurationList + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - 5D39CEB65ADB521B117CA181C2BB2C9C + 42B8181497AE43CC9D9819F0994C7AAE - includeInIndex - 1 + fileRef + 7C0F08326F5A918F2A311222533EC950 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - UIImageView+HighlightedWebCache.h - path - SDWebImage/UIImageView+HighlightedWebCache.h - sourceTree - <group> + PBXBuildFile + + 430CE433DB59FE090A8CC6AFCFA43337 + + fileRef + DA5F1024E10268E26770AB791B1E9E8D + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - 5DBFCD132D088BC182C9B82D9A6F90D9 + 43409202E79A4C4386FFB720299DAE11 baseConfigurationReference - B83D4C05E77991780CA69BF68B431DD2 + 1580BE8D870658FFFB9EF3D04B9213CC buildSettings + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym ENABLE_STRICT_OBJC_MSGSEND YES + GCC_NO_COMMON_BLOCKS + YES IPHONEOS_DEPLOYMENT_TARGET - 7.0 + 7.1 MACH_O_TYPE staticlib MTL_ENABLE_DEBUG_INFO @@ -3130,6 +3237,8 @@ PODS_ROOT $(SRCROOT) + PRODUCT_BUNDLE_IDENTIFIER + org.cocoapods.${PRODUCT_NAME:rfc1034identifier} PRODUCT_NAME $(TARGET_NAME) SDKROOT @@ -3142,23 +3251,10 @@ name Release - 5E350F03F362C03BE32737DDE72D4632 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - QuartzCore.framework - path - Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/QuartzCore.framework - sourceTree - DEVELOPER_DIR - - 5E8F33E777456DA63CA2D902508A9058 + 4383E0DB1B07B9EB3155EF5D5F27C7BA fileRef - C2CEB9C1175C4FC4D5BE5C6EF285E0A4 + 1697441AA29177C9A68FDF0E3C04E703 isa PBXBuildFile settings @@ -3167,21 +3263,7 @@ -fno-objc-arc - 5EB4F27B76513AE918BA5AE0868E87C8 - - fileRef - EF4D256729962DC82677BF90E861294B - isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - - - 5EB6A7FF5E92B3E2E96A92367BE4AA32 + 439814C756BFD465BC49C1AE63B46FDA containerPortal D41D8CD98F00B204E9800998ECF8427E @@ -3190,21 +3272,21 @@ proxyType 1 remoteGlobalIDString - 7D9E32DAA93E15CFCF77A5BCD2D4BAA2 + 493375293C63883E773D55FB79AF6D25 remoteInfo - FBSnapshotTestCase + MBProgressHUD-iOS7.0 - 5F4AECEF356E35995112F9167B219AD6 + 439C7771FF755CD09022C11B78BD5441 fileRef - AF944A6486FDAD944BE766A70129E6D2 + 935221587417794B86698D8F70F1FEFC isa PBXBuildFile - 5F6D96E64F890BDC4A75B73C3D50A0DD + 43A1104CA0C628C2F693902EADA32B8C fileRef - D68BA9A93FD415E751DFA95CCF7DCB8D + E3D4A2FC51189B8F8BC6A2CD107D2E34 isa PBXBuildFile settings @@ -3213,7 +3295,7 @@ -fno-objc-arc - 5F878B29A406784703BC9F07FBFDD99F + 4519383492FC8F8EFD23370DBF52C8E6 includeInIndex 1 @@ -3222,52 +3304,91 @@ lastKnownFileType sourcecode.c.h name - EXPMatchers+postNotification.h + Specta.h path - Expecta/Matchers/EXPMatchers+postNotification.h + Specta/Specta/Specta.h sourceTree <group> - 60262C4B68C1B0EF7D3E4FADACB10CD7 + 45231A1E93E68FE1121A2DA54518EBDF fileRef - 222A85D6DAB7D3AC98EF6D7E68B13740 + C57858A8BF437152366E40CD2BF2F977 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - 60D3CCEB5B53542228790ABD8885AF42 + 45637168FB2ADA89D638F4A0202A7850 fileRef - 18391089432560093C31CCA48ABB46AE + 7D67DE8464E3065F33C2C45662E895D5 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - 60E1461AAED23D358B1A25A48F9DD77F + 4618D9D72E1A52C1E0009B66D3F8284C - includeInIndex - 1 + containerPortal + D41D8CD98F00B204E9800998ECF8427E isa - PBXFileReference - path - ImageSelectedSmallOff@3x.png - sourceTree - <group> - - 60ECF290B248258F453088B6258302E6 + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + DB44479B27C4E10F763DC6C92B9704CA + remoteInfo + DACircularProgress-iOS7.1 + + 46A2CE1545DEBE5FE9DF073C8EBFE2F0 + + buildActionMask + 2147483647 + files + + F5C6510AA07AF66F5F7347B841677A64 + D906DECAA352D01C821D0A6AD3521D73 + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 46F312CBB94BAE62B58D3D7AE28E8DBD + + fileRef + BEEEFBCA3C3FDFFFB1CA3162E3BD7E39 + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + + + 47D0A84C3BB8AAE884FC131812CB318B + + containerPortal + D41D8CD98F00B204E9800998ECF8427E + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + CF95A047032EA05133C18EC3592E0E61 + remoteInfo + SDWebImage-iOS7.0 + + 487899F028C39C1A518547A1AB2F625A + + fileRef + 8B42246CA0E8E327E5856E4FD283D80A + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + + + 4921F9F25372FD8AF824DB928C59E7B8 includeInIndex 1 @@ -3276,66 +3397,54 @@ lastKnownFileType sourcecode.c.h name - DALabeledCircularProgressView.h + XCTest+Private.h path - DACircularProgress/DALabeledCircularProgressView.h + Specta/Specta/XCTest+Private.h sourceTree <group> - 617F18A93D7ABF1322E3C027265893C2 + 493375293C63883E773D55FB79AF6D25 - baseConfigurationReference - 2055A9E17F10DAA3DD7884DDF96A0A50 - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/MWPhotoBrowser/MWPhotoBrowser-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MTL_ENABLE_DEBUG_INFO - YES - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - + buildConfigurationList + 49B15AAFABC0C0AD5F2E0AEF9301C74C + buildPhases + + 73E11DE113B852B58114C7185249DB82 + E5D7FF0D2B8B95459CE85F846F907098 + 6231B5502930545C4D81E5B38723759E + + buildRules + + dependencies + isa - XCBuildConfiguration + PBXNativeTarget name - Debug + MBProgressHUD-iOS7.0 + productName + MBProgressHUD-iOS7.0 + productReference + F6C622A56E707FE440C99AF4ABD18859 + productType + com.apple.product-type.library.static - 618AF4F15226C5AED0802286F3763EF4 + 499B1AA9CBA8C039A60DC0E51EB83374 - fileRef - D8619A771228AD0402C4D464E3C6EE53 isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - + PBXTargetDependency + name + DACircularProgress-iOS7.0 + target + 501BE33907DBD9E3BB1712FC47BF8093 + targetProxy + 78ED573889168148AE51F74C1E8B1C8D - 619B0B2F7ACD42F8EF700EAE6D1C95DA + 49B15AAFABC0C0AD5F2E0AEF9301C74C buildConfigurations - CB7148E744A9D03AEDC9D4809248999F - 86334F1A4DF0160C4B098EF643AB6E07 + 4C8AC103579C11F2EA481FDE91332821 + 6CEF58D8C2AA3B0668E971BFF8833762 defaultConfigurationIsVisible 0 @@ -3344,83 +3453,106 @@ isa XCConfigurationList - 63010FB3922AB3E2DDD6D8CDD2D10BFA + 49BC151A9A9932CA3E4B51B8E4406030 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h name - EXPMatchers+conformTo.m + EXPMatchers+beNil.h path - Expecta/Matchers/EXPMatchers+conformTo.m + Expecta/Matchers/EXPMatchers+beNil.h sourceTree <group> - 63327617AD4F38D1236E71968B0991E5 + 49EFE75BAF060A33327F3CE8C18436F2 - includeInIndex - 1 + fileRef + 319E0B3A0EE31DDBCB51A7A65C686C6E isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - FBSnapshotTestCase.m - path - FBSnapshotTestCase/FBSnapshotTestCase.m - sourceTree - <group> + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + - 6347B71E8C22BA00F73AB093F101B7D4 + 4A278E4929944C26E856A044C7DBAB0C - includeInIndex - 1 + fileRef + B0AD4D3FD51000868948132517923991 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - SpectaTypes.h - path - Specta/Specta/SpectaTypes.h - sourceTree - <group> + PBXBuildFile - 63B3276116DCC036DC3FF64871C5B34A + 4B3E60C3F4EAC4CA3803ABAC3A2EE198 fileRef - 9BDA7CB400BA41525D0DAC5E267B2670 + 0B5BFB9734BE2A9804B5269D7CD17E6D isa PBXBuildFile settings - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 + ATTRIBUTES + + Public + - 63D0CD4F0FB5A6103E1DDB46E876CBB6 + 4B7E59A8F28FAB2D57161A210C7A12C8 + + buildActionMask + 2147483647 + files + + 665AD3ADCDBD3CA1C3BF4C61FC92E2E9 + D36C6BC6EA08FE7869F82F61B6EC9BC5 + 27A3721EC06637573F1420548F723526 + CB75CD2A87EDFA527BA956B76D18B761 + FC0C98024FCCCF6BC9A914BD8C6ADE45 + 231B3D6C19C96540751BA861174C3DE4 + 746AC116E4A809F66BBEE0DFEC99FFD0 + FC1685015E9889DF9FD8ED7AE1DC176F + 5BC6A6072ADEF7DA1600332CE6FD83D2 + DD0FE45AD3D40E12614EB8D9A1AE2861 + 60D1959BADA2C327AF7708825C70D7CC + D12D4FF89473EA03D383793DDD0336A7 + 1EF0C84473FDF7A67C4055259B955DD0 + A887838E36A6878A04D5CBF1614556DC + 2C53480E319647BD8AE2D8DA1A50B5E8 + 84676595A6EC1518268236DF47B140F6 + 85BD6994A56F28571B29ED1F986B1E3C + 564C34EF8C44E18502A7B08FF57AC2EA + + isa + PBXHeadersBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 4B85032B158916198CA8EB9E3613CA2F fileRef - 3173089CCB6C063D260C58DD7BA3ABF5 + DB0F54D7A298EF6E345A6472EF1CB3BC isa PBXBuildFile settings - COMPILER_FLAGS - -fno-objc-arc + ATTRIBUTES + + Public + - 64734F2BA63DAFDA24F819EE71704665 + 4C387B267271570F9C5437A1B1D6D9AD fileRef - 7323B64F45BBE15A70D98D5E7FBF31C8 + F1FF622A2D916131FCDBC6882723CC7E isa PBXBuildFile - 659BCA5950BB094273E9E83E7D5271CF + 4C3D9BC7F96647A67FCA1B8447BA949E containerPortal D41D8CD98F00B204E9800998ECF8427E @@ -3429,129 +3561,179 @@ proxyType 1 remoteGlobalIDString - E9AAC3590B391F4CFAF5F8348E6A8FE4 + C336D921D585D36DC370E7B09A5572BB remoteInfo - Specta - - 65F75ED4B34CEDF568441FBC95BA1459 - - fileRef - 244F3301C3C77C58A95FA7864D67858D - isa - PBXBuildFile + MWPhotoBrowser-iOS7.0 - 66081D3480D1FA028C4DE2344BF616D4 + 4C8AC103579C11F2EA481FDE91332821 - fileRef - DF11024BF511A0D2225D4BA84770CED7 + baseConfigurationReference + 60917A76BEDFEB7A54CD3FC778268671 + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/MBProgressHUD-iOS7.0/MBProgressHUD-iOS7.0-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 6.0 + MTL_ENABLE_DEBUG_INFO + YES + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + isa - PBXBuildFile + XCBuildConfiguration + name + Debug - 661962DFFB8F4AF681F8EA78582EE534 + 4C9B4AA5421E244A92A44DC30389504F includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc - name - UIButton+WebCache.m + text.xcconfig path - SDWebImage/UIButton+WebCache.m + Expecta.xcconfig sourceTree <group> - 664FB9826D0F046AB6CE15196CC120B7 + 4D63BF928662ABCF1558C702AB435014 - fileRef - A1BF1E794449AF3F514B2EE3C85F4B10 + buildActionMask + 2147483647 + files + + F1FC61509B92BF205721A7A8BF86CAE3 + E7D2B4B79FD47EAC6865FC0C83827268 + F1B098D65EBCF5E206531765005B7938 + CFBAD094AAFE5279D5DAB2DA1C5E168B + 6DD0442440B0BC72626ACB301A9A479A + 306AE989BBBEB7928FABE1FB3E9063AE + 39EA3B0E372F4B7417BCF2F8FDB96E59 + 10006526AF7BDBB1D86E3EB2AD6DE49F + 915B79E75C24E019880432867604DC51 + A9C4E0B85A58F2703F7BCE420A84049D + BA4E7FC4ADD44E03673C23CA5C198FBF + 891D64C7326ADD0C96E89F521BB09FC7 + 3167F190790C804AC4A48C77090996BB + DC327BF9908C6657EEDF43607EC12C11 + 6268B1233F5E9E7AD7474F4FE5D2F094 + D0F505787850174C5FA1CBAE31F993FC + 4E98B8E1FCE315604D25445016700493 + 56511D592D5F791B2F42982EDF877E31 + FCAC10C76A9FA8252DB6FAEAB12A88F4 + FA8AD7CB7B01BC8438279B0042B9E43F + A5E71ED3FBE003C14B34A5A880BBFD69 + C8DD96A1F0B07FF9B81573E14B60AA13 + F70918D6E7628D3C76D084AD003CDF42 + F6EA94AE372FB813AB5CF80B23E506F2 + B233CDDE7B017138252D3D50F4476E02 + AD1C4B42AF7ED095C1FA51C0D2ED004D + 7BEA3B16B6186995A963DAD635823C3A + 0A5BB13126A30899ED31B49BD1F5B942 + 422063ABF368F3A659E0B25D67C9A733 + AAFF98A958040F7B4596D10D64AB9DDC + 6831E5ECA93011E3CC928A7C5594EA6C + 14A228046BA50A65ACCE32A2A43E00C3 + 9CEA5FB9EBD0603D18F008C690BE52A5 + isa - PBXBuildFile + PBXResourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 4D6B208B7BC22AB11F6774DE01F69F24 + + buildActionMask + 2147483647 + files + + 50506621C8EE48C3AB4181FEC2F2F641 + F5B682A956E9D968F3E186DF43B203D6 + FE0EE15B47DE4A629F70C92336E6A9B0 + 969D0B6145F6B27D67DD49DB3C2787E7 + AB4A14FBF6564994C867FD4C8D70DD72 + 040B7C5860BF4869975F9B0C3BDDE8DE + 65E200F62A4E7618380E1CECEA0FAD85 + 31D2E317FEF15C45A75508637B338123 + 9FFB834C7D81B108B6971316DBA62C0A + 4B3E60C3F4EAC4CA3803ABAC3A2EE198 + E267C5FC80FC77FFE4252A1075041AC7 + 7066284525749C87E4C840251EE3961A + + isa + PBXHeadersBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 66D391F04A8D672C0D42510DE811E7B2 + 4DA5A362F6C7352C50C0676E95C0E4F5 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h - name - NSObject+Expecta.h + text.xcconfig path - Expecta/NSObject+Expecta.h + MWPhotoBrowser-iOS7.0.xcconfig sourceTree <group> - 6772D2471C34E5B39F0D3E7D0E235DA0 + 4E25DDC72AD89138E96E86F9975F114C - children - - FAF77DDAA41AC524C38F1D92F2EE01AB - 785A993DF42B3ABEF658B85E1F47663F - F5551459CFCB6B7914E9EC1783277D94 - + includeInIndex + 1 isa - PBXGroup + PBXFileReference + lastKnownFileType + sourcecode.c.h name - Support Files + FBSnapshotTestCase.h path - ../Target Support Files/Expecta+Snapshots + FBSnapshotTestCase/FBSnapshotTestCase.h sourceTree <group> - 67BBF4202A90EC070C5EBE20B57A0255 + 4E752C09031D34C5390AB800F63A8BB4 - fileRef - 1AFDF0F0EF2A314336EACA38FCC6F784 - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - - - 688EFB46F8559BD675FD06384ABA49E1 - - fileRef - C162177585DC8E186D24CADCC233B0EA - isa - PBXBuildFile - - 68F141757E1606330C04FEBE78CBCE4E - - includeInIndex - 1 + explicitFileType + archive.ar + includeInIndex + 0 isa PBXFileReference - lastKnownFileType - text - path - Pods-MWPhotoBrowser_Tests-acknowledgements.markdown - sourceTree - <group> - - 691CE6B20E64762C98682B93B31435E7 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h name - SPTSpec.h + libMBProgressHUD-iOS7.1.a path - Specta/Specta/SPTSpec.h + libMBProgressHUD-iOS7.1.a sourceTree - <group> + BUILT_PRODUCTS_DIR - 6924E116731D7079958063A3EE0781ED + 4E7DFCCBCADA5F6D0C5BF4EE47BE2C2F fileRef - 6ED6BE9A61002A3AF6D4C834E2277D8C + BB1C325F8941A0EF3493E5F3A2D46B5C isa PBXBuildFile settings @@ -3562,30 +3744,24 @@ - 69363A59A4E2FF95D6A62AA88641A20A + 4E98B8E1FCE315604D25445016700493 fileRef - 0B7E61991D03B44046913BF3B345F4DB + 7D67DE8464E3065F33C2C45662E895D5 isa PBXBuildFile - 69C3D12EC1F2F8AE628C05AC390D9D61 + 4EB5491EF17DC872964D855B4BE9048A - includeInIndex - 1 + fileRef + B458252DB56890ECD0D0D3B1FF3E4FA2 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - MWCommon.h - sourceTree - <group> + PBXBuildFile - 69DC2FB163EAB23712D9C3C13C72518E + 50177424EEBA0BD75379DCE8AE874154 fileRef - C77F8C54B4042EC0746E5D285E7D400A + 55AA4895962778A7C30663332494B7EA isa PBXBuildFile settings @@ -3596,22 +3772,49 @@ - 69EBB956302554EA37775F4D806BC4DD + 5019A6416DBC282C336644ACC78392F8 - fileRef - 3DA2CF997A09E53F375CF0DEEF25AFCF + buildActionMask + 2147483647 + files + + EE76F070079F40A7C4D5BF098D2B6C53 + 258E771B740DFDB2009D494E06509362 + isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 6A4E3ACA285A21392936C110E7EC91F0 + 501BE33907DBD9E3BB1712FC47BF8093 + + buildConfigurationList + AAA258AF2C8AE316A7B3F85E61C8A634 + buildPhases + + E8924B4259DE0CC17ED2F67036746C00 + 18B2773AE867F4086B9CED447612495C + 54A3D216CDA470BEB495FF124C6B8797 + + buildRules + + dependencies + + isa + PBXNativeTarget + name + DACircularProgress-iOS7.0 + productName + DACircularProgress-iOS7.0 + productReference + 077072E0F0AB7FA1462E7CDC3341A509 + productType + com.apple.product-type.library.static + + 50506621C8EE48C3AB4181FEC2F2F641 fileRef - 7AAD7709C9FF6828905D6A28E69C4221 + 628A86155E66266C94DDA5EBCDA72AFD isa PBXBuildFile settings @@ -3622,22 +3825,22 @@ - 6B1C830074F8BFC3AE3CB3A5278754A8 + 509637F57543102B11D41C0A86BF6AE2 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h name - UIImage+GIF.m + NSData+ImageContentType.h path - SDWebImage/UIImage+GIF.m + SDWebImage/NSData+ImageContentType.h sourceTree <group> - 6C8B1153C440825B90681905FC2F85B9 + 50A6CB48BD036BA95436D50530B6902A includeInIndex 1 @@ -3645,83 +3848,54 @@ PBXFileReference lastKnownFileType sourcecode.c.h - path - MWTapDetectingImageView.h - sourceTree - <group> - - 6C92311B12AB812820A4267248D69CCB - - children - - 2055A9E17F10DAA3DD7884DDF96A0A50 - 079AA0CF857B4A46F161666C58867CE1 - BA4C6CCE8BCEAFA07BB2679C87A008C5 - - isa - PBXGroup name - Support Files + SpectaUtility.h path - Example/Pods/Target Support Files/MWPhotoBrowser + Specta/Specta/SpectaUtility.h sourceTree <group> - 6C982719FDCF6684EB752A0153066FC3 + 50B88480D5DE2206829A58640A90CFDD - includeInIndex - 1 + containerPortal + D41D8CD98F00B204E9800998ECF8427E isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - SDWebImageDecoder.m - path - SDWebImage/SDWebImageDecoder.m - sourceTree - <group> + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 7D9E32DAA93E15CFCF77A5BCD2D4BAA2 + remoteInfo + FBSnapshotTestCase - 6CA9CE30C9B7FD5557F8DD0E06209E36 + 51024443AE4938F0F22D3F553FADFF97 - includeInIndex - 1 + fileRef + 5B1985A4CB62C48AEF3651FB8223DA30 isa - PBXFileReference - path - ImageSelectedOff.png - sourceTree - <group> + PBXBuildFile - 6CD36438CB08D280978CEE50363D8B8B + 51745F1B886A298CDB8DADC923EA9E88 - explicitFileType - archive.ar - includeInIndex - 0 + fileRef + 8B1F7ACF7E60F6BECBD2E3D5AADEADD2 isa - PBXFileReference - name - libExpecta+Snapshots.a - path - libExpecta+Snapshots.a - sourceTree - BUILT_PRODUCTS_DIR + PBXBuildFile - 6CD3EC2C1FBF5655137A99638E9CC950 + 523087C6D186A9F5BEE78D39F9A78F3F + includeInIndex + 1 isa PBXFileReference lastKnownFileType - wrapper.framework - name - MediaPlayer.framework + sourcecode.c.objc path - Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/MediaPlayer.framework + Pods-MWPhotoBrowser_Example-dummy.m sourceTree - DEVELOPER_DIR + <group> - 6CF3D336192327338965DC88856BDFCF + 52548D43BC55700DF73633DFBBB74887 includeInIndex 1 @@ -3730,144 +3904,132 @@ lastKnownFileType sourcecode.c.objc name - EXPMatchers+haveCountOf.m + SPTExampleGroup.m path - Expecta/Matchers/EXPMatchers+haveCountOf.m + Specta/Specta/SPTExampleGroup.m sourceTree <group> - 6D37BEAA1FC469C3582CACB4E9766502 + 52EFE8493F9B355C73BFBAB6225EA0CA + + containerPortal + D41D8CD98F00B204E9800998ECF8427E + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 493375293C63883E773D55FB79AF6D25 + remoteInfo + MBProgressHUD-iOS7.0 + + 532CD5AA9B8249EC3F6AED4F69415312 + + fileRef + 60D0F9290B4BECDD4224D58D24A7C6E9 + isa + PBXBuildFile + + 5357653FC938503002CBB65889050533 fileRef - EC9E28E1F941952C6708902F41FD209D + FC71886B99B9318A86175962CC5851BA isa PBXBuildFile settings - COMPILER_FLAGS - -fno-objc-arc + ATTRIBUTES + + Public + - 6D7C34F3A270979025E31A50FFFC7F28 + 548D6ED317501EC82BF1532DEA509727 includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h + name + EXPMatchers+raiseWithReason.h path - PlayButtonOverlayLargeTap.png + Expecta/Matchers/EXPMatchers+raiseWithReason.h sourceTree <group> - 6D8154E68B3360EE1C8DA3A4443096F3 - - isa - PBXTargetDependency - name - SDWebImage - target - DE3B07ED7FF04F506B0C5E00F4973589 - targetProxy - 216D98400141172993D43965B937A9C6 - - 6E43863A0284BCD9B517C3AE49207A9D + 54A3D216CDA470BEB495FF124C6B8797 buildActionMask 2147483647 files - 9D6E638E56BDAD3C2196ED9C28FAF857 - 1DD364708B768EB7C94DD9BB48F217F4 - 723DCD855EFE5AC009B1D2FFE88373C7 - 5748A5F5926815AF7CCC45FA80943763 - 164BD2AFD03035E623A90DF1AA095C35 + 668AB0AD09FF484BCEB9F3C571A1FAC5 + FEEB98AD4249D4B4D083774331737097 isa PBXHeadersBuildPhase runOnlyForDeploymentPostprocessing 0 - 6EB2498C2AFB1DF8555CB7C1EF89CA5C - - fileRef - F5963246D32249D4D198CE8A36B4DD12 - isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - - - 6ED6BE9A61002A3AF6D4C834E2277D8C + 553487B6BEC699943895F6AE064CE07D includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc name - EXPMatchers.h + EXPMatchers+beCloseTo.m path - Expecta/Matchers/EXPMatchers.h + Expecta/Matchers/EXPMatchers+beCloseTo.m sourceTree <group> - 6EEA87D8E87914D02AA319693371EE2C - - fileRef - AABA7597E19FD75C9F320BCD6BB2759E - isa - PBXBuildFile - - 6F1FCA0BD48258CDEC1B14D704BA3E5D + 55AA4895962778A7C30663332494B7EA includeInIndex 1 isa PBXFileReference lastKnownFileType - text.xcconfig + sourcecode.c.h + name + FBSnapshotTestController.h path - Pods-MWPhotoBrowser_Tests.debug.xcconfig + FBSnapshotTestCase/FBSnapshotTestController.h sourceTree <group> - 6FAC17B355970FC2EBFADA7C72544799 - - buildActionMask - 2147483647 - files - - D041545E1DB9D43FCBB294B7E9573AFF - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 700F6F4AFED22AEAA1D8943236F94924 + 55D00A044079BF2E1FBA6C209D7EFE01 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h - name - EXPMatcher.h path - Expecta/EXPMatcher.h + UIBarButtonItemArrowLeft.png sourceTree <group> - 70545E4EA86C6E593A2A9F6731DA8F6D + 562BE99A6F630E709218EB9B3CF36E90 + + fileRef + E53153AD4E13D3365961E9BBD1D6ACA4 + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + + + 564C34EF8C44E18502A7B08FF57AC2EA fileRef - 10E68FD4A81F628778B6A4992DB9D952 + FD97BD7042E61F5298DA2ABBC1AA143D isa PBXBuildFile settings @@ -3878,51 +4040,149 @@ - 70922EF029715CA28E814F87373F29C4 + 564EDDCB1C3B218A9202309835B7D951 - includeInIndex - 1 + fileRef + 8B013ED88B85B2F00736DDC3EF06ECCD isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 56511D592D5F791B2F42982EDF877E31 + + fileRef + 7DCE26CDEA2D82CE819E19E79AB6B6BB + isa + PBXBuildFile + + 56BA3264350D0B6E865A7B92708EB166 + + explicitFileType + archive.ar + includeInIndex + 0 + isa + PBXFileReference name - EXPMatchers+equal.m + libExpecta+Snapshots.a path - Expecta/Matchers/EXPMatchers+equal.m + libExpecta+Snapshots.a + sourceTree + BUILT_PRODUCTS_DIR + + 57205495CF13B4EE93B13B7B0E3A1BD2 + + buildConfigurations + + FBCEC5C8B899A450BBC3A217E518522C + 1C4E4899BE01820151368B07EB14F4A0 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + 582A1317C8A0A3627E2743C6E5533D32 + + fileRef + 291E63B3BBA5EE2CFE329A52432D1146 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 58E1D5CAE886B3357F355322DA49DCCA + + children + + 4C9B4AA5421E244A92A44DC30389504F + 5F87DBE7A03F8F1C3CEA6A92B390BB1B + 8FD3362F6F7AB64BD2C304FFE786A71B + + isa + PBXGroup + name + Support Files + path + ../Target Support Files/Expecta sourceTree <group> - 70D801E0B95C23BCC270E4EC8659D463 + 5991417F2CDE7DF75FE7980271940C04 fileRef - DB7D9B8599935A5FF3862B90E049CABD + 7C0F08326F5A918F2A311222533EC950 isa PBXBuildFile - 717B38CC8B651B61F35E12EE4211DAF0 + 5A1EF6AC83E0796A32234EE5FC68BC4E + + buildConfigurations + + 981359C0C4FDAA8DE10D8F08316068D1 + 0CED9579EAF266E1F8314A0C4830A4FA + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + 5A246E413E90E31DF083711D5AB9403F baseConfigurationReference - 2055A9E17F10DAA3DD7884DDF96A0A50 + 33D70A98285D51C294091A2EE3D7D87D buildSettings + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym ENABLE_STRICT_OBJC_MSGSEND YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/DACircularProgress-iOS7.0/DACircularProgress-iOS7.0-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 5.0 + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + PRODUCT_NAME - MWPhotoBrowser + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + SDKROOT iphoneos SKIP_INSTALL YES - WRAPPER_EXTENSION - bundle isa XCBuildConfiguration name - Debug + Release - 71865C216F48AC822D486C8D9B03B13C + 5A2EBEAE77C79D8B490B070754BD07E8 includeInIndex 1 @@ -3930,76 +4190,85 @@ PBXFileReference lastKnownFileType sourcecode.c.h - name - EXPMatchers+beSubclassOf.h path - Expecta/Matchers/EXPMatchers+beSubclassOf.h + MBProgressHUD-iOS7.0-prefix.pch sourceTree <group> - 719353E5F5BDD19B2D80B273F365F2BF + 5A9EBFC7ACFA8F737D2F87F775CA091A + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + MWTapDetectingImageView.m + sourceTree + <group> + + 5AEC15164FC49250871B563665E57733 + + isa + PBXTargetDependency + name + MBProgressHUD-iOS7.0 + target + 493375293C63883E773D55FB79AF6D25 + targetProxy + 52EFE8493F9B355C73BFBAB6225EA0CA + + 5AFC044E0BD00A02CA62AE59CE49F835 children - 25003C5ED979935F9483683DD2350697 + AC73D8815894F832B4005168AA85F69B + 3B372ED237C136CF3F8A0CBA70EA987F + 1B05B0CD8AD64A474D9E605960D58190 + 6D084FCB5695C1CC9ED017BF5FD93C9B + 35E9F4C6728536D0A225EFDF5DD2AAA6 + B3025E7F98A58345E56E502197EA4913 isa PBXGroup name - Development Pods + Support Files + path + ../Target Support Files/SDWebImage-iOS7.0 sourceTree <group> - 71BC183B1FB7AB5F8CF9A3383C6B354C + 5B14A0946BD6069275E1664D74DB5DB2 includeInIndex 1 isa PBXFileReference lastKnownFileType - text.script.sh + sourcecode.c.objc path - Pods-MWPhotoBrowser_Example-frameworks.sh + MWPhotoBrowser.m sourceTree <group> - 722090AAE01BA442E883E6F02AA8DF40 + 5B1985A4CB62C48AEF3651FB8223DA30 - buildConfigurationList - 8BEDD694C8600B014302155F48FD5B08 - buildPhases - - A07F4B785B315E5B075218A988F05149 - 6FAC17B355970FC2EBFADA7C72544799 - - buildRules - - dependencies - - 0B8D4914244FCBC9DCAF2B9AD09F3DD5 - 0EAAE557DE1A2949F0793F1230D1D046 - 1CCE02DFD89EF9B58809C379D0496685 - 9F0508C4938477BDB11EAF1F3A6960E7 - 01F58E863C79FB5A8433D92837FFE619 - A815E988348FB8A8B609F012516ABD15 - D359D2CDD896874DAD7B6D2EF3FEE26D - 13EA87F4C750EBB98261F8ED14EFE770 - + includeInIndex + 1 isa - PBXNativeTarget - name - Pods-MWPhotoBrowser_Tests - productName - Pods-MWPhotoBrowser_Tests - productReference - E0EBF0357895E0C657A233A9D4D0E2C1 - productType - com.apple.product-type.library.static + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + MWCaptionView.m + sourceTree + <group> - 723DCD855EFE5AC009B1D2FFE88373C7 + 5BC6A6072ADEF7DA1600332CE6FD83D2 fileRef - 8E108520195BF6568A4A53786EA7B6F0 + 9B484F370BBC1CC43B41A7E80F335BB3 isa PBXBuildFile settings @@ -4010,7 +4279,7 @@ - 7250BEF99A7686EAB50B17986FDCED3E + 5C096AF52C1D9D3B88B84A4956889B94 includeInIndex 1 @@ -4019,13 +4288,65 @@ lastKnownFileType sourcecode.c.objc name - EXPMatchers+match.m + SPTCompiledExample.m path - Expecta/Matchers/EXPMatchers+match.m + Specta/Specta/SPTCompiledExample.m + sourceTree + <group> + + 5C185ABC7CB32ECCF8ECC82BC4705522 + + fileRef + FFAB91B4F1055B6437303E38C104E6A0 + isa + PBXBuildFile + + 5C4457D76E43872A0AB3E8D3F0D6B8E3 + + children + + 60917A76BEDFEB7A54CD3FC778268671 + FFAB91B4F1055B6437303E38C104E6A0 + 5A2EBEAE77C79D8B490B070754BD07E8 + 7BA9D90D9129488AF4FF690D2D8CE373 + F37B375C563F1F87382C999BF6A38450 + D823A9C410F2960187FFF159AE629A25 + + isa + PBXGroup + name + Support Files + path + ../Target Support Files/MBProgressHUD-iOS7.0 sourceTree <group> - 730E6CDCF09A029F8976D82EB7DACCF2 + 5C92E77631D5ABB9DAE27B2AECB681EC + + buildConfigurationList + 1370C901B67F7E3DBF4D6989F3E87034 + buildPhases + + A4D6ACFFCBD0300EA53FAC9B772590B4 + E63276CA3873172890CD5B2865137970 + 4D63BF928662ABCF1558C702AB435014 + + buildRules + + dependencies + + isa + PBXNativeTarget + name + MWPhotoBrowser-iOS7.0-MWPhotoBrowser + productName + MWPhotoBrowser-iOS7.0-MWPhotoBrowser + productReference + 6B909FB1F98C3B3E3A8E20832F2958EB + productType + com.apple.product-type.bundle + + 5CA5187B727BAACAE0E3D82B002FCF89 includeInIndex 1 @@ -4033,66 +4354,107 @@ PBXFileReference lastKnownFileType sourcecode.c.objc + name + EXPFloatTuple.m path - MWCaptionView.m + Expecta/EXPFloatTuple.m sourceTree <group> - 7323B64F45BBE15A70D98D5E7FBF31C8 + 5D02A92C9AEDDCA311682586732CAE63 includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + SpectaDSL.m path - UIBarButtonItemArrowRight@3x.png + Specta/Specta/SpectaDSL.m sourceTree <group> - 7357CD98F48585C602A75C901AD5E096 + 5D09B8F0D0525328A232EC8FD9806207 + + fileRef + B458252DB56890ECD0D0D3B1FF3E4FA2 + isa + PBXBuildFile + + 5D5FFBCADD907503A904FF3C0764513D + + fileRef + 9341F63412149D22C6290B281497FFFE + isa + PBXBuildFile + + 5E81EB337C162C839599D111E9B5AD1A buildActionMask 2147483647 files - 63B3276116DCC036DC3FF64871C5B34A - 34B2272FAB199A0B69B898BFB9E733E1 - 33985216BF501EDD56E784D7CAD32FE7 - EDDE097EFD40E9A4E32E4B44C97CE44B - 29E4E0528D088AE8B2EE6D38E19D375E - 53A65E3DDAAB4288F448625574686617 - 29B6CC3E1560257A444A209D97AC271E - 2BFB267A4274D5D4B277138F9D4EEDA1 - DC1F1DBD53679CB78C5967BA9DEC08CA - 3F1E0CB31108E6E996D2E7418FE21D2E - 59DA6D130464A9F97CD181877DD36CB7 - B28719F6B1978267C407032A2AE646F8 - DFAB389ECAD69BF8BE6357CFADABBF5C - 7D3B3786F1D6CED2CE141B2B1BDAE012 - F3BB0A963277282C6BF73E81250B6943 + 070B10079CF5CACE95AADDF801997D20 + 1D9ADE854EF6B03373686DE21135A210 + C6489C69EE8C83AA1DD173877F333D53 + 6FF6BE7A05BD8C066D244D2566D2DBA6 + 368B6233FA7B7A42321DA1FE5F4071F3 + FF17563EFAC8E049E7A73B79744EF5CB + 3D4E71BA64B82CB7D14DBE85DC0806AA + 582A1317C8A0A3627E2743C6E5533D32 + A8ECC4BDDE853EA9FAC2B5429FDEA079 + 05C0EC6A10C0F5B6E7A59A0133C5B27F + DED5197B49D7E4CE0384FDA40600EFA0 + FD85A0FD46C5BC9071164818E771DB03 isa - PBXSourcesBuildPhase + PBXHeadersBuildPhase runOnlyForDeploymentPostprocessing 0 - 7389D03E90A74E5A200DD5ADBB209885 + 5E8F33E777456DA63CA2D902508A9058 - includeInIndex - 1 + fileRef + 3D2832CB35A6EE23A1644AFBCE862715 isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - DACircularProgress.xcconfig - sourceTree - <group> + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + - 7436C602BB1CA7C91560C28DE749357B + 5ED50B5F8CF57B6340E4ADE997542BE9 + + buildConfigurationList + B0DB1FDEDE0BC5595E71DF4E55869B94 + buildPhases + + F4BFBC4B5729648485FC77656D89E137 + 5019A6416DBC282C336644ACC78392F8 + 4B7E59A8F28FAB2D57161A210C7A12C8 + + buildRules + + dependencies + + isa + PBXNativeTarget + name + SDWebImage-iOS7.1 + productName + SDWebImage-iOS7.1 + productReference + 2B206C8C4C70D050769CB80E9492E658 + productType + com.apple.product-type.library.static + + 5F6D96E64F890BDC4A75B73C3D50A0DD fileRef - F9B2375A6E20F2774E7B3F08FB92909E + 553487B6BEC699943895F6AE064CE07D isa PBXBuildFile settings @@ -4101,7 +4463,7 @@ -fno-objc-arc - 746A80915CF52BE732D200BAA851FBAB + 5F87DBE7A03F8F1C3CEA6A92B390BB1B includeInIndex 1 @@ -4109,42 +4471,46 @@ PBXFileReference lastKnownFileType sourcecode.c.objc - name - EXPMatchers+beLessThanOrEqualTo.m path - Expecta/Matchers/EXPMatchers+beLessThanOrEqualTo.m + Expecta-dummy.m sourceTree <group> - 74707D5ABEC55B3084F52C40A4227B06 + 5FA336AC619B63AF9F9FD57B746B50C6 fileRef - 2779B434631901F1434BC316E3FB5AE9 + AA15102B006F97F7D2C88A4D2B871A14 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - 74A9CCFEBE692130454C41959EBA5254 + 5FC2F3F7A1FD4521368BF9A756EE527B fileRef - 8A00437F88A0C89CD672C2085CCCF62B + 5B1985A4CB62C48AEF3651FB8223DA30 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - 7599165E41821009340AA99FDAC29AE0 + 5FF3FD3784031603FE65BBE28FBAC449 + + fileRef + 7C0F08326F5A918F2A311222533EC950 + isa + PBXBuildFile + + 60917A76BEDFEB7A54CD3FC778268671 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.xcconfig + path + MBProgressHUD-iOS7.0.xcconfig + sourceTree + <group> + + 60B0663708B59D71E4CDF1092C6CFFFF includeInIndex 1 @@ -4153,27 +4519,27 @@ lastKnownFileType sourcecode.c.objc name - SDWebImageDownloaderOperation.m + DALabeledCircularProgressView.m path - SDWebImage/SDWebImageDownloaderOperation.m + DACircularProgress/DALabeledCircularProgressView.m sourceTree <group> - 75F83323F205A277BEC18AABDA0FA739 + 60D0F9290B4BECDD4224D58D24A7C6E9 includeInIndex 1 isa PBXFileReference path - PlayButtonOverlayLarge@3x.png + UIBarButtonItemArrowLeft@3x.png sourceTree <group> - 760A4E328E68E43D12295FA08F7475FD + 60D1959BADA2C327AF7708825C70D7CC fileRef - 564C3E7A9D55850E48FAC93F77A7F478 + EABDFB8D4ADD0F841ED44A71483A758F isa PBXBuildFile settings @@ -4184,10 +4550,10 @@ - 76331E71086C8CD5118A69B046D8F0FB + 60D3CCEB5B53542228790ABD8885AF42 fileRef - 567A47FABAD9EE8B7DF32295CC53F937 + 038F47EC159D577EA6F47F06F5D92463 isa PBXBuildFile settings @@ -4198,26 +4564,43 @@ - 76C42C41A4B61435A3315770F58154B2 + 6107FB2EEDC40DCD1F581BD9EEDEEF6F fileRef - 8F3064A5B520D1E4290AA240A05B7D6F + BE8191476B080F4505CAF87040FC84FE isa PBXBuildFile - 779CFE8771E1EF63F1313ABEBCECAA4A + 612A04D52A08B463E81B1666C41D1FBF - fileRef - 15082EF0D1C2F7B77B63E0116BDA622C + buildConfigurationList + 5A1EF6AC83E0796A32234EE5FC68BC4E + buildPhases + + 0F93EDA47A438A74C49F63CA326B3DD1 + 9F8A2194BCD664F1FCED22D783240731 + + buildRules + + dependencies + + A152728B5B8AAAE6D30ED4F6FE05C800 + 851546D6FE7B76277FF6758F1EBA36D9 + C5D65B7B6452BC95EC7B45BDA241CDE7 + 9C5ABA78C36206783E47FCA588FBF52E + isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - + PBXNativeTarget + name + Pods-MWPhotoBrowser_Example + productName + Pods-MWPhotoBrowser_Example + productReference + 66AC71B16E9F622403ABB8C925C5989B + productType + com.apple.product-type.library.static - 785A993DF42B3ABEF658B85E1F47663F + 61513A7F27881CD54D3F66804478AF03 includeInIndex 1 @@ -4225,57 +4608,64 @@ PBXFileReference lastKnownFileType sourcecode.c.objc + name + UIImage+Diff.m path - Expecta+Snapshots-dummy.m + FBSnapshotTestCase/Categories/UIImage+Diff.m sourceTree <group> - 78759DF877B83416A90AA2BC606BF7ED + 62254B1B74137F555858AC3B8641C3AC includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc - name - SDWebImagePrefetcher.m + text.plist.xml path - SDWebImage/SDWebImagePrefetcher.m + ResourceBundle-MWPhotoBrowser-Info.plist sourceTree <group> - 788D548DE837CA2FA9D2D744D64FA847 + 6231B5502930545C4D81E5B38723759E - includeInIndex - 1 + buildActionMask + 2147483647 + files + + 902595307066C7E1A9835216B78A960B + isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - EXPMatchers+raise.m - path - Expecta/Matchers/EXPMatchers+raise.m - sourceTree - <group> + PBXHeadersBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 79996E262256F57DB50CD16E5EBE5D52 + 6268B1233F5E9E7AD7474F4FE5D2F094 - includeInIndex - 1 + fileRef + 387B77A2F66A747E6E82D54865A7DF4F isa - PBXFileReference - lastKnownFileType - sourcecode.c.h + PBXBuildFile + + 627015875C052ED72DEC59627524D692 + + children + + B2829E9E2867D8CA2C13B4DCBF27D906 + F608E555A3767B056A969C7BD7CC4592 + 0F9DB75A76D2DC0A6F5D4711D3B93815 + + isa + PBXGroup name - EXPMatcherHelpers.h + Support Files path - Expecta/Matchers/EXPMatcherHelpers.h + ../Target Support Files/Expecta+Snapshots sourceTree <group> - 79D73FB4B6A3C92513B81243EA72E78C + 6280459658EF922D585FDFFF8685D623 includeInIndex 1 @@ -4284,13 +4674,13 @@ lastKnownFileType sourcecode.c.h name - EXPMatchers+match.h + UIImage+Snapshot.h path - Expecta/Matchers/EXPMatchers+match.h + FBSnapshotTestCase/Categories/UIImage+Snapshot.h sourceTree <group> - 7AAD7709C9FF6828905D6A28E69C4221 + 628A86155E66266C94DDA5EBCDA72AFD includeInIndex 1 @@ -4298,69 +4688,53 @@ PBXFileReference lastKnownFileType sourcecode.c.h - name - EXPDefines.h path - Expecta/EXPDefines.h + MWCaptionView.h sourceTree <group> - 7AC91F55DAAA2F0223A97BEFF8BCAF68 + 62C0B00E39644DC3E5510523CBFE22D5 - fileRef - D09A95F4452843967F4C8F3FA5EC1A68 + buildActionMask + 2147483647 + files + + 51024443AE4938F0F22D3F553FADFF97 + 3E4FB307762A5F3CBBAC12F43B0D78F9 + 6B485E6EEE662DC93BED89C08383827C + DB87EEF59BEAC8C1562C3F7116AE057C + E5258C3CAC3022F4340281554D8D129B + 290EEFC0E1C3BF1683E7693868D583CB + 96C5019CFD858211738E4F0829E2CE0B + EEE46EA5E24C876366488D4996BEBCFE + 21E12D318DAE2620D63E0BD215841D4D + F4C603FEA5C044A26E7B67B979AB517D + isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - - - 7CF892960748F43245AD2B5CD2AC41A5 - - explicitFileType - archive.ar - includeInIndex + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing 0 - isa - PBXFileReference - name - libSpecta.a - path - libSpecta.a - sourceTree - BUILT_PRODUCTS_DIR - 7D3B3786F1D6CED2CE141B2B1BDAE012 + 6381023275C6E39FF5BBFE8D0F9453E5 fileRef - A2B692D3F450E25A5D8B17F524EA0720 + CF9FD7F65D9A4786AF3DD1C8A6E2ABE4 isa PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - - 7D56DF05F0071D94121A050CDB772D56 + 63D0CD4F0FB5A6103E1DDB46E876CBB6 fileRef - 818AFFCC037C608492FAE59C7C3E85C0 + 39DF90B59241BC39F89E1BE7D39B8E79 isa PBXBuildFile settings - ATTRIBUTES - - Public - + COMPILER_FLAGS + -fno-objc-arc - 7D8198AD59277CB0379442369CF5247E + 6420AB4D12B8B77FD0A54C738463ABF5 includeInIndex 1 @@ -4369,193 +4743,317 @@ lastKnownFileType sourcecode.c.h path - MWCaptionView.h + Specta-prefix.pch sourceTree <group> - 7D901800D8324F9F338B54CA286AD771 - - fileRef - D2307EC60BB4D23E49C1420E6F192943 - isa - PBXBuildFile - - 7D9E32DAA93E15CFCF77A5BCD2D4BAA2 + 6511AC2FC83F218549820CFB3EFC4D7F - buildConfigurationList - 189B7D1A1C865073D7F999A759ACD292 - buildPhases + buildActionMask + 2147483647 + files - 9C03752CBF78921009132B656CF36184 - 46A2CE1545DEBE5FE9DF073C8EBFE2F0 - 6E43863A0284BCD9B517C3AE49207A9D + 68FD6C98E381347D4D3F670BADABAD39 + E50C95BFEF67882BF48DDE9C964372AF - buildRules - - dependencies - isa - PBXNativeTarget - name - FBSnapshotTestCase - productName - FBSnapshotTestCase - productReference - D52C083C7341E76797DB059849542613 - productType - com.apple.product-type.library.static + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 7DACEAF8582049D6EB8B4CFFB6CA48CD + 6554E9151EB13BE047A0BDA470F6E38D includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h name - EXPMatchers+beGreaterThan.m + SDImageCache.h path - Expecta/Matchers/EXPMatchers+beGreaterThan.m + SDWebImage/SDImageCache.h sourceTree <group> - 7DB346D0F39D3F0E887471402A8071AB + 65593CABDB787470A27F80FD0E40D891 - children - - BA6428E9F66FD5A23C0A2E06ED26CD2F - 719353E5F5BDD19B2D80B273F365F2BF - F4CDA5FA9197A41E0081E84F932906EB - 9D89C03F805626896F95FA71887D578C - 9142D907B715CE18385E00AB1972B1BD - 29062DA699B861B896758C5A677765BD - + includeInIndex + 1 isa - PBXGroup + PBXFileReference + path + UIBarButtonItemArrowRight@2x.png sourceTree <group> - 7E05296687CBD4F8C77EA450EEAB7B60 + 659796C7B63F0C6BC36CE677178F308B fileRef - ABDF044BC66387B0E03E70BAC09D0AC8 + 00E0E94A414ACEA941F4E3F7524D96D0 isa PBXBuildFile - 7FEE0E8D094D7BCCAC7129473EE05ADC + 65E200F62A4E7618380E1CECEA0FAD85 fileRef - 788D548DE837CA2FA9D2D744D64FA847 + 9E750F640E488EFF0B9C4FD78109AE97 isa PBXBuildFile settings - COMPILER_FLAGS - -fno-objc-arc + ATTRIBUTES + + Public + - 8059E5674B08670B0A002D564FFABF44 + 661EDECC0867122E0FF1D3FC203A4FD3 fileRef - 70922EF029715CA28E814F87373F29C4 + EBD7ABE276C83631D459932245E75FBB + isa + PBXBuildFile + + 665AD3ADCDBD3CA1C3BF4C61FC92E2E9 + + fileRef + 509637F57543102B11D41C0A86BF6AE2 isa PBXBuildFile settings - COMPILER_FLAGS - -fno-objc-arc + ATTRIBUTES + + Public + - 805AE44C01D7936BA8A238C6C5C4807D + 6671A09ADA325A55D4842D9BAA00A625 includeInIndex 1 isa PBXFileReference lastKnownFileType - text.xcconfig + sourcecode.c.objc + name + DACircularProgressView.m path - Specta.xcconfig + DACircularProgress/DACircularProgressView.m sourceTree <group> - 809101940909F56A7B70CE17D447640B + 668AB0AD09FF484BCEB9F3C571A1FAC5 - includeInIndex - 1 + fileRef + FB6ADEE24FB07E1430D11EDF1F4C7636 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - EXPMatchers+beLessThanOrEqualTo.h - path - Expecta/Matchers/EXPMatchers+beLessThanOrEqualTo.h - sourceTree - <group> + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - 8136A5BFC35DA48ABC2C0D94EA79B7F0 + 66AC71B16E9F622403ABB8C925C5989B + explicitFileType + archive.ar includeInIndex - 1 + 0 isa PBXFileReference - lastKnownFileType - sourcecode.c.h name - EXPFloatTuple.h + libPods-MWPhotoBrowser_Example.a path - Expecta/EXPFloatTuple.h + libPods-MWPhotoBrowser_Example.a sourceTree - <group> + BUILT_PRODUCTS_DIR + + 6714A6EB032DB017639853BDCCF50838 + + baseConfigurationReference + D239995504700A2E5AAB663DC471FBCA + buildSettings + + CONFIGURATION_BUILD_DIR + $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/MWPhotoBrowser-iOS7.1 + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + INFOPLIST_FILE + Target Support Files/MWPhotoBrowser-iOS7.1/ResourceBundle-MWPhotoBrowser-Info.plist + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + PRODUCT_NAME + MWPhotoBrowser + SDKROOT + iphoneos + SKIP_INSTALL + YES + TARGETED_DEVICE_FAMILY + 1,2 + WRAPPER_EXTENSION + bundle + + isa + XCBuildConfiguration + name + Release + + 67888E9C4D9A47DADEC965E59DC45373 + + fileRef + BF29141D751888DFCD02AC4659C5B58F + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 6809816EE7C50DD585AD1D47C446C065 + + fileRef + FD97BD7042E61F5298DA2ABBC1AA143D + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - 818AFFCC037C608492FAE59C7C3E85C0 + 6831E5ECA93011E3CC928A7C5594EA6C + + fileRef + EC924E4377BD0648FE0E5D36F63195B6 + isa + PBXBuildFile + + 684FC6B2FCBD849342F3B2E03EFB7A28 + + containerPortal + D41D8CD98F00B204E9800998ECF8427E + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + C5974A562F915524799FBBD7D60C82DB + remoteInfo + MWPhotoBrowser-iOS7.1 + + 68F141757E1606330C04FEBE78CBCE4E includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h - name - SPTExampleGroup.h + text path - Specta/Specta/SPTExampleGroup.h + Pods-MWPhotoBrowser_Tests-acknowledgements.markdown sourceTree <group> - 8261C05543EA69BA5F136A06D5005C50 + 68FD6C98E381347D4D3F670BADABAD39 + + fileRef + F37B375C563F1F87382C999BF6A38450 + isa + PBXBuildFile + + 6913BFE0EE13D6796DAB1C3C1C137FC1 + + fileRef + 6C1B2BCDE6F6941A869E0A9471D4EBE8 + isa + PBXBuildFile + + 6924E116731D7079958063A3EE0781ED + + fileRef + F218977F348D163003B9995918E4A1BB + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 69335D299D54229201A668D2B55F53C0 - explicitFileType - wrapper.cfbundle includeInIndex - 0 + 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.objc name - MWPhotoBrowser.bundle + EXPMatchers+beSupersetOf.m path - MWPhotoBrowser.bundle + Expecta/Matchers/EXPMatchers+beSupersetOf.m sourceTree - BUILT_PRODUCTS_DIR + <group> - 82AC9861A9FE0BEFEC04D31C3B05ABB2 + 69EBB956302554EA37775F4D806BC4DD fileRef - 40D39B6435EEF47A85F4E3FB684E72FE + FFCF2C3F17C8514584FCC49E473C2F09 isa PBXBuildFile settings COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 + -fno-objc-arc + + + 6A1F57A44D1B5C641E9C4BD67D1A8F6A + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + XCTestCase+Specta.m + path + Specta/Specta/XCTestCase+Specta.m + sourceTree + <group> + + 6A4E3ACA285A21392936C110E7EC91F0 + + fileRef + F261561FF68DDFFE15CD3E85184B80DF + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + - 82FC12F67E83874B93592218E9FB4CA0 + 6A522FB7AA70859F16C7F4C7F66795E5 fileRef - 427921605A450AEF67D129DACCD87BED + 6671A09ADA325A55D4842D9BAA00A625 isa PBXBuildFile settings @@ -4564,27 +5062,59 @@ -DOS_OBJECT_USE_OBJC=0 - 8439940A3793CF65B24F4185E04317D8 + 6AD045C441252CE5E582550E42134E86 includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + SPTTestSuite.m path - UIBarButtonItemGrid@2x.png + Specta/Specta/SPTTestSuite.m + sourceTree + <group> + + 6AD7732938C49233624F7D65F7706AEB + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + EXPMatchers+endWith.m + path + Expecta/Matchers/EXPMatchers+endWith.m sourceTree <group> - 85A6795A5CD0C6DEA1F648AD0E6D1248 + 6B485E6EEE662DC93BED89C08383827C + + fileRef + 25C1953BA899E791C4AEA91E97A093AA + isa + PBXBuildFile + + 6B7F4EF2EF572748DE98B291C45B106E baseConfigurationReference - 2055A9E17F10DAA3DD7884DDF96A0A50 + D239995504700A2E5AAB663DC471FBCA buildSettings + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym ENABLE_STRICT_OBJC_MSGSEND YES + GCC_NO_COMMON_BLOCKS + YES GCC_PREFIX_HEADER - Target Support Files/MWPhotoBrowser/MWPhotoBrowser-prefix.pch + Target Support Files/MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1-prefix.pch IPHONEOS_DEPLOYMENT_TARGET 7.0 MTL_ENABLE_DEBUG_INFO @@ -4609,33 +5139,116 @@ name Release - 862018A7CC10880108A2BDC5146C8F3F + 6B909FB1F98C3B3E3A8E20832F2958EB + + explicitFileType + wrapper.cfbundle + includeInIndex + 0 + isa + PBXFileReference + name + MWPhotoBrowser.bundle + path + MWPhotoBrowser.bundle + sourceTree + BUILT_PRODUCTS_DIR + + 6BE7BAF98082D12EF6F1D39218744065 + + fileRef + 0AAEE06FB4F7F495B1AAD1EDDEB2E9D2 + isa + PBXBuildFile + + 6C1B2BCDE6F6941A869E0A9471D4EBE8 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc name - EXPMatchers+beInTheRangeOf.h + UIImage+GIF.m path - Expecta/Matchers/EXPMatchers+beInTheRangeOf.h + SDWebImage/UIImage+GIF.m sourceTree <group> - 86334F1A4DF0160C4B098EF643AB6E07 + 6C8F9DE4A48355AEDE9D9923A8F8FBDB + + explicitFileType + archive.ar + includeInIndex + 0 + isa + PBXFileReference + name + libExpecta.a + path + libExpecta.a + sourceTree + BUILT_PRODUCTS_DIR + + 6CA1FE1875229DC94EDE6B858B8EF063 baseConfigurationReference - 7389D03E90A74E5A200DD5ADBB209885 + 7BA9D90D9129488AF4FF690D2D8CE373 buildSettings + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf ENABLE_STRICT_OBJC_MSGSEND YES + GCC_NO_COMMON_BLOCKS + YES GCC_PREFIX_HEADER - Target Support Files/DACircularProgress/DACircularProgress-prefix.pch + Target Support Files/MBProgressHUD-iOS7.1/MBProgressHUD-iOS7.1-prefix.pch IPHONEOS_DEPLOYMENT_TARGET - 7.0 + 6.0 + MTL_ENABLE_DEBUG_INFO + YES + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Debug + + 6CEF58D8C2AA3B0668E971BFF8833762 + + baseConfigurationReference + 60917A76BEDFEB7A54CD3FC778268671 + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/MBProgressHUD-iOS7.0/MBProgressHUD-iOS7.0-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 6.0 MTL_ENABLE_DEBUG_INFO NO OTHER_LDFLAGS @@ -4658,57 +5271,87 @@ name Release - 865FAF448207E691D600F40C4ACF7C58 + 6CF0E8B8095182BCA55C62DB155D35E7 + + buildActionMask + 2147483647 + files + + 1AB098D345C36F8A9B5ADCCFB15737A7 + + isa + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 6D084FCB5695C1CC9ED017BF5FD93C9B includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + text.xcconfig name - EXPUnsupportedObject.h + SDWebImage-iOS7.1.xcconfig path - Expecta/EXPUnsupportedObject.h + ../SDWebImage-iOS7.1/SDWebImage-iOS7.1.xcconfig sourceTree <group> - 866569443B7D10AB5D6DC7FC0830235B + 6D37BEAA1FC469C3582CACB4E9766502 fileRef - DF11024BF511A0D2225D4BA84770CED7 + 69335D299D54229201A668D2B55F53C0 isa PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + - 86A1ADA0F8A843FA09BFF9142BEF76D5 + 6DD0442440B0BC72626ACB301A9A479A - includeInIndex - 1 + fileRef + A7429C31A809059961281DF33002429A + isa + PBXBuildFile + + 6E1B606A74EFBFF5C21282DD1F9380F3 + + includeInIndex + 1 isa PBXFileReference lastKnownFileType - text.xcconfig + sourcecode.c.h + name + Expecta.h path - Expecta.xcconfig + Expecta/Expecta.h sourceTree <group> - 872948DAF79618AD725E0BF364E5DDD4 + 6E60D1F8670D1427EA6539244C485E69 - fileRef - 5A06D9F124A077FE3345C713135D7E6C + includeInIndex + 1 isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + SPTSpec.h + path + Specta/Specta/SPTSpec.h + sourceTree + <group> - 87A80C8B1F0C635DA56B74807AE426D9 + 6EB2498C2AFB1DF8555CB7C1EF89CA5C fileRef - 2ACE82A15131DC569A786CB49EFD1804 + 548D6ED317501EC82BF1532DEA509727 isa PBXBuildFile settings @@ -4719,105 +5362,182 @@ - 886428740DB164747FBA1935F65900DF - - buildActionMask - 2147483647 - files - - EFE77B95F063C96D9B07BC2A988AB403 - B6CB1D947CABAFFCEFC7F94006CB7AD4 - 319D6926D1261EB1150D83F672CCA35E - 00518063767430EDC47FCC49F4409458 - 4CFCAA497A77475D017F781F8241A4C0 - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 8952D588C0E5AD12FD9CF3747FD061F2 + 6F1FCA0BD48258CDEC1B14D704BA3E5D includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + text.xcconfig path - MWTapDetectingView.h + Pods-MWPhotoBrowser_Tests.debug.xcconfig sourceTree <group> - 8A00437F88A0C89CD672C2085CCCF62B + 6F9FC34E9C16469B5B4FA55CB5AD7F6E + + baseConfigurationReference + B2829E9E2867D8CA2C13B4DCBF27D906 + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/Expecta+Snapshots/Expecta+Snapshots-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + YES + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Debug + + 6FF6BE7A05BD8C066D244D2566D2DBA6 + + fileRef + 96BF4E40C956C72483820718D54070E1 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 70545E4EA86C6E593A2A9F6731DA8F6D + + fileRef + 3C85EA12507805BB691E7BF632EDAF13 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 7065F76F6E6E46155B92D11AECD095FC includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h - name - SDWebImageCompat.h path - SDWebImage/SDWebImageCompat.h + ImageSelectedSmallOff@2x.png sourceTree <group> - 8B2FFB12DD1404D98DCA25509B11611E + 7066284525749C87E4C840251EE3961A fileRef - 1A1E6F8D4C651A22BB8CCEF1226FB1EE + DE54C3C91B980435BD044A42FD71152A isa PBXBuildFile + settings + + ATTRIBUTES + + Public + + - 8B97E5CA574F06B315C5F1D27B25DEFB + 708C7AE8655DAEEB0FCB4AA831110A81 + + buildActionMask + 2147483647 + files + + 2792D87A7A6DE1E504C287C38A07CFD4 + C5CD559D15F6E685829825B38F3AEB11 + 439C7771FF755CD09022C11B78BD5441 + A7E57367BF9E9E6138B7DF3D6104EC12 + 2D72A4B75355EC0573143122E741E98B + BE2D642473CD92EAAC6F8D35028A6ACC + F849D405530B9B83168910A547B50F18 + + isa + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 7188A4ECB571A653271DCB8D7489969F fileRef - 785A993DF42B3ABEF658B85E1F47663F + 37CF1AAA9EAFCF14857EEE4E5E41F784 isa PBXBuildFile - 8BEDD694C8600B014302155F48FD5B08 + 719353E5F5BDD19B2D80B273F365F2BF - buildConfigurations + children - ECE81C5981477AA7D254ACC70534BE23 - BFD984F9AF4C47EDD370C631057D40E8 + 1C0BE20A7E81BA8AFD0E847EAA2CD797 - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release isa - XCConfigurationList + PBXGroup + name + Development Pods + sourceTree + <group> - 8C4EC29461A90C294949DAE717A1BEC5 + 71BC183B1FB7AB5F8CF9A3383C6B354C includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + text.script.sh path - EXPMatchers+FBSnapshotTest.m + Pods-MWPhotoBrowser_Example-frameworks.sh sourceTree <group> - 8C4ECAE46CD3BCB39F38F4FF20D074F6 + 72D6E5022953E39835BCF1FD700AAC7F fileRef - 0B7E61991D03B44046913BF3B345F4DB + 01BA9FAF0441990327A0B9C892EC33CD isa PBXBuildFile + settings + + COMPILER_FLAGS + -DOS_OBJECT_USE_OBJC=0 + - 8D8B7C183B18D82F1958BB3115798433 + 733194FE81AF7E280368D91556E00609 buildConfigurations - C0593046ABD536BD086B85302FA897DF - CC01A834786EDBE30D7011502AE0F9B3 + 3C6018D65F5311DACE62DD5C9CD12854 + 0D1F7823CAED440DD0F63E570C67B9EE defaultConfigurationIsVisible 0 @@ -4826,21 +5546,10 @@ isa XCConfigurationList - 8DC04A9EEA14F0D2300FB6C0CAEB9CAB - - includeInIndex - 1 - isa - PBXFileReference - path - UIBarButtonItemArrowRight@2x.png - sourceTree - <group> - - 8DF90D623F7F9015EEE9F1D7FEE7E053 + 737870A213D270E142153D443CA1C0A7 fileRef - 0A924BC847BA99EBCBD0588603448B05 + 328CA8A63029EF5D998A9EED30EE04FE isa PBXBuildFile settings @@ -4851,48 +5560,21 @@ - 8E108520195BF6568A4A53786EA7B6F0 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - FBSnapshotTestController.h - path - FBSnapshotTestCase/FBSnapshotTestController.h - sourceTree - <group> - - 8E485F27A3C78223FB086075C2974A49 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - NSData+ImageContentType.h - path - SDWebImage/NSData+ImageContentType.h - sourceTree - <group> - - 8EE5D8EDB6C595B190E81B76D3190EB3 + 73E11DE113B852B58114C7185249DB82 + buildActionMask + 2147483647 + files + + 5C185ABC7CB32ECCF8ECC82BC4705522 + 9DA80338167838394C6B5A9B6130E9DC + isa - PBXTargetDependency - name - MBProgressHUD - target - FE2F1D7B9D9FCEA148517E4657B243F4 - targetProxy - D7B59E66FA2C765426650ADECEF955EF + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 - 8F2B443FA0D511403E4DA2A79DB3302A + 741924A073B909B7AFBDDB23C25D9CE2 includeInIndex 1 @@ -4901,41 +5583,86 @@ lastKnownFileType sourcecode.c.objc name - SPTSharedExampleGroups.m + UIView+WebCache.m path - Specta/Specta/SPTSharedExampleGroups.m + SDWebImage/UIView+WebCache.m sourceTree <group> - 8F3064A5B520D1E4290AA240A05B7D6F + 74325A8C735AC27298B53AE77A62758D - includeInIndex - 1 + children + + 40BE40DBAFEC3D9E63A756296424F8C3 + 79A530184801D82737492F32015A008B + D0E862B0A7C9ACC538472981D6086B23 + EFF7E02E20A76B9E8BA18B06D1BD1205 + A7429C31A809059961281DF33002429A + 2AF1D3B3F78C6771F92418DF70000249 + 2C858930677061AD09AC27FE116BAD94 + CC08F424CAF98D9993BACA21F8610FD2 + 9341F63412149D22C6290B281497FFFE + 061D9DA8C4A4B42AD2BEBF9CCD7791B5 + 7065F76F6E6E46155B92D11AECD095FC + 20F27C938C5B92508B8FDCD6BC472B17 + A11F90DBB6D013BBD02E7F2884FAB882 + 94B3E7FD543C524CF33D079199EE7059 + 387B77A2F66A747E6E82D54865A7DF4F + 8B1F7ACF7E60F6BECBD2E3D5AADEADD2 + 7D67DE8464E3065F33C2C45662E895D5 + 7DCE26CDEA2D82CE819E19E79AB6B6BB + DF08D341B4BEA29674FCBC8D1259E685 + D2D6B98D555A2768E2760397A4145753 + A6B81301393464F04727B242313DF8FB + 55D00A044079BF2E1FBA6C209D7EFE01 + 2175A32C1039DDFCDA53B27892268F1A + 60D0F9290B4BECDD4224D58D24A7C6E9 + AB6C7C76143F94D79F87E59C3F58356C + 65593CABDB787470A27F80FD0E40D891 + 164F49A60006F63EB29CF6488F33113C + EA435551CC148753597DE1E0AF24A77C + BB77A60BFB6B1B88E541338BFB8D00E9 + 00E0E94A414ACEA941F4E3F7524D96D0 + EC924E4377BD0648FE0E5D36F63195B6 + D4DA65BA155007D24A7798B4EC7F47E6 + FAB2C715AB1CECBF81C21D4FA9071B49 + isa - PBXFileReference + PBXGroup + name + Assets path - VideoOverlay.png + Assets sourceTree <group> - 8F674582EE71972EE60EFD96C1F173D5 + 7436C602BB1CA7C91560C28DE749357B fileRef - 0683DF2C9B7FC27B576AB4B7B3B146ED + 8CF584384414E0B977D3126B8D442EDE isa PBXBuildFile settings - ATTRIBUTES - - Public - + COMPILER_FLAGS + -fno-objc-arc - 9019F9233E2A8B04A82C1B8D0274F09F + 745A5762E099FEF6C27826D21170FA23 + + isa + PBXTargetDependency + name + Expecta+Snapshots + target + 05257CC76400D71826E603561A0F73E6 + targetProxy + FF1B1008F0BA28E26618F2C3DC0F898E + + 746AC116E4A809F66BBEE0DFEC99FFD0 fileRef - 9A9B45D988FA49FD87F8587C42403EC5 + 8BB83A8417700D3227B3CC075CC64D16 isa PBXBuildFile settings @@ -4946,10 +5673,10 @@ - 904DB6CCA2AAC8D7B3245ED9628E865A + 74707D5ABEC55B3084F52C40A4227B06 fileRef - 691CE6B20E64762C98682B93B31435E7 + 49BC151A9A9932CA3E4B51B8E4406030 isa PBXBuildFile settings @@ -4960,50 +5687,22 @@ - 90C5595E0565CBEBB42EFEBB157FF619 + 75A62DBF4256CFBB94A1711686439C88 - containerPortal - D41D8CD98F00B204E9800998ECF8427E - isa - PBXContainerItemProxy - proxyType + includeInIndex 1 - remoteGlobalIDString - DE3B07ED7FF04F506B0C5E00F4973589 - remoteInfo - SDWebImage - - 9142D907B715CE18385E00AB1972B1BD - - children - - CEFDBDB8900789B0FFB86EBB7065BC62 - ADEAC9FE1270035973745D0EB3B84395 - 6CD36438CB08D280978CEE50363D8B8B - D52C083C7341E76797DB059849542613 - D7F1441E30E059AC17B4C1CE1464C07B - 50F87BFDC26A0B4CC6DE06D3ACBD0714 - 4D720BB8AE19E427E58843509B28FEB6 - E0EBF0357895E0C657A233A9D4D0E2C1 - C5284B0E2549CD42E31F469FB8B92DA8 - 7CF892960748F43245AD2B5CD2AC41A5 - 8261C05543EA69BA5F136A06D5005C50 - isa - PBXGroup - name - Products + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + SDWebImageDecoder.m + path + SDWebImage/SDWebImageDecoder.m sourceTree <group> - 91E14C244388DE830AA1C4AE88415F76 - - fileRef - BA9181C8B2773795F2EACBDE286994AD - isa - PBXBuildFile - - 92F064516748B6AA4C6E303A38C3FE6A + 75C3EAAAA276564862EBE868F4CB8492 includeInIndex 1 @@ -5012,33 +5711,62 @@ lastKnownFileType sourcecode.c.objc name - EXPExpect.m + NSImage+WebCache.m path - Expecta/EXPExpect.m + SDWebImage/NSImage+WebCache.m sourceTree <group> - 9374BBB3BA16684D1B858CCC9C3E2D8A + 75EA812A78FB9B908BCF222C30BDC263 + + fileRef + DF08D341B4BEA29674FCBC8D1259E685 + isa + PBXBuildFile + + 763116CCBC2A9C1721FEC5895A2E858A + + containerPortal + D41D8CD98F00B204E9800998ECF8427E + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 9F94634D61584613303A1CE9E3598593 + remoteInfo + Specta + + 76331E71086C8CD5118A69B046D8F0FB + + fileRef + EC66025612AB7AF586362D4587912B8D + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 76674E127E6C44FC07C408ADE81BEE3A includeInIndex 1 isa PBXFileReference lastKnownFileType - text.plist.xml + sourcecode.c.h + name + UIView+WebCache.h path - Pods-MWPhotoBrowser_Example-acknowledgements.plist + SDWebImage/UIView+WebCache.h sourceTree <group> - 93CF7F496E727D827BED2105B65D2073 - - fileRef - E4436D58F27EAC932F3CC2A7619D5FD3 - isa - PBXBuildFile - - 94A310E9C2919B9904E9AFBD2837C2B9 + 76F49F5ECFFC7C15904E6C672C8D1C69 includeInIndex 1 @@ -5046,15 +5774,17 @@ PBXFileReference lastKnownFileType sourcecode.c.objc + name + NSValue+Expecta.m path - MWTapDetectingView.m + Expecta/NSValue+Expecta.m sourceTree <group> - 956FB3AB698AF3DA776A9F24AA79C229 + 773431F2076B312A983DAE1FF254B6AC fileRef - 66D391F04A8D672C0D42510DE811E7B2 + 3E0F390FD74843F61B7AED4188FCC3F8 isa PBXBuildFile settings @@ -5065,56 +5795,41 @@ - 9604D510A96A637DD9AE0D304B68A5A2 + 773EAA8924B4823FB8E94F7AFFA61F9E + + fileRef + 65593CABDB787470A27F80FD0E40D891 + isa + PBXBuildFile + + 7768E180287F65FB37DCC3EF5E5C5325 includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h + name + EXPMatchers+postNotification.h path - VideoOverlay@3x.png + Expecta/Matchers/EXPMatchers+postNotification.h sourceTree <group> - 96AE2267633A27498E5D45052BDD5BBA - - containerPortal - D41D8CD98F00B204E9800998ECF8427E - isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - 9775596B3CA16905FC8F66DA8E2A3C67 - remoteInfo - DACircularProgress - - 9775596B3CA16905FC8F66DA8E2A3C67 + 779CFE8771E1EF63F1313ABEBCECAA4A - buildConfigurationList - 619B0B2F7ACD42F8EF700EAE6D1C95DA - buildPhases - - A6993E0B001E6EB572176DFCF9B87C6A - F2A9AAC03867BB4990470BAC5912E030 - 1246A1C00980422020A6884856143651 - - buildRules - - dependencies - + fileRef + 5CA5187B727BAACAE0E3D82B002FCF89 isa - PBXNativeTarget - name - DACircularProgress - productName - DACircularProgress - productReference - CEFDBDB8900789B0FFB86EBB7065BC62 - productType - com.apple.product-type.library.static + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + - 97B5429A3CE99BA07086198F10CCE615 + 78ED573889168148AE51F74C1E8B1C8D containerPortal D41D8CD98F00B204E9800998ECF8427E @@ -5123,14 +5838,14 @@ proxyType 1 remoteGlobalIDString - E2FE87384A67337831E53490EEA8BF11 + 501BE33907DBD9E3BB1712FC47BF8093 remoteInfo - MWPhotoBrowser + DACircularProgress-iOS7.0 - 97E91EC237B8623D895DBF6092034AD7 + 78EDD814F6915CD631A2F9FD8D0B4030 fileRef - 862018A7CC10880108A2BDC5146C8F3F + 4921F9F25372FD8AF824DB928C59E7B8 isa PBXBuildFile settings @@ -5141,113 +5856,78 @@ - 981F3EB0C06E97770D2421E673B013A1 + 790215B6642C5AC0AB66ACFBA94DA16C includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h - name - EXPMatchers+contain.h + sourcecode.c.objc path - Expecta/Matchers/EXPMatchers+contain.h + EXPMatchers+FBSnapshotTest.m sourceTree <group> - 9839B551DAF141B99431C2238C8EEBC0 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - AssetsLibrary.framework - path - Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/AssetsLibrary.framework - sourceTree - DEVELOPER_DIR - - 990C6F27E60B10F0E4BA0674D80F546B + 79A530184801D82737492F32015A008B includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h path - Expecta-prefix.pch + ImageError@2x.png sourceTree <group> - 9933B0F6DA01EDF804C19260E9515E65 + 7A665AEF2BE41C7F23633A96B8547F77 fileRef - 0B7E61991D03B44046913BF3B345F4DB + EBD7ABE276C83631D459932245E75FBB isa PBXBuildFile - 9987EAA3314FDCBDC6783C325695E1D8 - - buildActionMask - 2147483647 - files - - E287D744F886B15E1060AFEA475FC727 - 7E05296687CBD4F8C77EA450EEAB7B60 - 91E14C244388DE830AA1C4AE88415F76 - 4DCDDE359E1F3BB419E0F7E9DD12CBB6 - BE6668D2527C0063CE1C755190A7596F - 7D901800D8324F9F338B54CA286AD771 - F26631BB63543446C157972F2F6D1475 - FBADF2C12D471003AEB710314DA3FF49 - FAC85E18FE868D87FFB2E13C182F4DB9 - 1E08912939425D011D7C47713E6CDAF0 - 65F75ED4B34CEDF568441FBC95BA1459 - B9051EB6C3E749E2F0538ABF5076D0BE - EDC1E77817E2D0252126B98EB0206A62 - 93CF7F496E727D827BED2105B65D2073 - A14C97547283B618AE64053DD92BB395 - F2168F9F63056AC8BFB344608C4158BE - 8B2FFB12DD1404D98DCA25509B11611E - F314DFE6C76A8EEBC3D8CAF03EB89850 - 5A859FF87C3507C937241DD78BD95EF3 - 051AA4E51A019933DD1E5CE99CD7352A - A2406F04BC69905BAB01C77F8073B55D - E99804B4B10C0A5C7C08E5EF962804CE - FC1FB976E1C29A75089D2374BDFCCC44 - 105B37778FEED1965C8D0AF4C9E4B4F1 - AB0885F8524D9BE85FDEA8BF30520D43 - F88B870D7D0531FB54EAD23EB162DB70 - 64734F2BA63DAFDA24F819EE71704665 - 688EFB46F8559BD675FD06384ABA49E1 - C1814AA3C422738CF4B8DC63539CCD3E - BB3A5C6A66C23862172BF9BED9BC8200 - 76C42C41A4B61435A3315770F58154B2 - D3C785493044AF463085D75F2E9D4FEE - E97CDC7A1DFD18DAAD3C505929F32105 - - isa - PBXResourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 999D9522F4AD2757D76E2BC0D6606B4A + 7AA578A6AEF651F16F03B609BB1E40AE - containerPortal - D41D8CD98F00B204E9800998ECF8427E + baseConfigurationReference + 93CEE4DD787EF512C9D9AA34A4223E43 + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/FBSnapshotTestCase/FBSnapshotTestCase-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + YES + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - 5813251FEA21E4AEE97385709F1912DE - remoteInfo - MWPhotoBrowser-MWPhotoBrowser + XCBuildConfiguration + name + Debug - 9A086D9BE521AADC7C972AE3D9CD5B48 + 7AC0C9AF6FC29D788CA6CA72790CBDEA includeInIndex 1 @@ -5256,44 +5936,37 @@ lastKnownFileType sourcecode.c.h name - Specta.h + SDWebImageOperation.h path - Specta/Specta/Specta.h + SDWebImage/SDWebImageOperation.h sourceTree <group> - 9A9B45D988FA49FD87F8587C42403EC5 + 7AC91F55DAAA2F0223A97BEFF8BCAF68 - includeInIndex - 1 + fileRef + 01D3F330EEFE0D7FE6817AA3F61B5DD3 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - EXPMatchers+beSupersetOf.h - path - Expecta/Matchers/EXPMatchers+beSupersetOf.h - sourceTree - <group> + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - 9AF3FD4A822DCF644AB50D3967C43C14 + 7AD81C2E09E2DB55B5ADB2399D44F96E - buildActionMask - 2147483647 - files - - B6B32565B1C26404789EEFCF37B7C225 - + fileRef + E0FF8A55E4FAC77410368EC41E04EDF2 isa - PBXHeadersBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXBuildFile - 9B546D0F895D9B5A8316B948CEE95C77 + 7B70F66227FEB34E8096CF405B4A1B31 fileRef - 29E6F040DB8ACF8886F7FE628840C480 + 96F7D0A9619B5ECF1BA3085F301640CB isa PBXBuildFile settings @@ -5304,111 +5977,218 @@ - 9BDA7CB400BA41525D0DAC5E267B2670 + 7BA9D90D9129488AF4FF690D2D8CE373 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + text.xcconfig name - NSData+ImageContentType.m + MBProgressHUD-iOS7.1.xcconfig path - SDWebImage/NSData+ImageContentType.m + ../MBProgressHUD-iOS7.1/MBProgressHUD-iOS7.1.xcconfig sourceTree <group> - 9BF2584F8D336EF737485D7396CFBAFF + 7BEA3B16B6186995A963DAD635823C3A + + fileRef + 164F49A60006F63EB29CF6488F33113C + isa + PBXBuildFile + + 7C0F08326F5A918F2A311222533EC950 - includeInIndex - 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + wrapper.framework name - SpectaDSL.h + Foundation.framework path - Specta/Specta/SpectaDSL.h + Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Foundation.framework sourceTree - <group> + DEVELOPER_DIR - 9C03752CBF78921009132B656CF36184 + 7C14E04E9CFF57952B7621958950F09F - buildActionMask - 2147483647 - files + children - 45548268D1B9EE9D37731231D940A591 - 4463CD014E8C258B7F8BF0FD64901B8F - 664FB9826D0F046AB6CE15196CC120B7 - A245A84584833A620D85A9C8285C71A1 - 1186EC1A35306EBBA8C3DE66F0973361 - AB5E9DFDA102BB04CB66FC61E01085B0 + 4519383492FC8F8EFD23370DBF52C8E6 + 352DC47B11350801DF2126AF7583BA78 + 5D02A92C9AEDDCA311682586732CAE63 + 96F7D0A9619B5ECF1BA3085F301640CB + 50A6CB48BD036BA95436D50530B6902A + C81138DC2538A91FE1750C57875F7BF8 + F51C9D7C2B4BBE5F281ECA35EB91B81B + B8F6457DCF8AEE86B97C7E1BEFCE2E2A + DB0F54D7A298EF6E345A6472EF1CB3BC + 5C096AF52C1D9D3B88B84A4956889B94 + FC71886B99B9318A86175962CC5851BA + 01BA9FAF0441990327A0B9C892EC33CD + EB7C443793D663559DECA9726CE6643A + 52548D43BC55700DF73633DFBBB74887 + DAA40F7FE6132464B3E058DD5C4B769A + 9C55C23A53F272D0FB6EDE9328C1F604 + 17DE04DD655DDA4495305CEEE6AB3222 + 7E6F50D81F5E8AC0EC59DAC61AEBFE9C + 6E60D1F8670D1427EA6539244C485E69 + E272AF35FCE3F97A94369B53F0A934A3 + 3E0F390FD74843F61B7AED4188FCC3F8 + 6AD045C441252CE5E582550E42134E86 + 4921F9F25372FD8AF824DB928C59E7B8 + C76558D23D3662CFB44950D35534F7A9 + 6A1F57A44D1B5C641E9C4BD67D1A8F6A + C5A02591FDB44C1147BEC9F2DC2BE079 isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXGroup + name + Specta + path + Specta + sourceTree + <group> - 9C8319C4AFAB3CAE3C7314EAD8D1AB34 + 7C7F3A86F0DFF6A318EBE147A9BD78DB fileRef - F3FAB75D28A2755E4F9F79FB9F2AF5DB + B0AD4D3FD51000868948132517923991 isa PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - - 9C95EBE1D39EEFE5E6404691C95BE2E2 + 7C8990F70B3DFACC64C905887ECE29A7 - includeInIndex - 1 + fileRef + 7C0F08326F5A918F2A311222533EC950 isa - PBXFileReference - lastKnownFileType - text.script.sh - path - Pods-MWPhotoBrowser_Tests-resources.sh - sourceTree - <group> + PBXBuildFile + + 7C8DC0DEB56BD98D083C73748A9EAA30 + + fileRef + CF9FD7F65D9A4786AF3DD1C8A6E2ABE4 + isa + PBXBuildFile + + 7D1D454177DB3A5E19455B97494F6FB2 + + fileRef + D83DB981719BF50DFA1B90DF7C1942A7 + isa + PBXBuildFile - 9D5AE460F3B78B02A8AE8E5AD0DCC013 + 7D44008C5BF7FBE3A1356775F129289A + + fileRef + 75A62DBF4256CFBB94A1711686439C88 + isa + PBXBuildFile + + 7D67DE8464E3065F33C2C45662E895D5 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.objc + path + PlayButtonOverlayLarge@2x.png + sourceTree + <group> + + 7D7AD40D1D66D64A03EF0BB0DC1B5846 + + children + + 628A86155E66266C94DDA5EBCDA72AFD + 5B1985A4CB62C48AEF3651FB8223DA30 + 04969E3FA5A6426CA279D6D6E7FAD408 + 04359FC2EA7B7CE174FC15886814B0F5 + 30D028565C3AC56669794F4FB8CE5930 + 96BF4E40C956C72483820718D54070E1 + 25C1953BA899E791C4AEA91E97A093AA + BDBA1D97314684EAE41BEDC18CE34FCD + D833067C97F24C277CD5F36AC7070DD0 + 1331B671ACD38C99B153E679E3BD2947 + 5B14A0946BD6069275E1664D74DB5DB2 + 9E750F640E488EFF0B9C4FD78109AE97 + 291E63B3BBA5EE2CFE329A52432D1146 + C3592D9FBA355E61B209E54E31408EB8 + 5A9EBFC7ACFA8F737D2F87F775CA091A + 0B5BFB9734BE2A9804B5269D7CD17E6D + C4EE2327AA21B56F96948266BEE8B060 + 2C7237EAF40D180CD096D5392125E14D + 26AC6E873763498678032ABB5C85185C + DE54C3C91B980435BD044A42FD71152A + 22C88C33F57CF0085CC8A7158F1C7B60 + + isa + PBXGroup name - EXPMatchers+contain.m + Classes path - Expecta/Matchers/EXPMatchers+contain.m + Classes + sourceTree + <group> + + 7D9E32DAA93E15CFCF77A5BCD2D4BAA2 + + buildConfigurationList + 189B7D1A1C865073D7F999A759ACD292 + buildPhases + + 708C7AE8655DAEEB0FCB4AA831110A81 + 46A2CE1545DEBE5FE9DF073C8EBFE2F0 + C8550F6E4CF998A1814DDBE05A07AA47 + + buildRules + + dependencies + + isa + PBXNativeTarget + name + FBSnapshotTestCase + productName + FBSnapshotTestCase + productReference + 147408A72CFBB199A12910CDF1B9EC82 + productType + com.apple.product-type.library.static + + 7DB346D0F39D3F0E887471402A8071AB + + children + + 93A4A3777CF96A4AAC1D13BA6DCCEA73 + 719353E5F5BDD19B2D80B273F365F2BF + F4CDA5FA9197A41E0081E84F932906EB + E0C60F74505B8CA4DF064D4B2A6B7709 + 08877E80CE4F8FBEA0236250F69E2C62 + 29062DA699B861B896758C5A677765BD + + isa + PBXGroup sourceTree <group> - 9D6702575943BF5C71AD0E2299CB53E2 + 7DCE26CDEA2D82CE819E19E79AB6B6BB includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h path - MWPhotoBrowser.h + PlayButtonOverlayLarge@3x.png sourceTree <group> - 9D6E638E56BDAD3C2196ED9C28FAF857 + 7E5E6AB9D2EBC690BAF0CD1B3726A417 fileRef - E348B132ABCC246013AE3A5532BC609F + 509637F57543102B11D41C0A86BF6AE2 isa PBXBuildFile settings @@ -5419,215 +6199,140 @@ - 9D77DAC945EC22411297CBC957C966F0 - - baseConfigurationReference - 86A1ADA0F8A843FA09BFF9142BEF76D5 - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/Expecta/Expecta-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MTL_ENABLE_DEBUG_INFO - NO - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - - isa - XCBuildConfiguration - name - Release - - 9D89C03F805626896F95FA71887D578C + 7E6F50D81F5E8AC0EC59DAC61AEBFE9C - children - - F629BC640170D45C22A8048A42BAB040 - F6E655732BA75BED75FFACA472080CC4 - 505D7B9189B81314EF02A1E9479972D0 - A22495C61077EFF6CD10B8B82AFA964B - C833942945CF274906A18C8D4BAAE480 - 2FD7E39AFBAB884FA64CFB5DBDFA1F7B - D8BBE4506E8863FF1D2FA4058580F0C8 - + includeInIndex + 1 isa - PBXGroup + PBXFileReference + lastKnownFileType + sourcecode.c.objc name - Pods + SPTSharedExampleGroups.m + path + Specta/Specta/SPTSharedExampleGroups.m sourceTree <group> - 9E58B396BFA804075E0FCC2D7E764BA6 + 7F397A8A598DD08C158F22A5A1DAC0A9 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h name - UIImageView+HighlightedWebCache.m + EXPMatchers+beIdenticalTo.h path - SDWebImage/UIImageView+HighlightedWebCache.m + Expecta/Matchers/EXPMatchers+beIdenticalTo.h sourceTree <group> - 9E907D6C90793FF2CC5533F151827418 + 7FEE0E8D094D7BCCAC7129473EE05ADC - containerPortal - D41D8CD98F00B204E9800998ECF8427E + fileRef + 2F8FE01380F8EF34F8D34A1855F7B917 isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - DE3B07ED7FF04F506B0C5E00F4973589 - remoteInfo - SDWebImage + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + - 9F0508C4938477BDB11EAF1F3A6960E7 + 8047F5141351F2667383AB1B516054BE + explicitFileType + archive.ar + includeInIndex + 0 isa - PBXTargetDependency + PBXFileReference name - FBSnapshotTestCase - target - 7D9E32DAA93E15CFCF77A5BCD2D4BAA2 - targetProxy - 5EB6A7FF5E92B3E2E96A92367BE4AA32 + libSDWebImage-iOS7.0.a + path + libSDWebImage-iOS7.0.a + sourceTree + BUILT_PRODUCTS_DIR - 9F080C1D1A758D0A874B7345BE67EC81 + 8059E5674B08670B0A002D564FFABF44 - containerPortal - D41D8CD98F00B204E9800998ECF8427E + fileRef + B3673B6102089791FA7076168FC943F1 isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - 9775596B3CA16905FC8F66DA8E2A3C67 - remoteInfo - DACircularProgress + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + - 9F1294BB80138FB7DEE240DF61EC1523 + 809A6B1ED861D96D46D8D181C548D1E1 - buildConfigurations - - 717B38CC8B651B61F35E12EE4211DAF0 - B74838FB9BEB33B6489F58D787E2A6A4 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release isa - XCConfigurationList + PBXTargetDependency + name + Expecta + target + 2F501FE84845EAD97B9087DAFCBBEE0E + targetProxy + E86A65F543DC3CC07C8D01B8642F7363 - 9F19BCDE9BF6E330E14588598DFC6337 + 81CF95A25497BD4688DA1D8BF1FEC75A includeInIndex 1 isa PBXFileReference lastKnownFileType - text.plist.xml + text.xcconfig path - Pods-MWPhotoBrowser_Tests-acknowledgements.plist + Specta.xcconfig sourceTree <group> - A07F4B785B315E5B075218A988F05149 + 832FA69EBCDEA9EF6B4C3A73A96B187A - buildActionMask - 2147483647 - files - - 060435B6E32CF028837E209B20E10639 - + fileRef + 75C3EAAAA276564862EBE868F4CB8492 isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXBuildFile - A09DD0AB6A512D74E5628070EBD56026 + 83A90451ECC713EF420E5C4BE319062F + includeInIndex + 1 isa PBXFileReference lastKnownFileType - wrapper.framework + sourcecode.c.h name - ImageIO.framework + FBSnapshotTestCasePlatform.h path - Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/ImageIO.framework + FBSnapshotTestCase/FBSnapshotTestCasePlatform.h sourceTree - DEVELOPER_DIR - - A0BA05DFEF00406DC4E8898D36D7418D - - fileRef - A8B86384F8C46CE8544B59FEB6C657F5 - isa - PBXBuildFile - - A0C76077A20E75ED950BF4F88A252F83 - - buildActionMask - 2147483647 - files - - 34F30E1314EC4C287E6B89477C2D0FB4 - 3B332CC633C291A7A96AD0922CFD8AB0 - 74A9CCFEBE692130454C41959EBA5254 - 69DC2FB163EAB23712D9C3C13C72518E - 0EF1CB072B5DE5D0A4EE7053EB0E2364 - C16C9E56CBDDE2AD1FCF3EFFF3127C20 - 60262C4B68C1B0EF7D3E4FADACB10CD7 - 518937C0924DA3A3DD216697CED9205F - 0498B98EB393D71314953683060EFD58 - D791C7B718024D8AED15BE84AA2FAAD0 - A14B4E9F94C0A0EC1EE0AE8BFE030787 - F9B0A541E338684F945B7539D802CF64 - 0DC4183837552F23710F86F9A032C574 - 3939EE53B37025D6F0E05FF8A4C7DCF0 - 311D5C7B166178CCB79CFD7E8DD4F641 - - isa - PBXHeadersBuildPhase - runOnlyForDeploymentPostprocessing - 0 + <group> - A1195ED094D0C8B66BB073959AA2ACCD + 8460C31711C941E648E9B1D8C0160B3F includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h + name + EXPMatchers+match.h path - MWZoomingScrollView.m + Expecta/Matchers/EXPMatchers+match.h sourceTree <group> - A14B4E9F94C0A0EC1EE0AE8BFE030787 + 84676595A6EC1518268236DF47B140F6 fileRef - 4CFA073D420411E3535ABA966BEE98CC + 328CA8A63029EF5D998A9EED30EE04FE isa PBXBuildFile settings @@ -5638,100 +6343,84 @@ - A14C97547283B618AE64053DD92BB395 + 84FABAEAF436CA9FEDD28121DCCECB55 - fileRef - CB3EA5CC56581FD52BDBA0179D956E7B + buildConfigurations + + C3D5EB779C1D6E8E696D33FD329964DF + 6B7F4EF2EF572748DE98B291C45B106E + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release isa - PBXBuildFile + XCConfigurationList - A1BF1E794449AF3F514B2EE3C85F4B10 + 851546D6FE7B76277FF6758F1EBA36D9 - includeInIndex - 1 isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc + PBXTargetDependency name - FBSnapshotTestCasePlatform.m - path - FBSnapshotTestCase/FBSnapshotTestCasePlatform.m - sourceTree - <group> + MBProgressHUD-iOS7.0 + target + 493375293C63883E773D55FB79AF6D25 + targetProxy + 439814C756BFD465BC49C1AE63B46FDA - A2118778317DA37C36420E58FB3923B3 + 85BD6994A56F28571B29ED1F986B1E3C - buildConfigurationList - 5CD9AEB21836919899CDA3A9D9510998 - buildPhases - - F0A8CE7CF766D19972CF0934C1652293 - A4AB49CB62EB99071274FD6937EE5352 - - buildRules - - dependencies - - B55362A439917186B971EF580B391A1B - 2D5EE41C6DDBA8F159EEA954F335387A - 1B030B50B68FB0D602F2E4B1685FA9BA - 6D8154E68B3360EE1C8DA3A4443096F3 - + fileRef + 76674E127E6C44FC07C408ADE81BEE3A isa - PBXNativeTarget + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 85FBF71A5AAE7086230A62148B3BA6DE + + explicitFileType + archive.ar + includeInIndex + 0 + isa + PBXFileReference name - Pods-MWPhotoBrowser_Example - productName - Pods-MWPhotoBrowser_Example - productReference - 4D720BB8AE19E427E58843509B28FEB6 - productType - com.apple.product-type.library.static + libPods-MWPhotoBrowser_Tests.a + path + libPods-MWPhotoBrowser_Tests.a + sourceTree + BUILT_PRODUCTS_DIR - A22495C61077EFF6CD10B8B82AFA964B + 86AC811023033375386F83EE83613D20 children - E348B132ABCC246013AE3A5532BC609F - 63327617AD4F38D1236E71968B0991E5 - D54993E311EDD8802711B01895286E4E - A1BF1E794449AF3F514B2EE3C85F4B10 - 8E108520195BF6568A4A53786EA7B6F0 - 0043FDF25F85C0B2C11CEAE6B1C54D87 - B0329B325C97BC663835390843F985CE - B0DFED38A647950C79B13061F923258C - 3B5A7151F8E4FBFE54BF6C2AC80958FA - DD5F3D6C4044A157839220B037A055E8 - 148F0DEDC306B5A6D48931EFD279E456 + 33D70A98285D51C294091A2EE3D7D87D + 37CF1AAA9EAFCF14857EEE4E5E41F784 + B479AD007E48937468A91B303A5BCE3C + A26B18A9DEC61DE5D947A2E5B3F9C7EC + 33B12011260397D31635C1A0376728CA + D2C2135CD610A259AFF15AA0AA282DA9 isa PBXGroup name - FBSnapshotTestCase + Support Files path - FBSnapshotTestCase + ../Target Support Files/DACircularProgress-iOS7.0 sourceTree <group> - A2406F04BC69905BAB01C77F8073B55D - - fileRef - 3EF2F2E1AF840BA0B6AD13D59AA5F80C - isa - PBXBuildFile - - A245A84584833A620D85A9C8285C71A1 - - fileRef - 0043FDF25F85C0B2C11CEAE6B1C54D87 - isa - PBXBuildFile - - A26F992E8831118311F3DB7CB830595A + 872948DAF79618AD725E0BF364E5DDD4 fileRef - FFC94BC21DE6B02A85C4BA9B703D222D + 76F49F5ECFFC7C15904E6C672C8D1C69 isa PBXBuildFile settings @@ -5740,7 +6429,7 @@ -fno-objc-arc - A2B692D3F450E25A5D8B17F524EA0720 + 886B28457E1880775AB779BF4053231E includeInIndex 1 @@ -5749,26 +6438,20 @@ lastKnownFileType sourcecode.c.objc name - UIImageView+WebCache.m + EXPUnsupportedObject.m path - SDWebImage/UIImageView+WebCache.m + Expecta/EXPUnsupportedObject.m sourceTree <group> - A4AB49CB62EB99071274FD6937EE5352 + 891D64C7326ADD0C96E89F521BB09FC7 - buildActionMask - 2147483647 - files - - 0364DCB58A865A2830638D2C0CCED41C - + fileRef + 20F27C938C5B92508B8FDCD6BC472B17 isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXBuildFile - A59CA631962D8BFBF1D8BA4BA8F1F223 + 89A3B15DB6754B0B14CE047CBF54D8EA includeInIndex 1 @@ -5777,144 +6460,54 @@ lastKnownFileType sourcecode.c.objc name - SDWebImageDownloader.m + EXPMatchers+beInstanceOf.m path - SDWebImage/SDWebImageDownloader.m + Expecta/Matchers/EXPMatchers+beInstanceOf.m sourceTree <group> - A65C491577A425AF82C53F4A40A0A24B - - fileRef - 1AB26E75F7BCD415D6AD6B8BA5F03DDB - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - - - A6854D311D55E2BBD8BFCE4E82DF3EA9 - - fileRef - BA9D20AF1E1E4CF225AA2D772049336D - isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - - - A6993E0B001E6EB572176DFCF9B87C6A - - buildActionMask - 2147483647 - files - - 5F4AECEF356E35995112F9167B219AD6 - 82AC9861A9FE0BEFEC04D31C3B05ABB2 - EF9006327AFFDBED3FD589DA04E2D36A - - isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - A6A21F67B2A713138BF1A404E3460084 + 8B013ED88B85B2F00736DDC3EF06ECCD includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h + name + NSImage+WebCache.h path - Expecta-dummy.m + SDWebImage/NSImage+WebCache.h sourceTree <group> - A6FD2A9ACF0632CB41BE9AF1A13BD166 + 8B1F7ACF7E60F6BECBD2E3D5AADEADD2 - containerPortal - D41D8CD98F00B204E9800998ECF8427E - isa - PBXContainerItemProxy - proxyType + includeInIndex 1 - remoteGlobalIDString - 2F501FE84845EAD97B9087DAFCBBEE0E - remoteInfo - Expecta - - A7141BC83638F4B38D4D312BAE3BDAC4 - - fileRef - 1BB15402D8C2FB01A198273BA1991DED - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - - - A815E988348FB8A8B609F012516ABD15 - - isa - PBXTargetDependency - name - MWPhotoBrowser - target - E2FE87384A67337831E53490EEA8BF11 - targetProxy - 97B5429A3CE99BA07086198F10CCE615 - - A8490A46CB5206BCA5F90FCFBA2D731E - - fileRef - 79996E262256F57DB50CD16E5EBE5D52 isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - + PBXFileReference + path + PlayButtonOverlayLarge.png + sourceTree + <group> - A8B86384F8C46CE8544B59FEB6C657F5 + 8B39D58452BAB8033EB28FB4491D1CFE includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h + name + SDImageCacheConfig.h path - MWGridViewController.m + SDWebImage/SDImageCacheConfig.h sourceTree <group> - AA7B402D31D86AE5E3DD083408311FF1 - - fileRef - E4AD00C4B132C99837C22CC9031DE9F8 - isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - - - AABA7597E19FD75C9F320BCD6BB2759E + 8B42246CA0E8E327E5856E4FD283D80A includeInIndex 1 @@ -5922,68 +6515,35 @@ PBXFileReference lastKnownFileType sourcecode.c.objc + name + EXPDoubleTuple.m path - MWPhotoBrowser.m + Expecta/EXPDoubleTuple.m sourceTree <group> - AAE75938ED3DD46BC00352B82D7CA890 - - fileRef - B2CBEFFA54424B8FBBE1EB23EC879E69 - isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - - - AAF71AC633AFEC1D271F81DA183E75F0 - - fileRef - 9A086D9BE521AADC7C972AE3D9CD5B48 - isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - - - AB0885F8524D9BE85FDEA8BF30520D43 - - fileRef - BDD78DD77E210708F222D40A2FDE75B1 - isa - PBXBuildFile - - AB1D6408D48F6ECF3FCE553BE73961F5 + 8B52DAC8A645C24AA93F2FB02B019D9E - fileRef - 2E7CBF297AA8A0E93C23BFAF1BE94DEE + buildConfigurations + + 6CA1FE1875229DC94EDE6B858B8EF063 + 384C3D4208EC433B53E04D35F03D13D2 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - + XCConfigurationList - AB5E9DFDA102BB04CB66FC61E01085B0 + 8B97E5CA574F06B315C5F1D27B25DEFB fileRef - DD5F3D6C4044A157839220B037A055E8 + F608E555A3767B056A969C7BD7CC4592 isa PBXBuildFile - AB8960E6933BD274C11AD9C15CF410AF + 8BB83A8417700D3227B3CC075CC64D16 includeInIndex 1 @@ -5992,24 +6552,28 @@ lastKnownFileType sourcecode.c.h name - EXPMatchers+haveCountOf.h + SDWebImageDownloader.h path - Expecta/Matchers/EXPMatchers+haveCountOf.h + SDWebImage/SDWebImageDownloader.h sourceTree <group> - ABDF044BC66387B0E03E70BAC09D0AC8 + 8BD8C33E9B79FED19CBE99B8D300B700 includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + EXPMatchers+conformTo.m path - ImageError@2x.png + Expecta/Matchers/EXPMatchers+conformTo.m sourceTree <group> - AD198F3513AFD6128A50C356DC253545 + 8C52E011985A70FC6CFD3A6D3CB01B44 includeInIndex 1 @@ -6017,24 +6581,14 @@ PBXFileReference lastKnownFileType sourcecode.c.objc + name + UIImage+Compare.m path - Specta-dummy.m + FBSnapshotTestCase/Categories/UIImage+Compare.m sourceTree <group> - AD6791D14732A3C17164F61CC72FFB0D - - fileRef - AE917511985F6891AF3F8233B9D34001 - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - - - ADEAC9FE1270035973745D0EB3B84395 + 8C8210CE2F6C12DB3A632074C9ECA496 explicitFileType archive.ar @@ -6043,28 +6597,30 @@ isa PBXFileReference name - libExpecta.a + libMWPhotoBrowser-iOS7.1.a path - libExpecta.a + libMWPhotoBrowser-iOS7.1.a sourceTree BUILT_PRODUCTS_DIR - AE1B7431EAFB4D89A49A9DAD35DBE790 + 8C9E7654F18C2626BC0DC07736B79260 - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.h + children + + 3C9B34A700598539C6D795D22394E974 + 790215B6642C5AC0AB66ACFBA94DA16C + 627015875C052ED72DEC59627524D692 + + isa + PBXGroup name - UIImageView+WebCache.h + Expecta+Snapshots path - SDWebImage/UIImageView+WebCache.h + Expecta+Snapshots sourceTree <group> - AE6C39B87AE391EC710DA8FB520ED3F5 + 8CB41C68CFC5F23CAB80F2E013292F1C includeInIndex 1 @@ -6072,12 +6628,14 @@ PBXFileReference lastKnownFileType sourcecode.c.h + name + EXPUnsupportedObject.h path - MWZoomingScrollView.h + Expecta/EXPUnsupportedObject.h sourceTree <group> - AE917511985F6891AF3F8233B9D34001 + 8CF584384414E0B977D3126B8D442EDE includeInIndex 1 @@ -6086,26 +6644,153 @@ lastKnownFileType sourcecode.c.objc name - EXPMatchers+beGreaterThanOrEqualTo.m + EXPMatchers+beInTheRangeOf.m path - Expecta/Matchers/EXPMatchers+beGreaterThanOrEqualTo.m + Expecta/Matchers/EXPMatchers+beInTheRangeOf.m sourceTree <group> - AF944A6486FDAD944BE766A70129E6D2 + 8D2912AC18FCC5FAA8BEC3E17BFDCB63 + + buildActionMask + 2147483647 + files + + 42B8181497AE43CC9D9819F0994C7AAE + 6BE7BAF98082D12EF6F1D39218744065 + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 8DE59E4E7639008BFE525B8C5299A53F + + isa + PBXTargetDependency + name + SDWebImage-iOS7.0 + target + CF95A047032EA05133C18EC3592E0E61 + targetProxy + 47D0A84C3BB8AAE884FC131812CB318B + + 8DF90D623F7F9015EEE9F1D7FEE7E053 + + fileRef + D74AF1EB77F87EA3EFAD95BBD0CA0175 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 8E6E4E5E1771D7908C7C75660E7B5C90 + + buildConfigurationList + 2A0ADAE77C4A9140BB1B3BE5CB54731E + buildPhases + + 17D4B31093091A9E1D842BD1272E6248 + F09ED047C3C56D9426E717AFFAA6AFAC + CB56D6D6CB477BE1D91309BAF7507031 + + buildRules + + dependencies + + isa + PBXNativeTarget + name + MWPhotoBrowser-iOS7.1-MWPhotoBrowser + productName + MWPhotoBrowser-iOS7.1-MWPhotoBrowser + productReference + 6B909FB1F98C3B3E3A8E20832F2958EB + productType + com.apple.product-type.bundle + + 8EF4ABD9FB7C54F14F4C71AE05A33221 + + fileRef + B89A61B544CE3A653B8129ECFD996694 + isa + PBXBuildFile + + 8F674582EE71972EE60EFD96C1F173D5 + + fileRef + 23B16555B9F61B5736971092E8DB5E8A + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 8F849B417EF1B8544158852484D3AE47 + + fileRef + 4519383492FC8F8EFD23370DBF52C8E6 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 8FD3362F6F7AB64BD2C304FFE786A71B includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h path - DACircularProgress-dummy.m + Expecta-prefix.pch sourceTree <group> - B0329B325C97BC663835390843F985CE + 9019F9233E2A8B04A82C1B8D0274F09F + + fileRef + AEA10FDC6D2A4E0B8BB9E525D5007847 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 902595307066C7E1A9835216B78A960B + + fileRef + DCEDF4A10BC8670D9EB6AE8BD88F362E + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + 90633AED0F522AA974E785E46D4EB31E includeInIndex 1 @@ -6114,13 +6799,80 @@ lastKnownFileType sourcecode.c.h name - UIImage+Compare.h + EXPMatchers+beInstanceOf.h path - FBSnapshotTestCase/UIImage+Compare.h + Expecta/Matchers/EXPMatchers+beInstanceOf.h sourceTree <group> - B0D25391E290ADE1BF90E18B8281F5F3 + 90C6FED156961291CACC9830CF6C8CBE + + baseConfigurationReference + B2829E9E2867D8CA2C13B4DCBF27D906 + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/Expecta+Snapshots/Expecta+Snapshots-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Release + + 91173621F56FF3D429760F9525A8298F + + fileRef + A11F90DBB6D013BBD02E7F2884FAB882 + isa + PBXBuildFile + + 915B79E75C24E019880432867604DC51 + + fileRef + 9341F63412149D22C6290B281497FFFE + isa + PBXBuildFile + + 92098837F472645C91B5977DE4A6E7B8 + + buildActionMask + 2147483647 + files + + B82D0FB2D8196CD513FBFDB814221187 + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 92A43DEB8B9BB0F7DF03C77AA68FF48C includeInIndex 1 @@ -6129,41 +6881,39 @@ lastKnownFileType sourcecode.c.objc name - EXPMatchers+beFalsy.m + EXPMatchers+beginWith.m path - Expecta/Matchers/EXPMatchers+beFalsy.m + Expecta/Matchers/EXPMatchers+beginWith.m sourceTree <group> - B0DFED38A647950C79B13061F923258C + 92A79913B3F0E14239D2F359D76C98C6 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h name - UIImage+Compare.m + EXPMatchers+raise.h path - FBSnapshotTestCase/UIImage+Compare.m + Expecta/Matchers/EXPMatchers+raise.h sourceTree <group> - B1A8AF86363A5D8093FFE48748DC20A1 + 9341F63412149D22C6290B281497FFFE includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.objc path - SDWebImage-dummy.m + ImageSelectedOn@3x.png sourceTree <group> - B23D9E49B5B3A5C76EAFFC9C7F40B4B9 + 935221587417794B86698D8F70F1FEFC includeInIndex 1 @@ -6172,16 +6922,16 @@ lastKnownFileType sourcecode.c.objc name - EXPUnsupportedObject.m + FBSnapshotTestCasePlatform.m path - Expecta/EXPUnsupportedObject.m + FBSnapshotTestCase/FBSnapshotTestCasePlatform.m sourceTree <group> - B25B4A401CE0322E5FA936642D8E8A36 + 9358B6FBFE48AC831B1ADA898465E13D fileRef - 7D8198AD59277CB0379442369CF5247E + 83A90451ECC713EF420E5C4BE319062F isa PBXBuildFile settings @@ -6192,37 +6942,73 @@ - B28719F6B1978267C407032A2AE646F8 + 9374BBB3BA16684D1B858CCC9C3E2D8A - fileRef - FE9D7A964178EF6E3CE5FC52134DF825 + includeInIndex + 1 isa - PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - + PBXFileReference + lastKnownFileType + text.plist.xml + path + Pods-MWPhotoBrowser_Example-acknowledgements.plist + sourceTree + <group> - B2CBEFFA54424B8FBBE1EB23EC879E69 + 93A4A3777CF96A4AAC1D13BA6DCCEA73 + explicitFileType + text.script.ruby includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + text name - EXPMatchers+raise.h + Podfile path - Expecta/Matchers/EXPMatchers+raise.h + ../Podfile + sourceTree + SOURCE_ROOT + xcLanguageSpecificationIdentifier + xcode.lang.ruby + + 93CEE4DD787EF512C9D9AA34A4223E43 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.xcconfig + path + FBSnapshotTestCase.xcconfig + sourceTree + <group> + + 948F2C926B1B0A6A0D26356FADC771B3 + + fileRef + 33B12011260397D31635C1A0376728CA + isa + PBXBuildFile + + 94B3E7FD543C524CF33D079199EE7059 + + includeInIndex + 1 + isa + PBXFileReference + path + ImageSelectedSmallOn@2x.png sourceTree <group> - B2DE78D2D5A5CF173FEBFA2FE4B4023D + 956FB3AB698AF3DA776A9F24AA79C229 fileRef - 2F29BE2EDEBA2861368726A4772F4E8E + CFB1B748E162C2F99D05217A5EF5F86B isa PBXBuildFile settings @@ -6233,95 +7019,24 @@ - B33234F432A72D5E8B65694AE937B78F + 95E9656A1A043C275A8228A3C15FD4C3 fileRef - 56BD615DEEA3BC153C0B73BAC8A60A13 + 5B14A0946BD6069275E1664D74DB5DB2 isa PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - - B37F0F91F85060E28F1DAAB522DC7EC1 + 963EFD8F75884499D131C8272CB8E9CD - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - YES - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES - CLANG_WARN_UNREACHABLE_CODE - YES - CLANG_WARN__DUPLICATE_METHOD_MATCH - YES - COPY_PHASE_STRIP - NO - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - ONLY_ACTIVE_ARCH - YES - STRIP_INSTALLED_PRODUCT - NO - SYMROOT - ${SRCROOT}/../build - + fileRef + 7DCE26CDEA2D82CE819E19E79AB6B6BB isa - XCBuildConfiguration - name - Debug + PBXBuildFile - B52658FC373BA42C6DBF475CAEA30F09 + 969D0B6145F6B27D67DD49DB3C2787E7 fileRef - 9D6702575943BF5C71AD0E2299CB53E2 + 96BF4E40C956C72483820718D54070E1 isa PBXBuildFile settings @@ -6332,18 +7047,27 @@ - B55362A439917186B971EF580B391A1B + 96BF4E40C956C72483820718D54070E1 + includeInIndex + 1 isa - PBXTargetDependency - name - DACircularProgress - target - 9775596B3CA16905FC8F66DA8E2A3C67 - targetProxy - 9F080C1D1A758D0A874B7345BE67EC81 + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + MWGridViewController.h + sourceTree + <group> + + 96C5019CFD858211738E4F0829E2CE0B + + fileRef + 5A9EBFC7ACFA8F737D2F87F775CA091A + isa + PBXBuildFile - B5969E17FAFFDC548233DC602AAC6211 + 96F7D0A9619B5ECF1BA3085F301640CB includeInIndex 1 @@ -6352,16 +7076,16 @@ lastKnownFileType sourcecode.c.h name - EXPMatchers+beGreaterThanOrEqualTo.h + SpectaTypes.h path - Expecta/Matchers/EXPMatchers+beGreaterThanOrEqualTo.h + Specta/Specta/SpectaTypes.h sourceTree <group> - B6B32565B1C26404789EEFCF37B7C225 + 97E91EC237B8623D895DBF6092034AD7 fileRef - 3540CB186FE2EE9EE99381DA600738B8 + C80EBD28D6E96BE37A6CB4AFCE903DFB isa PBXBuildFile settings @@ -6372,114 +7096,141 @@ - B6CB1D947CABAFFCEFC7F94006CB7AD4 - - fileRef - DF11024BF511A0D2225D4BA84770CED7 - isa - PBXBuildFile - - B6CE0371E70FB931CC99A90CEBFD6E83 + 97FB237BF48E4FDD7DCE3CE2DC3599CF - containerPortal - D41D8CD98F00B204E9800998ECF8427E - isa - PBXContainerItemProxy - proxyType + includeInIndex 1 - remoteGlobalIDString - E2FE87384A67337831E53490EEA8BF11 - remoteInfo - MWPhotoBrowser - - B733330A3935B54DE57E0503C1867DAE - - fileRef - AD198F3513AFD6128A50C356DC253545 - isa - PBXBuildFile - - B73F44C64FD91479CFE63C882F1E5E70 - - children - - CB09954F9727813F76DD0EC906DB781E - B1A8AF86363A5D8093FFE48748DC20A1 - DD16771750E90A2599B84EDB4AFF9B9E - isa - PBXGroup + PBXFileReference + lastKnownFileType + sourcecode.c.h name - Support Files + EXPMatcher.h path - ../Target Support Files/SDWebImage + Expecta/EXPMatcher.h sourceTree <group> - B74838FB9BEB33B6489F58D787E2A6A4 + 981359C0C4FDAA8DE10D8F08316068D1 baseConfigurationReference - 2055A9E17F10DAA3DD7884DDF96A0A50 + D5EE5F7C5A846B01ACF225DE04E52196 buildSettings + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf ENABLE_STRICT_OBJC_MSGSEND YES + GCC_NO_COMMON_BLOCKS + YES + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MACH_O_TYPE + staticlib + MTL_ENABLE_DEBUG_INFO + YES + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PODS_ROOT + $(SRCROOT) + PRODUCT_BUNDLE_IDENTIFIER + org.cocoapods.${PRODUCT_NAME:rfc1034identifier} PRODUCT_NAME - MWPhotoBrowser + $(TARGET_NAME) SDKROOT iphoneos SKIP_INSTALL YES - WRAPPER_EXTENSION - bundle isa XCBuildConfiguration name - Release + Debug - B83D4C05E77991780CA69BF68B431DD2 + 984644DEF463594AE83296244818496C + + fileRef + 60B0663708B59D71E4CDF1092C6CFFFF + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -DOS_OBJECT_USE_OBJC=0 + + + 9855AADC7705ACDC184A5F52282C13DF + + isa + PBXTargetDependency + name + FBSnapshotTestCase + target + 7D9E32DAA93E15CFCF77A5BCD2D4BAA2 + targetProxy + 50B88480D5DE2206829A58640A90CFDD + + 997499B0DCD119F5D08A21E6633D2570 includeInIndex 1 isa PBXFileReference lastKnownFileType - text.xcconfig + sourcecode.c.objc + name + EXPMatchers+beIdenticalTo.m path - Pods-MWPhotoBrowser_Example.release.xcconfig + Expecta/Matchers/EXPMatchers+beIdenticalTo.m sourceTree <group> - B8FC063009C06CE659C8CF168A9F8765 + 9A4D133FC708F3C6BAA516A2AC868303 - fileRef - 0B7E61991D03B44046913BF3B345F4DB + buildActionMask + 2147483647 + files + + 2EE44928B334B5F8EC6CA9631E400276 + 9C72EB3E553D9B5F2F5D1318EC8F1443 + isa - PBXBuildFile + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 - B9051EB6C3E749E2F0538ABF5076D0BE + 9A7BA163AB90635240537961C1762094 - fileRef - 60E1461AAED23D358B1A25A48F9DD77F + buildActionMask + 2147483647 + files + + 5991417F2CDE7DF75FE7980271940C04 + 7C7F3A86F0DFF6A318EBE147A9BD78DB + isa - PBXBuildFile + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 - B98B98DB394C072483E8066C6B594401 + 9AF3FD4A822DCF644AB50D3967C43C14 buildActionMask 2147483647 files - 589CDFB90C98BF58F34B688A2BEF2D04 - 1181CB6FC2D63C42F19EAB56C604A71E + B6B32565B1C26404789EEFCF37B7C225 isa - PBXFrameworksBuildPhase + PBXHeadersBuildPhase runOnlyForDeploymentPostprocessing 0 - BA4C6CCE8BCEAFA07BB2679C87A008C5 + 9B484F370BBC1CC43B41A7E80F335BB3 includeInIndex 1 @@ -6487,85 +7238,1945 @@ PBXFileReference lastKnownFileType sourcecode.c.h + name + SDWebImageManager.h path - MWPhotoBrowser-prefix.pch + SDWebImage/SDWebImageManager.h sourceTree <group> - BA6428E9F66FD5A23C0A2E06ED26CD2F + 9B546D0F895D9B5A8316B948CEE95C77 - includeInIndex - 1 + fileRef + E7DEC901EF91A68AB312BBC09893E869 isa - PBXFileReference - lastKnownFileType - text - name - Podfile - path - ../Podfile - sourceTree - SOURCE_ROOT - xcLanguageSpecificationIdentifier - xcode.lang.ruby + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - BA9181C8B2773795F2EACBDE286994AD + 9BB407999D6B6BD83238F9DEBE8DBD99 - includeInIndex - 1 + baseConfigurationReference + 6F1FCA0BD48258CDEC1B14D704BA3E5D + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + IPHONEOS_DEPLOYMENT_TARGET + 7.1 + MACH_O_TYPE + staticlib + MTL_ENABLE_DEBUG_INFO + YES + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PODS_ROOT + $(SRCROOT) + PRODUCT_BUNDLE_IDENTIFIER + org.cocoapods.${PRODUCT_NAME:rfc1034identifier} + PRODUCT_NAME + $(TARGET_NAME) + SDKROOT + iphoneos + SKIP_INSTALL + YES + isa - PBXFileReference - path - ImageError@3x.png - sourceTree + XCBuildConfiguration + name + Debug + + 9C09975417C60E793DBDE7DC2FCA193B + + children + + 337F4B9E59424051D13CDC4754F7CEF8 + + isa + PBXGroup + name + Resources + sourceTree + <group> + + 9C55C23A53F272D0FB6EDE9328C1F604 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + SPTGlobalBeforeAfterEach.h + path + Specta/Specta/SPTGlobalBeforeAfterEach.h + sourceTree + <group> + + 9C5ABA78C36206783E47FCA588FBF52E + + isa + PBXTargetDependency + name + SDWebImage-iOS7.0 + target + CF95A047032EA05133C18EC3592E0E61 + targetProxy + CD44B1CCAB38CB70B16B67A5627DE4FC + + 9C6673C70ED9568377314C875F133968 + + buildConfigurationList + 2EEA8C466B398BFCF2EE6424A1983343 + buildPhases + + 6CF0E8B8095182BCA55C62DB155D35E7 + 92098837F472645C91B5977DE4A6E7B8 + + buildRules + + dependencies + + ED8EFFFDC60B478C026582DFA8C38F87 + 809A6B1ED861D96D46D8D181C548D1E1 + 745A5762E099FEF6C27826D21170FA23 + 9855AADC7705ACDC184A5F52282C13DF + FC80BCD11371A5C912F3A6FAF8848F75 + DDF03D7BD04CF95B46036D01E9AB143D + E096805675BD49813DAEE20AA167E301 + 0D7A9405228F57E10ABD5BB3B15DB0AD + + isa + PBXNativeTarget + name + Pods-MWPhotoBrowser_Tests + productName + Pods-MWPhotoBrowser_Tests + productReference + 85FBF71A5AAE7086230A62148B3BA6DE + productType + com.apple.product-type.library.static + + 9C72EB3E553D9B5F2F5D1318EC8F1443 + + fileRef + C985ABCEABAC37D230D1BFFF9612BDDD + isa + PBXBuildFile + + 9C95EBE1D39EEFE5E6404691C95BE2E2 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.script.sh + path + Pods-MWPhotoBrowser_Tests-resources.sh + sourceTree + <group> + + 9CEA5FB9EBD0603D18F008C690BE52A5 + + fileRef + FAB2C715AB1CECBF81C21D4FA9071B49 + isa + PBXBuildFile + + 9DA80338167838394C6B5A9B6130E9DC + + fileRef + A0406B5CB3271476E514FB2CA3BBE643 + isa + PBXBuildFile + + 9DB2D733B4CBE2C4A5063A8B43775A8F + + fileRef + F35EEBFF3C4E87401FB26B516676CFCF + isa + PBXBuildFile + + 9E750F640E488EFF0B9C4FD78109AE97 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + MWPhotoBrowserPrivate.h + sourceTree + <group> + + 9F19BCDE9BF6E330E14588598DFC6337 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.plist.xml + path + Pods-MWPhotoBrowser_Tests-acknowledgements.plist + sourceTree + <group> + + 9F8A2194BCD664F1FCED22D783240731 + + buildActionMask + 2147483647 + files + + 112A982649644C3655E800BE47FB127F + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 9F94634D61584613303A1CE9E3598593 + + buildConfigurationList + F940708FEFF0BA2DBB60666C0F6A86F8 + buildPhases + + 1DD226F91120BB620D12A0F8FE7CF336 + 8D2912AC18FCC5FAA8BEC3E17BFDCB63 + 31E5E71216BB01F62D2E0BD4879DEC99 + + buildRules + + dependencies + + isa + PBXNativeTarget + name + Specta + productName + Specta + productReference + B860A545FCE5CA24A3111308F41FF190 + productType + com.apple.product-type.library.static + + 9FE560DD0BFBD00C19CCFDF08ACC2E3C + + fileRef + 3F184CBBBB01F076EBB11C58EBF9881D + isa + PBXBuildFile + + 9FFB834C7D81B108B6971316DBA62C0A + + fileRef + C3592D9FBA355E61B209E54E31408EB8 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + A0406B5CB3271476E514FB2CA3BBE643 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + MBProgressHUD.m + sourceTree + <group> + + A11F90DBB6D013BBD02E7F2884FAB882 + + includeInIndex + 1 + isa + PBXFileReference + path + ImageSelectedSmallOn.png + sourceTree + <group> + + A152728B5B8AAAE6D30ED4F6FE05C800 + + isa + PBXTargetDependency + name + DACircularProgress-iOS7.0 + target + 501BE33907DBD9E3BB1712FC47BF8093 + targetProxy + 3B2EFE0DAEBBA8D572C58DFF8FB5932F + + A254E54DD33D0D4AC13B46F55F4A4C5F + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + EXPMatchers+beLessThanOrEqualTo.h + path + Expecta/Matchers/EXPMatchers+beLessThanOrEqualTo.h + sourceTree + <group> + + A26B18A9DEC61DE5D947A2E5B3F9C7EC + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.xcconfig + name + DACircularProgress-iOS7.1.xcconfig + path + ../DACircularProgress-iOS7.1/DACircularProgress-iOS7.1.xcconfig + sourceTree + <group> + + A26F992E8831118311F3DB7CB830595A + + fileRef + AB64ADBC48A8B7906340AD319D9456E7 + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + + + A3BCFF3925A1292E840FD688DA48694B + + fileRef + F1FF622A2D916131FCDBC6882723CC7E + isa + PBXBuildFile + + A4444ACC6162DA753E962E776A9F4C58 + + containerPortal + D41D8CD98F00B204E9800998ECF8427E + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 501BE33907DBD9E3BB1712FC47BF8093 + remoteInfo + DACircularProgress-iOS7.0 + + A45C372FE12A3F0F4CB6B42725A6D7B7 + + children + + 4E25DDC72AD89138E96E86F9975F114C + A91A8D3B33CEE35989031DC6BCCCE253 + 83A90451ECC713EF420E5C4BE319062F + 935221587417794B86698D8F70F1FEFC + 55AA4895962778A7C30663332494B7EA + 025164A0DC53EC68213DD099D6CE537B + 3CE685279BE471748A25FA5F516B3203 + 8C52E011985A70FC6CFD3A6D3CB01B44 + E49C2F72B5162553DB6026138E857EAF + 61513A7F27881CD54D3F66804478AF03 + 6280459658EF922D585FDFFF8685D623 + BB920EC5877ECE3C5E5ADEFA16287551 + 2A8501153EBA897AE0E362FF29660F53 + + isa + PBXGroup + name + FBSnapshotTestCase + path + FBSnapshotTestCase + sourceTree + <group> + + A497B424CF85B5330F0C28E38CC5EB8E + + containerPortal + D41D8CD98F00B204E9800998ECF8427E + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 312F48D37605F7A2FAFBF1F2AD9B19A7 + remoteInfo + MBProgressHUD-iOS7.1 + + A4D6ACFFCBD0300EA53FAC9B772590B4 + + buildActionMask + 2147483647 + files + + isa + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + A5E71ED3FBE003C14B34A5A880BBFD69 + + fileRef + A6B81301393464F04727B242313DF8FB + isa + PBXBuildFile + + A60573356E8C2F7D6528A15E3193B63B + + baseConfigurationReference + 4DA5A362F6C7352C50C0676E95C0E4F5 + buildSettings + + CONFIGURATION_BUILD_DIR + $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/MWPhotoBrowser-iOS7.0 + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + INFOPLIST_FILE + Target Support Files/MWPhotoBrowser-iOS7.0/ResourceBundle-MWPhotoBrowser-Info.plist + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + PRODUCT_NAME + MWPhotoBrowser + SDKROOT + iphoneos + SKIP_INSTALL + YES + TARGETED_DEVICE_FAMILY + 1,2 + WRAPPER_EXTENSION + bundle + + isa + XCBuildConfiguration + name + Release + + A6120AD28ED935A66544A3470214B583 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + Specta-dummy.m + sourceTree + <group> + + A61A4213784EB2F56D3705CCE82C9197 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + SDWebImagePrefetcher.m + path + SDWebImage/SDWebImagePrefetcher.m + sourceTree + <group> + + A65C491577A425AF82C53F4A40A0A24B + + fileRef + 997499B0DCD119F5D08A21E6633D2570 + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + + + A6854D311D55E2BBD8BFCE4E82DF3EA9 + + fileRef + 6E1B606A74EFBFF5C21282DD1F9380F3 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + A6B81301393464F04727B242313DF8FB + + includeInIndex + 1 + isa + PBXFileReference + path + PlayButtonOverlayLargeTap@3x.png + sourceTree + <group> + + A7141BC83638F4B38D4D312BAE3BDAC4 + + fileRef + 92A43DEB8B9BB0F7DF03C77AA68FF48C + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + + + A7429C31A809059961281DF33002429A + + includeInIndex + 1 + isa + PBXFileReference + path + ImageSelectedOff@2x.png + sourceTree + <group> + + A75A6873917B3864E7605B02E33FCD54 + + fileRef + 30D028565C3AC56669794F4FB8CE5930 + isa + PBXBuildFile + + A7DFC7C3BB5B560F42777B8925C37C9E + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + SDWebImageDownloaderOperation.m + path + SDWebImage/SDWebImageDownloaderOperation.m + sourceTree + <group> + + A7E57367BF9E9E6138B7DF3D6104EC12 + + fileRef + 025164A0DC53EC68213DD099D6CE537B + isa + PBXBuildFile + + A8490A46CB5206BCA5F90FCFBA2D731E + + fileRef + 37F531C126B1896AC3926507C089C886 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + A887838E36A6878A04D5CBF1614556DC + + fileRef + BB1C325F8941A0EF3493E5F3A2D46B5C + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + A8ECC4BDDE853EA9FAC2B5429FDEA079 + + fileRef + C3592D9FBA355E61B209E54E31408EB8 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + A91A8D3B33CEE35989031DC6BCCCE253 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + FBSnapshotTestCase.m + path + FBSnapshotTestCase/FBSnapshotTestCase.m + sourceTree + <group> + + A9C4E0B85A58F2703F7BCE420A84049D + + fileRef + 061D9DA8C4A4B42AD2BEBF9CCD7791B5 + isa + PBXBuildFile + + AA15102B006F97F7D2C88A4D2B871A14 + + isa + PBXFileReference + lastKnownFileType + wrapper.framework + name + AssetsLibrary.framework + path + Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/AssetsLibrary.framework + sourceTree + DEVELOPER_DIR + + AA3068F1DAC032F7293CBD24BC0C2F67 + + fileRef + A7DFC7C3BB5B560F42777B8925C37C9E + isa + PBXBuildFile + + AA7B402D31D86AE5E3DD083408311FF1 + + fileRef + C3AA1A1E963A98DB586351E0D793DF08 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + AAA258AF2C8AE316A7B3F85E61C8A634 + + buildConfigurations + + B77E164A99361A2BF1067A841D2D0EF5 + 5A246E413E90E31DF083711D5AB9403F + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + AAE75938ED3DD46BC00352B82D7CA890 + + fileRef + 92A79913B3F0E14239D2F359D76C98C6 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + AAFF98A958040F7B4596D10D64AB9DDC + + fileRef + 00E0E94A414ACEA941F4E3F7524D96D0 + isa + PBXBuildFile + + AB1D6408D48F6ECF3FCE553BE73961F5 + + fileRef + 7F397A8A598DD08C158F22A5A1DAC0A9 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + AB4A14FBF6564994C867FD4C8D70DD72 + + fileRef + BDBA1D97314684EAE41BEDC18CE34FCD + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + AB64ADBC48A8B7906340AD319D9456E7 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + EXPMatchers+raiseWithReason.m + path + Expecta/Matchers/EXPMatchers+raiseWithReason.m + sourceTree + <group> + + AB6C7C76143F94D79F87E59C3F58356C + + includeInIndex + 1 + isa + PBXFileReference + path + UIBarButtonItemArrowRight.png + sourceTree + <group> + + AC73D8815894F832B4005168AA85F69B + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.xcconfig + path + SDWebImage-iOS7.0.xcconfig + sourceTree + <group> + + AD1C4B42AF7ED095C1FA51C0D2ED004D + + fileRef + 65593CABDB787470A27F80FD0E40D891 + isa + PBXBuildFile + + AD6791D14732A3C17164F61CC72FFB0D + + fileRef + D57B246EE3741FF87B5BC22155CF1766 + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + + + AEA10FDC6D2A4E0B8BB9E525D5007847 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + EXPMatchers+beSupersetOf.h + path + Expecta/Matchers/EXPMatchers+beSupersetOf.h + sourceTree + <group> + + AED09A7995E2DF274F5807590CB472A2 + + baseConfigurationReference + 4DA5A362F6C7352C50C0676E95C0E4F5 + buildSettings + + CONFIGURATION_BUILD_DIR + $(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/MWPhotoBrowser-iOS7.0 + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + INFOPLIST_FILE + Target Support Files/MWPhotoBrowser-iOS7.0/ResourceBundle-MWPhotoBrowser-Info.plist + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + PRODUCT_NAME + MWPhotoBrowser + SDKROOT + iphoneos + SKIP_INSTALL + YES + TARGETED_DEVICE_FAMILY + 1,2 + WRAPPER_EXTENSION + bundle + + isa + XCBuildConfiguration + name + Debug + + B0AD4D3FD51000868948132517923991 + + isa + PBXFileReference + lastKnownFileType + wrapper.framework + name + QuartzCore.framework + path + Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/QuartzCore.framework + sourceTree + DEVELOPER_DIR + + B0DB1FDEDE0BC5595E71DF4E55869B94 + + buildConfigurations + + F4BE7E01BFFF5FB804D67D6D00AA98E6 + FD44049114F7EC3365B9C6D694EA162A + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + B11EA19690952E09D09DAFCAA14B2EC9 + + buildConfigurations + + 2E6A3131316E7955976CB826F8A7F7F5 + 13318CA706AE68D08ED93A462A8E2B71 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + B233CDDE7B017138252D3D50F4476E02 + + fileRef + AB6C7C76143F94D79F87E59C3F58356C + isa + PBXBuildFile + + B23DC086942C02E497A40BE80166F4BA + + fileRef + C57858A8BF437152366E40CD2BF2F977 + isa + PBXBuildFile + + B252E4D519B7D279286493227F739EF5 + + fileRef + 60B0663708B59D71E4CDF1092C6CFFFF + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -DOS_OBJECT_USE_OBJC=0 + + + B2829E9E2867D8CA2C13B4DCBF27D906 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.xcconfig + path + Expecta+Snapshots.xcconfig + sourceTree + <group> + + B2BD4725CF9CDA2D43C6FC25187A6636 + + fileRef + AB6C7C76143F94D79F87E59C3F58356C + isa + PBXBuildFile + + B3025E7F98A58345E56E502197EA4913 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + SDWebImage-iOS7.1-prefix.pch + path + ../SDWebImage-iOS7.1/SDWebImage-iOS7.1-prefix.pch + sourceTree + <group> + + B323053FE4A89A80DAC8E62109C6942E + + baseConfigurationReference + AC73D8815894F832B4005168AA85F69B + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/SDWebImage-iOS7.0/SDWebImage-iOS7.0-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Release + + B33234F432A72D5E8B65694AE937B78F + + fileRef + 6AD7732938C49233624F7D65F7706AEB + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + + + B3673B6102089791FA7076168FC943F1 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + EXPMatchers+equal.m + path + Expecta/Matchers/EXPMatchers+equal.m + sourceTree + <group> + + B458252DB56890ECD0D0D3B1FF3E4FA2 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + UIImageView+WebCache.m + path + SDWebImage/UIImageView+WebCache.m + sourceTree + <group> + + B479AD007E48937468A91B303A5BCE3C + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + DACircularProgress-iOS7.0-prefix.pch + sourceTree + <group> + + B4B2A734E626165993B34EAD492ECBD8 + + fileRef + 0468921E3EB17EB9D9222EA88F27CA75 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + B5C29AA2E90C37DF2483E6A5EE07F9EA + + fileRef + B0AD4D3FD51000868948132517923991 + isa + PBXBuildFile + + B6B32565B1C26404789EEFCF37B7C225 + + fileRef + 3C9B34A700598539C6D795D22394E974 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + B6FF82FB2747CC0D49DFF7CC42F063D8 + + fileRef + C01D38A591E4D8D50451108F3414C015 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + B77E164A99361A2BF1067A841D2D0EF5 + + baseConfigurationReference + 33D70A98285D51C294091A2EE3D7D87D + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/DACircularProgress-iOS7.0/DACircularProgress-iOS7.0-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 5.0 + MTL_ENABLE_DEBUG_INFO + YES + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Debug + + B82D0FB2D8196CD513FBFDB814221187 + + fileRef + 7C0F08326F5A918F2A311222533EC950 + isa + PBXBuildFile + + B83D4C05E77991780CA69BF68B431DD2 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.xcconfig + path + Pods-MWPhotoBrowser_Example.release.xcconfig + sourceTree + <group> + + B8436FA73347446587081FDDF98EA9D3 + + fileRef + 6E60D1F8670D1427EA6539244C485E69 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + B860A545FCE5CA24A3111308F41FF190 + + explicitFileType + archive.ar + includeInIndex + 0 + isa + PBXFileReference + name + libSpecta.a + path + libSpecta.a + sourceTree + BUILT_PRODUCTS_DIR + + B89A61B544CE3A653B8129ECFD996694 + + isa + PBXFileReference + lastKnownFileType + wrapper.framework + name + MediaPlayer.framework + path + Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/MediaPlayer.framework + sourceTree + DEVELOPER_DIR + + B8CB2EB954E316B2E45D2F5DE9F3895B + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + SDWebImageDecoder.h + path + SDWebImage/SDWebImageDecoder.h + sourceTree + <group> + + B8F6457DCF8AEE86B97C7E1BEFCE2E2A + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + SPTCallSite.m + path + Specta/Specta/SPTCallSite.m + sourceTree + <group> + + BA4E7FC4ADD44E03673C23CA5C198FBF + + fileRef + 7065F76F6E6E46155B92D11AECD095FC + isa + PBXBuildFile + + BB1C325F8941A0EF3493E5F3A2D46B5C + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + UIImage+MultiFormat.h + path + SDWebImage/UIImage+MultiFormat.h + sourceTree + <group> + + BB77A60BFB6B1B88E541338BFB8D00E9 + + includeInIndex + 1 + isa + PBXFileReference + path + UIBarButtonItemGrid@2x.png + sourceTree + <group> + + BB920EC5877ECE3C5E5ADEFA16287551 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + UIImage+Snapshot.m + path + FBSnapshotTestCase/Categories/UIImage+Snapshot.m + sourceTree + <group> + + BBAB845F3EE74389C710D8EC6E63C0ED + + fileRef + 7C0F08326F5A918F2A311222533EC950 + isa + PBXBuildFile + + BC34EE3C5922CCDC98558E642BBC9208 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + EXPMatchers+beLessThan.h + path + Expecta/Matchers/EXPMatchers+beLessThan.h + sourceTree + <group> + + BCFA2BA99EB882221EC319238134C70D + + fileRef + 17DE04DD655DDA4495305CEEE6AB3222 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + BD30B724A71CF5D6E93805B7615EC79C + + fileRef + 0CAC5CDED0ABB07CC907801F7DEF93A8 + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + + + BD56223A67203315C1B15E39E3B40934 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + text.script.sh + path + Pods-MWPhotoBrowser_Tests-frameworks.sh + sourceTree + <group> + + BDBA1D97314684EAE41BEDC18CE34FCD + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + MWPhoto.h + sourceTree + <group> + + BE2D642473CD92EAAC6F8D35028A6ACC + + fileRef + 61513A7F27881CD54D3F66804478AF03 + isa + PBXBuildFile + + BE44E030D3B992226EEE8606576B691F + + fileRef + D83DB981719BF50DFA1B90DF7C1942A7 + isa + PBXBuildFile + + BE8191476B080F4505CAF87040FC84FE + + isa + PBXFileReference + lastKnownFileType + wrapper.framework + name + CoreGraphics.framework + path + Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/CoreGraphics.framework + sourceTree + DEVELOPER_DIR + + BEEEFBCA3C3FDFFFB1CA3162E3BD7E39 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + EXPMatchers+contain.m + path + Expecta/Matchers/EXPMatchers+contain.m + sourceTree + <group> + + BF29141D751888DFCD02AC4659C5B58F + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + DALabeledCircularProgressView.h + path + DACircularProgress/DALabeledCircularProgressView.h + sourceTree + <group> + + C01029842F9E8EB453C903A7FA59A754 + + fileRef + 7E6F50D81F5E8AC0EC59DAC61AEBFE9C + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -DOS_OBJECT_USE_OBJC=0 + + + C01D38A591E4D8D50451108F3414C015 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + UIButton+WebCache.h + path + SDWebImage/UIButton+WebCache.h + sourceTree + <group> + + C0F26F6CB2B572DA824476035D329FFA + + fileRef + 9C55C23A53F272D0FB6EDE9328C1F604 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + C122C0C4443AD49259094EF7D024D5CE + + fileRef + 7C0F08326F5A918F2A311222533EC950 + isa + PBXBuildFile + + C1D12C8C3D20F5327F058FF64A17AD8D + + fileRef + 164F49A60006F63EB29CF6488F33113C + isa + PBXBuildFile + + C1D5F73734C071946CE4C1C3FEB2D566 + + containerPortal + D41D8CD98F00B204E9800998ECF8427E + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + CF95A047032EA05133C18EC3592E0E61 + remoteInfo + SDWebImage-iOS7.0 + + C2BFF99EB859FD7056CF72C4850693D1 + + fileRef + 8BD8C33E9B79FED19CBE99B8D300B700 + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + + + C336D921D585D36DC370E7B09A5572BB + + buildConfigurationList + B11EA19690952E09D09DAFCAA14B2EC9 + buildPhases + + EBF38F721EAD01DF913D78AD3EEB86FF + 03811E5EA2D5ABD2DEB6CF8BEA6056C1 + 5E81EB337C162C839599D111E9B5AD1A + + buildRules + + dependencies + + 1451AFC6B8E5ECBD410AD4CBF76311A2 + 0D1F40F72A7B770E141CEF1F3F4F00D4 + 22658CC272A795BEAB4052DB0B2CE0DF + 8DE59E4E7639008BFE525B8C5299A53F + + isa + PBXNativeTarget + name + MWPhotoBrowser-iOS7.0 + productName + MWPhotoBrowser-iOS7.0 + productReference + FA7B80D1B352FF18033709C9EF8533DC + productType + com.apple.product-type.library.static + + C3592D9FBA355E61B209E54E31408EB8 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + MWTapDetectingImageView.h + sourceTree + <group> + + C3AA1A1E963A98DB586351E0D793DF08 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + EXPMatchers+beCloseTo.h + path + Expecta/Matchers/EXPMatchers+beCloseTo.h + sourceTree + <group> + + C3D5EB779C1D6E8E696D33FD329964DF + + baseConfigurationReference + D239995504700A2E5AAB663DC471FBCA + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + YES + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Debug + + C4DEA7F0AD7DFDE3AE52970AE55B8AC6 + + explicitFileType + archive.ar + includeInIndex + 0 + isa + PBXFileReference + name + libDACircularProgress-iOS7.1.a + path + libDACircularProgress-iOS7.1.a + sourceTree + BUILT_PRODUCTS_DIR + + C4EE2327AA21B56F96948266BEE8B060 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + MWTapDetectingView.m + sourceTree + <group> + + C57858A8BF437152366E40CD2BF2F977 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + SDWebImageCompat.m + path + SDWebImage/SDWebImageCompat.m + sourceTree + <group> + + C5974A562F915524799FBBD7D60C82DB + + buildConfigurationList + 84FABAEAF436CA9FEDD28121DCCECB55 + buildPhases + + 62C0B00E39644DC3E5510523CBFE22D5 + 12740D328C04A8E60B9C5FD51A39DB79 + 4D6B208B7BC22AB11F6774DE01F69F24 + + buildRules + + dependencies + + 499B1AA9CBA8C039A60DC0E51EB83374 + 5AEC15164FC49250871B563665E57733 + CAD76495374CADB8BEA7F0F3C1065487 + F99D2A2FBDEC67C1E6C7E82C82B8E912 + + isa + PBXNativeTarget + name + MWPhotoBrowser-iOS7.1 + productName + MWPhotoBrowser-iOS7.1 + productReference + 8C8210CE2F6C12DB3A632074C9ECA496 + productType + com.apple.product-type.library.static + + C5A02591FDB44C1147BEC9F2DC2BE079 + + children + + 81CF95A25497BD4688DA1D8BF1FEC75A + A6120AD28ED935A66544A3470214B583 + 6420AB4D12B8B77FD0A54C738463ABF5 + + isa + PBXGroup + name + Support Files + path + ../Target Support Files/Specta + sourceTree + <group> + + C5CD559D15F6E685829825B38F3AEB11 + + fileRef + A91A8D3B33CEE35989031DC6BCCCE253 + isa + PBXBuildFile + + C5D65B7B6452BC95EC7B45BDA241CDE7 + + isa + PBXTargetDependency + name + MWPhotoBrowser-iOS7.0 + target + C336D921D585D36DC370E7B09A5572BB + targetProxy + 4C3D9BC7F96647A67FCA1B8447BA949E + + C6489C69EE8C83AA1DD173877F333D53 + + fileRef + 04359FC2EA7B7CE174FC15886814B0F5 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + C6671739E8C5904113586F8BEBBC9780 + + fileRef + CBD34BEE644AFF842828879033C0CD5F + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + + + C6AD7852D34E8A80DFF3B8376BDE812F + + buildActionMask + 2147483647 + files + + 8DF90D623F7F9015EEE9F1D7FEE7E053 + 6A4E3ACA285A21392936C110E7EC91F0 + 3A013F13122CDB8EE962F8CB7C6FCC8E + A6854D311D55E2BBD8BFCE4E82DF3EA9 + 081F2104425CDCB0915354E2FBD7E24E + 7AC91F55DAAA2F0223A97BEFF8BCAF68 + 2A17721E4A81DB608CA6D4FB6F0ADAFB + 341D7536159B52F41598F730CC45D548 + 07282695806D1DFBF187BFA004D80641 + A8490A46CB5206BCA5F90FCFBA2D731E + AA7B402D31D86AE5E3DD083408311FF1 + F4CA468B5A9F8FF2A4DB8B236A8E71BF + 021C50274FF43A6F07E119D572C3ACB6 + 8F674582EE71972EE60EFD96C1F173D5 + 3E463E2B6917D9AA08A03BA8A8E74A18 + AB1D6408D48F6ECF3FCE553BE73961F5 + D42799488F38F2DB8A580730CEE13CE6 + 97E91EC237B8623D895DBF6092034AD7 + 9B546D0F895D9B5A8316B948CEE95C77 + DFF580AE359407E841BA8D8DDCE6E299 + EE52A320EC3155B114104E06396D1B59 + 74707D5ABEC55B3084F52C40A4227B06 + 14C609D8F203FD45194E93997EFF744E + 9019F9233E2A8B04A82C1B8D0274F09F + 70545E4EA86C6E593A2A9F6731DA8F6D + 2945FAA75C956DD6A541EB51E42E6899 + 02C7E3EC1E1DFDD7046BD26A67E92686 + 76331E71086C8CD5118A69B046D8F0FB + 430CE433DB59FE090A8CC6AFCFA43337 + 237FB063FB365119546C7B5006224F3B + C98F5401E5C1AB6512BE50C3B7CEA9BF + 339A0C1BFF72397A705959E03877DDDB + AAE75938ED3DD46BC00352B82D7CA890 + 6EB2498C2AFB1DF8555CB7C1EF89CA5C + E867CBF850D20C314BF4BD790432455D + 6924E116731D7079958063A3EE0781ED + 4231743B6C143BDB4A5FBB032E6D3799 + 956FB3AB698AF3DA776A9F24AA79C229 + 60D3CCEB5B53542228790ABD8885AF42 + + isa + PBXHeadersBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + C6F2E59C3791A744AC9BC52EC83A5FF2 + + fileRef + DAA40F7FE6132464B3E058DD5C4B769A + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + C6F4A35B7BBD346A41720FAF7C294FD3 + + fileRef + 6671A09ADA325A55D4842D9BAA00A625 + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -DOS_OBJECT_USE_OBJC=0 + + + C6FE69AE06A770FF76C19B8039EC0780 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + Pods-MWPhotoBrowser_Tests-dummy.m + sourceTree + <group> + + C721ACB0838D5879AF74B2D46B1C6B7E + + fileRef + 20F27C938C5B92508B8FDCD6BC472B17 + isa + PBXBuildFile + + C76558D23D3662CFB44950D35534F7A9 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + XCTestCase+Specta.h + path + Specta/Specta/XCTestCase+Specta.h + sourceTree + <group> + + C80EBD28D6E96BE37A6CB4AFCE903DFB + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + EXPMatchers+beInTheRangeOf.h + path + Expecta/Matchers/EXPMatchers+beInTheRangeOf.h + sourceTree + <group> + + C81138DC2538A91FE1750C57875F7BF8 + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + SpectaUtility.m + path + Specta/Specta/SpectaUtility.m + sourceTree <group> - BA9D20AF1E1E4CF225AA2D772049336D + C8520615C0D48290F4D8247DD0ADD163 + + fileRef + 2AF1D3B3F78C6771F92418DF70000249 + isa + PBXBuildFile + + C8550F6E4CF998A1814DDBE05A07AA47 + + buildActionMask + 2147483647 + files + + 132E3E0858255FA04DBE604BF36A773D + 9358B6FBFE48AC831B1ADA898465E13D + 50177424EEBA0BD75379DCE8AE874154 + 14434A898B1464D80FF0C2DF360AB50B + E092BBC4E0493AEDCB18CB156F41D74B + F5B318E6604A7D1BA82A4F22B039020E + + isa + PBXHeadersBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + C8DD96A1F0B07FF9B81573E14B60AA13 + + fileRef + 55D00A044079BF2E1FBA6C209D7EFE01 + isa + PBXBuildFile + + C8E577F3D4114521FB48EE19B1C6D86B + + fileRef + 76674E127E6C44FC07C408ADE81BEE3A + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + C985ABCEABAC37D230D1BFFF9612BDDD - includeInIndex - 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + wrapper.framework name - Expecta.h + ImageIO.framework path - Expecta/Expecta.h + Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/ImageIO.framework sourceTree - <group> + DEVELOPER_DIR - BB3A5C6A66C23862172BF9BED9BC8200 + C98F5401E5C1AB6512BE50C3B7CEA9BF fileRef - D64041D7A1004D2C8771C29362B59366 + 8460C31711C941E648E9B1D8C0160B3F isa PBXBuildFile + settings + + ATTRIBUTES + + Public + + - BD30B724A71CF5D6E93805B7615EC79C + C9AA5CE493576094778E1A962ABB1A22 fileRef - 0AB1B49E98BEDDFC8A45BB3C1FB54076 + 5C096AF52C1D9D3B88B84A4956889B94 isa PBXBuildFile settings COMPILER_FLAGS - -fno-objc-arc + -DOS_OBJECT_USE_OBJC=0 - BD4E094BE48FCAB50C0CEFC92B2C0B04 + C9B5F86F6244D78D3F80384F609427C6 - includeInIndex - 1 + containerPortal + D41D8CD98F00B204E9800998ECF8427E isa - PBXFileReference - path - ImageSelectedSmallOff.png - sourceTree - <group> + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 2F501FE84845EAD97B9087DAFCBBEE0E + remoteInfo + Expecta - BD56223A67203315C1B15E39E3B40934 + C9B97F514121309E4531C3439E206EC7 includeInIndex 1 @@ -6574,32 +9185,111 @@ lastKnownFileType text.script.sh path - Pods-MWPhotoBrowser_Tests-frameworks.sh + Pods-MWPhotoBrowser_Example-resources.sh sourceTree <group> - BDD78DD77E210708F222D40A2FDE75B1 + CA15C33B171378DC59BC0C381A6B478A + + fileRef + 22C88C33F57CF0085CC8A7158F1C7B60 + isa + PBXBuildFile + + CA3383306B2073475052D6A892CD506D + + fileRef + 7065F76F6E6E46155B92D11AECD095FC + isa + PBXBuildFile + + CAD5A917A7AF591519A67F98E5C8BEF4 includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + EXPMatchers+match.m path - UIBarButtonItemArrowRight.png + Expecta/Matchers/EXPMatchers+match.m sourceTree <group> - BE6668D2527C0063CE1C755190A7596F + CAD76495374CADB8BEA7F0F3C1065487 + + isa + PBXTargetDependency + name + MWPhotoBrowser-iOS7.1-MWPhotoBrowser + target + 8E6E4E5E1771D7908C7C75660E7B5C90 + targetProxy + 27CE69326A3F77195A89CDDB359893F9 + + CB08C9C83ABDBE55762A423ED48491EF fileRef - E6798A1D89E725C8EB02146EE4B0E31E + FABC12E2041BC3DC98A81A08158D56DC isa PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + - BEEAFC79B66B12E6D67D140381BE25F2 + CB56D6D6CB477BE1D91309BAF7507031 + + buildActionMask + 2147483647 + files + + DC338CD4FB09401ACDFD4DB129499981 + F7DEF7616D85017E8FF321B491D386E6 + 37090385AF66D93707F0C15A5853CB02 + 0C168D0F1D57B07EB86D22102D8C5373 + 023C639879A22FDFEEC73FD5A74E222B + C8520615C0D48290F4D8247DD0ADD163 + 1E1312099445C77CADC00F8342CA4311 + DB7FF96A72899C075B72687DFF781198 + 5D5FFBCADD907503A904FF3C0764513D + EB805C04911EB4140BE3233E2BA733F2 + CA3383306B2073475052D6A892CD506D + C721ACB0838D5879AF74B2D46B1C6B7E + 91173621F56FF3D429760F9525A8298F + 27B7809589A47B17A4212E0116A243A6 + DF6C37E3CCB5031E262799609A67B4E8 + 51745F1B886A298CDB8DADC923EA9E88 + 45637168FB2ADA89D638F4A0202A7850 + 963EFD8F75884499D131C8272CB8E9CD + 75EA812A78FB9B908BCF222C30BDC263 + 07808153797F0776AA68C9365E9C7784 + 251DEDD6E8EECD8A2FB3B07D0AB661E7 + 3D1E10A0925F7F4C182687892DF95857 + 2388F4F4A69BCAD53156600CD142A591 + 532CD5AA9B8249EC3F6AED4F69415312 + B2BD4725CF9CDA2D43C6FC25187A6636 + 773EAA8924B4823FB8E94F7AFFA61F9E + C1D12C8C3D20F5327F058FF64A17AD8D + FF95F7794E2B33B14E41289C208DC156 + 374B79A72CCE5F3CB0CA1EF834AAE975 + 659796C7B63F0C6BC36CE677178F308B + FA38423F69FCFAB5130683CE16AFFA83 + 3B001E3B07B00AF473129B56F2CA9F5D + 10E3DD3741815B432C1DD49C7D62D9D2 + + isa + PBXResourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + CB75CD2A87EDFA527BA956B76D18B761 fileRef - 5A531485C6A0D185C72E03CD91B49919 + 8B39D58452BAB8033EB28FB4491D1CFE isa PBXBuildFile settings @@ -6610,73 +9300,46 @@ - BFD984F9AF4C47EDD370C631057D40E8 + CBD34BEE644AFF842828879033C0CD5F - baseConfigurationReference - 1580BE8D870658FFFB9EF3D04B9213CC - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MACH_O_TYPE - staticlib - MTL_ENABLE_DEBUG_INFO - NO - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PODS_ROOT - $(SRCROOT) - PRODUCT_NAME - $(TARGET_NAME) - SDKROOT - iphoneos - SKIP_INSTALL - YES - + includeInIndex + 1 isa - XCBuildConfiguration + PBXFileReference + lastKnownFileType + sourcecode.c.objc name - Release + EXPMatchers+beLessThan.m + path + Expecta/Matchers/EXPMatchers+beLessThan.m + sourceTree + <group> - C0593046ABD536BD086B85302FA897DF + CC08F424CAF98D9993BACA21F8610FD2 - baseConfigurationReference - CB09954F9727813F76DD0EC906DB781E - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/SDWebImage/SDWebImage-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MTL_ENABLE_DEBUG_INFO - YES - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - + includeInIndex + 1 isa - XCBuildConfiguration - name - Debug + PBXFileReference + path + ImageSelectedOn@2x.png + sourceTree + <group> + + CD44B1CCAB38CB70B16B67A5627DE4FC + + containerPortal + D41D8CD98F00B204E9800998ECF8427E + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + CF95A047032EA05133C18EC3592E0E61 + remoteInfo + SDWebImage-iOS7.0 - C0A33FBAF4E7C28807891EC8D0B65204 + CDA05C21D41229CCF5EF9D5971E53D12 includeInIndex 1 @@ -6684,98 +9347,101 @@ PBXFileReference lastKnownFileType sourcecode.c.objc + name + SDWebImageDownloader.m path - MWPhoto.m + SDWebImage/SDWebImageDownloader.m sourceTree <group> - C162177585DC8E186D24CADCC233B0EA + CE7D3201CD3AB448954A828E3C37A284 includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h path - UIBarButtonItemGrid.png + MWPhotoBrowser-iOS7.0-prefix.pch sourceTree <group> - C16C9E56CBDDE2AD1FCF3EFFF3127C20 + CF95446EA555B49150EA7270096D78B2 fileRef - 47BC96C02F9C3E09817E3FEC2559E33B + 32DC836D83D213BC101903CE49BF575C isa PBXBuildFile settings - ATTRIBUTES - - Public - + COMPILER_FLAGS + -fno-objc-arc - C1814AA3C422738CF4B8DC63539CCD3E - - fileRef - 8439940A3793CF65B24F4185E04317D8 - isa - PBXBuildFile - - C2420EB9004B4667C6328B5C0D098C48 + CF95A047032EA05133C18EC3592E0E61 - fileRef - 49D43B7D98ABA386628BDA9FB6BA411B + buildConfigurationList + 3B6785BE773E7C78E9A4DC50CF867507 + buildPhases + + F9C33F916FAEBB4445F3DA72F9523891 + 9A4D133FC708F3C6BAA516A2AC868303 + D2E7F92C4720EE0A5B7CE0EE808E677A + + buildRules + + dependencies + isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - + PBXNativeTarget + name + SDWebImage-iOS7.0 + productName + SDWebImage-iOS7.0 + productReference + 8047F5141351F2667383AB1B516054BE + productType + com.apple.product-type.library.static - C266061F84E4CFB93AF99D21EEB13401 + CF9FD7F65D9A4786AF3DD1C8A6E2ABE4 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc + name + SDWebImageManager.m path - MWPhotoBrowserPrivate.h + SDWebImage/SDWebImageManager.m sourceTree <group> - C2909BC6E2528AB50ADD2B0E4FE78DA1 + CFB1B748E162C2F99D05217A5EF5F86B includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h name - SPTTestSuite.m + NSObject+Expecta.h path - Specta/Specta/SPTTestSuite.m + Expecta/NSObject+Expecta.h sourceTree <group> - C2BFF99EB859FD7056CF72C4850693D1 + CFBAD094AAFE5279D5DAB2DA1C5E168B fileRef - 63010FB3922AB3E2DDD6D8CDD2D10BFA + EFF7E02E20A76B9E8BA18B06D1BD1205 isa PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - - C2CEB9C1175C4FC4D5BE5C6EF285E0A4 + D088BC9C1A77B11CDC82A669D3208DD0 includeInIndex 1 @@ -6784,104 +9450,77 @@ lastKnownFileType sourcecode.c.objc name - EXPMatchers+beTruthy.m - path - Expecta/Matchers/EXPMatchers+beTruthy.m - sourceTree - <group> - - C36BB9623ECA2B27942B66986A784EC9 - - includeInIndex - 1 - isa - PBXFileReference + EXPMatchers+respondTo.m path - UIBarButtonItemArrowLeft@2x.png + Expecta/Matchers/EXPMatchers+respondTo.m sourceTree <group> - C3D6913F5E4E594A29E40A526602BBB7 + D0CA2B52B792E24615A3215C33D67DDB + children + + DCEDF4A10BC8670D9EB6AE8BD88F362E + A0406B5CB3271476E514FB2CA3BBE643 + 5C4457D76E43872A0AB3E8D3F0D6B8E3 + isa - PBXTargetDependency + PBXGroup name - MWPhotoBrowser-MWPhotoBrowser - target - 5813251FEA21E4AEE97385709F1912DE - targetProxy - 999D9522F4AD2757D76E2BC0D6606B4A + MBProgressHUD + path + MBProgressHUD + sourceTree + <group> - C402F1446422CAB85FC53BD77E5E9018 + D0E862B0A7C9ACC538472981D6086B23 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h path - MWGridCell.h + ImageError@3x.png sourceTree <group> - C5284B0E2549CD42E31F469FB8B92DA8 + D0F3E73DC78D3A2AF2AD0A475F906FD9 - explicitFileType - archive.ar includeInIndex - 0 + 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h name - libSDWebImage.a + SDWebImageCompat.h path - libSDWebImage.a + SDWebImage/SDWebImageCompat.h sourceTree - BUILT_PRODUCTS_DIR + <group> - C5AFFFCB54FD9036E7BC9BA54ADAAF30 + D0F505787850174C5FA1CBAE31F993FC - baseConfigurationReference - 0557FD60A45F62CD51B4972ECE5C2584 - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/MBProgressHUD/MBProgressHUD-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MTL_ENABLE_DEBUG_INFO - NO - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - + fileRef + 8B1F7ACF7E60F6BECBD2E3D5AADEADD2 isa - XCBuildConfiguration - name - Release + PBXBuildFile - C5BD0A3729BF33E203724A88CFE727BC + D12D4FF89473EA03D383793DDD0336A7 fileRef - FCA01B035C5FC9AF0969977B2C54A7A9 + C01D38A591E4D8D50451108F3414C015 isa PBXBuildFile + settings + + ATTRIBUTES + + Public + + - C655D4974F9982F0810618C9AC07216F + D194AF2FF06BD3E4F74EE64FF700DAD6 includeInIndex 1 @@ -6890,137 +9529,94 @@ lastKnownFileType sourcecode.c.objc name - DALabeledCircularProgressView.m + MWPhotoBrowser-iOS7.1-dummy.m path - DACircularProgress/DALabeledCircularProgressView.m + ../MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1-dummy.m sourceTree <group> - C6671739E8C5904113586F8BEBBC9780 - - fileRef - F40AD0DE1188AA331D98100B8766D6C8 - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - - - C6AD7852D34E8A80DFF3B8376BDE812F - - buildActionMask - 2147483647 - files - - 8DF90D623F7F9015EEE9F1D7FEE7E053 - 6A4E3ACA285A21392936C110E7EC91F0 - 3A013F13122CDB8EE962F8CB7C6FCC8E - A6854D311D55E2BBD8BFCE4E82DF3EA9 - 081F2104425CDCB0915354E2FBD7E24E - 7AC91F55DAAA2F0223A97BEFF8BCAF68 - 2A17721E4A81DB608CA6D4FB6F0ADAFB - 341D7536159B52F41598F730CC45D548 - 07282695806D1DFBF187BFA004D80641 - A8490A46CB5206BCA5F90FCFBA2D731E - AA7B402D31D86AE5E3DD083408311FF1 - F4CA468B5A9F8FF2A4DB8B236A8E71BF - 021C50274FF43A6F07E119D572C3ACB6 - 8F674582EE71972EE60EFD96C1F173D5 - 3E463E2B6917D9AA08A03BA8A8E74A18 - AB1D6408D48F6ECF3FCE553BE73961F5 - D42799488F38F2DB8A580730CEE13CE6 - 97E91EC237B8623D895DBF6092034AD7 - 9B546D0F895D9B5A8316B948CEE95C77 - DFF580AE359407E841BA8D8DDCE6E299 - EE52A320EC3155B114104E06396D1B59 - 74707D5ABEC55B3084F52C40A4227B06 - 14C609D8F203FD45194E93997EFF744E - 9019F9233E2A8B04A82C1B8D0274F09F - 70545E4EA86C6E593A2A9F6731DA8F6D - 2945FAA75C956DD6A541EB51E42E6899 - 02C7E3EC1E1DFDD7046BD26A67E92686 - 76331E71086C8CD5118A69B046D8F0FB - 430CE433DB59FE090A8CC6AFCFA43337 - 237FB063FB365119546C7B5006224F3B - C98F5401E5C1AB6512BE50C3B7CEA9BF - 339A0C1BFF72397A705959E03877DDDB - AAE75938ED3DD46BC00352B82D7CA890 - 6EB2498C2AFB1DF8555CB7C1EF89CA5C - E867CBF850D20C314BF4BD790432455D - 6924E116731D7079958063A3EE0781ED - 4231743B6C143BDB4A5FBB032E6D3799 - 956FB3AB698AF3DA776A9F24AA79C229 - 60D3CCEB5B53542228790ABD8885AF42 - - isa - PBXHeadersBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - C6D58082433E54F547A343BCED70CA50 + D239995504700A2E5AAB663DC471FBCA includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + text.xcconfig + name + MWPhotoBrowser-iOS7.1.xcconfig path - Specta-prefix.pch + ../MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1.xcconfig sourceTree <group> - C6FE69AE06A770FF76C19B8039EC0780 + D29BEF4774B4867A0329C9DBEA18F855 + + fileRef + 741924A073B909B7AFBDDB23C25D9CE2 + isa + PBXBuildFile + + D2C2135CD610A259AFF15AA0AA282DA9 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h + name + DACircularProgress-iOS7.1-prefix.pch path - Pods-MWPhotoBrowser_Tests-dummy.m + ../DACircularProgress-iOS7.1/DACircularProgress-iOS7.1-prefix.pch sourceTree <group> - C77F8C54B4042EC0746E5D285E7D400A + D2D6B98D555A2768E2760397A4145753 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h - name - SDWebImageDecoder.h path - SDWebImage/SDWebImageDecoder.h + PlayButtonOverlayLargeTap@2x.png sourceTree <group> - C833942945CF274906A18C8D4BAAE480 + D2E7F92C4720EE0A5B7CE0EE808E677A - children + buildActionMask + 2147483647 + files - EF4D256729962DC82677BF90E861294B - 427921605A450AEF67D129DACCD87BED - 1B0ADBF8A991262A6DE5BD0CB101EEE0 + 7E5E6AB9D2EBC690BAF0CD1B3726A417 + 564EDDCB1C3B218A9202309835B7D951 + 3A3BA8CE3A1B01C0FB49D9189558FE33 + DB7A25EF14CFD7798B0B7F7D0FA93811 + 013926AC125E42AFBEEEF485C1DDB972 + FD5065F4D9DB691DB9D50D88D9A7A8E7 + 2657F2337D4E2CCB582EBFEA5D4DBCF6 + 13A9932BC364B2A3BADCA46D5C4F05DF + 13B4475A7BE2037F23947B2F5BCDD7BE + 34FCD34192B3E4510BB703F0B7FC9361 + 1BC96AA7ABE5415DC292A71FE5E7895C + B6FF82FB2747CC0D49DFF7CC42F063D8 + 02B5E14D6FFCF9AEBCD2848374D826FD + 4E7DFCCBCADA5F6D0C5BF4EE47BE2C2F + B4B2A734E626165993B34EAD492ECBD8 + 737870A213D270E142153D443CA1C0A7 + C8E577F3D4114521FB48EE19B1C6D86B + 6809816EE7C50DD585AD1D47C446C065 isa - PBXGroup - name - MBProgressHUD - path - MBProgressHUD - sourceTree - <group> + PBXHeadersBuildPhase + runOnlyForDeploymentPostprocessing + 0 - C98F5401E5C1AB6512BE50C3B7CEA9BF + D36C6BC6EA08FE7869F82F61B6EC9BC5 fileRef - 79D73FB4B6A3C92513B81243EA72E78C + 8B013ED88B85B2F00736DDC3EF06ECCD isa PBXBuildFile settings @@ -7031,269 +9627,243 @@ - C9B5F86F6244D78D3F80384F609427C6 + D41D8CD98F00B204E9800998ECF8427E - containerPortal - D41D8CD98F00B204E9800998ECF8427E + attributes + + LastSwiftUpdateCheck + 0730 + LastUpgradeCheck + 0700 + + buildConfigurationList + 2D8E8EC45A3A1A1D94AE762CB5028504 + compatibilityVersion + Xcode 3.2 + developmentRegion + English + hasScannedForEncodings + 0 isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - 2F501FE84845EAD97B9087DAFCBBEE0E - remoteInfo - Expecta + PBXProject + knownRegions + + en + + mainGroup + 7DB346D0F39D3F0E887471402A8071AB + productRefGroup + 08877E80CE4F8FBEA0236250F69E2C62 + projectDirPath + + projectReferences + + projectRoot + + targets + + 501BE33907DBD9E3BB1712FC47BF8093 + DB44479B27C4E10F763DC6C92B9704CA + 2F501FE84845EAD97B9087DAFCBBEE0E + 05257CC76400D71826E603561A0F73E6 + 7D9E32DAA93E15CFCF77A5BCD2D4BAA2 + 493375293C63883E773D55FB79AF6D25 + 312F48D37605F7A2FAFBF1F2AD9B19A7 + C336D921D585D36DC370E7B09A5572BB + 5C92E77631D5ABB9DAE27B2AECB681EC + C5974A562F915524799FBBD7D60C82DB + 8E6E4E5E1771D7908C7C75660E7B5C90 + 612A04D52A08B463E81B1666C41D1FBF + 9C6673C70ED9568377314C875F133968 + CF95A047032EA05133C18EC3592E0E61 + 5ED50B5F8CF57B6340E4ADE997542BE9 + 9F94634D61584613303A1CE9E3598593 + - C9B97F514121309E4531C3439E206EC7 + D42799488F38F2DB8A580730CEE13CE6 + + fileRef + 90633AED0F522AA974E785E46D4EB31E + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + D4DA65BA155007D24A7798B4EC7F47E6 includeInIndex 1 isa PBXFileReference - lastKnownFileType - text.script.sh path - Pods-MWPhotoBrowser_Example-resources.sh + VideoOverlay@2x.png sourceTree <group> - C9BF70FB69B8740763B185C23C560434 + D57B246EE3741FF87B5BC22155CF1766 includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + EXPMatchers+beGreaterThanOrEqualTo.m path - ImageSelectedOn@3x.png + Expecta/Matchers/EXPMatchers+beGreaterThanOrEqualTo.m sourceTree <group> - CA0DFA401B2A45337DFC72F893A060EF + D5AF568640D56D046CFA52154A05ED61 - fileRef - 523087C6D186A9F5BEE78D39F9A78F3F + buildActionMask + 2147483647 + files + + 39CD18FF411840FE55349DF7BA9796ED + 67888E9C4D9A47DADEC965E59DC45373 + isa - PBXBuildFile + PBXHeadersBuildPhase + runOnlyForDeploymentPostprocessing + 0 - CA8230DE5C83368629EF3E62C4F0E7B7 + D5EE5F7C5A846B01ACF225DE04E52196 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc - name - XCTestCase+Specta.m + text.xcconfig path - Specta/Specta/XCTestCase+Specta.m + Pods-MWPhotoBrowser_Example.debug.xcconfig sourceTree <group> - CB08C9C83ABDBE55762A423ED48491EF + D66EBB56C69B57E3278B7D1E3BA5B78C - fileRef - 7DACEAF8582049D6EB8B4CFFB6CA48CD + children + + 4DA5A362F6C7352C50C0676E95C0E4F5 + 1C4193B07580488BB5EFEFB38D0D46EB + CE7D3201CD3AB448954A828E3C37A284 + D239995504700A2E5AAB663DC471FBCA + D194AF2FF06BD3E4F74EE64FF700DAD6 + DD0943ECBA746AB703263F30711EE7EA + E2D89738FC6A4BC254C60E3FCC3C569C + 62254B1B74137F555858AC3B8641C3AC + isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - + PBXGroup + name + Support Files + path + Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.0 + sourceTree + <group> - CB09954F9727813F76DD0EC906DB781E + D74AF1EB77F87EA3EFAD95BBD0CA0175 includeInIndex 1 isa PBXFileReference lastKnownFileType - text.xcconfig + sourcecode.c.h + name + EXPBlockDefinedMatcher.h path - SDWebImage.xcconfig + Expecta/EXPBlockDefinedMatcher.h sourceTree <group> - CB3EA5CC56581FD52BDBA0179D956E7B + D823A9C410F2960187FFF159AE629A25 includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h + name + MBProgressHUD-iOS7.1-prefix.pch path - ImageSelectedSmallOn@3x.png + ../MBProgressHUD-iOS7.1/MBProgressHUD-iOS7.1-prefix.pch sourceTree <group> - CB7148E744A9D03AEDC9D4809248999F - - baseConfigurationReference - 7389D03E90A74E5A200DD5ADBB209885 - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/DACircularProgress/DACircularProgress-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MTL_ENABLE_DEBUG_INFO - YES - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - - isa - XCBuildConfiguration - name - Debug - - CBE0BF23E2B3F39D22B51BC93022DE7D + D833067C97F24C277CD5F36AC7070DD0 - children - - 8E485F27A3C78223FB086075C2974A49 - 9BDA7CB400BA41525D0DAC5E267B2670 - 2D6EC33CA8D9BD953AD29E16068F2CBD - DE369A67A17A1EE2351376730BB039A4 - 8A00437F88A0C89CD672C2085CCCF62B - 10E446637EC5FF03088009E61B491E75 - C77F8C54B4042EC0746E5D285E7D400A - 6C982719FDCF6684EB752A0153066FC3 - 574FFB37A8EF309B1A1EB265267DD353 - A59CA631962D8BFBF1D8BA4BA8F1F223 - 47BC96C02F9C3E09817E3FEC2559E33B - 7599165E41821009340AA99FDAC29AE0 - 222A85D6DAB7D3AC98EF6D7E68B13740 - 2EDD6193448F7939784FDF1C8016F000 - D615D83AA6E624C9EEFAB11B6DAB4612 - EC0223776620A3EA741C855D0211CB0A - 78759DF877B83416A90AA2BC606BF7ED - 518626B93DA6269F02901D111B4DBF26 - 661962DFFB8F4AF681F8EA78582EE534 - 4CFA073D420411E3535ABA966BEE98CC - 6B1C830074F8BFC3AE3CB3A5278754A8 - 1A1E8E8494B9BFCEBBD8273148D44386 - FE9D7A964178EF6E3CE5FC52134DF825 - 5D39CEB65ADB521B117CA181C2BB2C9C - 9E58B396BFA804075E0FCC2D7E764BA6 - AE1B7431EAFB4D89A49A9DAD35DBE790 - A2B692D3F450E25A5D8B17F524EA0720 - D91F4635A8EDF54921FC9B759BE009F6 - 38777F32EB3F13ED8D2047C1C9ED6D6D - + includeInIndex + 1 isa - PBXGroup - name - Core + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + MWPhoto.m sourceTree <group> - CC01A834786EDBE30D7011502AE0F9B3 - - baseConfigurationReference - CB09954F9727813F76DD0EC906DB781E - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/SDWebImage/SDWebImage-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MTL_ENABLE_DEBUG_INFO - NO - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - - isa - XCBuildConfiguration - name - Release - - CD12BF87A360D901CFA6AC563638FED1 + D8368C89A91EC49B6FB459C2E1EEF559 - children - - 805AE44C01D7936BA8A238C6C5C4807D - AD198F3513AFD6128A50C356DC253545 - C6D58082433E54F547A343BCED70CA50 - + includeInIndex + 1 isa - PBXGroup + PBXFileReference + lastKnownFileType + sourcecode.c.h name - Support Files + ExpectaObject.h path - ../Target Support Files/Specta + Expecta/ExpectaObject.h sourceTree <group> - CEFDBDB8900789B0FFB86EBB7065BC62 + D83DB981719BF50DFA1B90DF7C1942A7 - explicitFileType - archive.ar includeInIndex - 0 + 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.objc name - libDACircularProgress.a + NSData+ImageContentType.m path - libDACircularProgress.a + SDWebImage/NSData+ImageContentType.m sourceTree - BUILT_PRODUCTS_DIR + <group> - CF37F67F6269058934EB779D902EE7AB + D8E6736BD1008D08D381612A8AB42AA4 fileRef - C0A33FBAF4E7C28807891EC8D0B65204 + BE8191476B080F4505CAF87040FC84FE isa PBXBuildFile - CF95446EA555B49150EA7270096D78B2 + D906DECAA352D01C821D0A6AD3521D73 fileRef - E906DDCC926C2EA5161E326AB04AC53F + 0AAEE06FB4F7F495B1AAD1EDDEB2E9D2 isa PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - - D041545E1DB9D43FCBB294B7E9573AFF + D9981CC619E5A93C4580DC17F742D94E fileRef - DF11024BF511A0D2225D4BA84770CED7 + 25C1953BA899E791C4AEA91E97A093AA isa PBXBuildFile - D09A95F4452843967F4C8F3FA5EC1A68 + DA5F1024E10268E26770AB791B1E9E8D includeInIndex 1 @@ -7302,127 +9872,86 @@ lastKnownFileType sourcecode.c.h name - ExpectaSupport.h + EXPMatchers+equal.h path - Expecta/ExpectaSupport.h + Expecta/Matchers/EXPMatchers+equal.h sourceTree <group> - D10BA2216A9B5F41557B4FC448EE865C + DA94D42A7FA0CA4D6545C88275A83A74 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc name - EXPMatchers+equal.h + EXPExpect.m path - Expecta/Matchers/EXPMatchers+equal.h + Expecta/EXPExpect.m sourceTree <group> - D2307EC60BB4D23E49C1420E6F192943 + DAA40F7FE6132464B3E058DD5C4B769A includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h + name + SPTExcludeGlobalBeforeAfterEach.h path - ImageSelectedOff@3x.png + Specta/Specta/SPTExcludeGlobalBeforeAfterEach.h sourceTree <group> - D351C08D4390F427D8E1BEC3CB8A57BD + DB0F54D7A298EF6E345A6472EF1CB3BC - children - - 9839B551DAF141B99431C2238C8EEBC0 - DB7D9B8599935A5FF3862B90E049CABD - DF11024BF511A0D2225D4BA84770CED7 - A09DD0AB6A512D74E5628070EBD56026 - 6CD3EC2C1FBF5655137A99638E9CC950 - 5E350F03F362C03BE32737DDE72D4632 - 0B7E61991D03B44046913BF3B345F4DB - + includeInIndex + 1 isa - PBXGroup + PBXFileReference + lastKnownFileType + sourcecode.c.h name - iOS + SPTCompiledExample.h + path + Specta/Specta/SPTCompiledExample.h sourceTree <group> - D359D2CDD896874DAD7B6D2EF3FEE26D - - isa - PBXTargetDependency - name - SDWebImage - target - DE3B07ED7FF04F506B0C5E00F4973589 - targetProxy - 9E907D6C90793FF2CC5533F151827418 - - D3C785493044AF463085D75F2E9D4FEE - - fileRef - 2DE374580729793C277006A3481402A3 - isa - PBXBuildFile - - D41D8CD98F00B204E9800998ECF8427E + DB44479B27C4E10F763DC6C92B9704CA - attributes - - LastSwiftUpdateCheck - 0700 - LastUpgradeCheck - 0700 - buildConfigurationList - 2D8E8EC45A3A1A1D94AE762CB5028504 - compatibilityVersion - Xcode 3.2 - developmentRegion - English - hasScannedForEncodings - 0 - isa - PBXProject - knownRegions + 733194FE81AF7E280368D91556E00609 + buildPhases - en + F221DBD297FD9AFB5D2A5B9274F4BE43 + 9A7BA163AB90635240537961C1762094 + D5AF568640D56D046CFA52154A05ED61 - mainGroup - 7DB346D0F39D3F0E887471402A8071AB - productRefGroup - 9142D907B715CE18385E00AB1972B1BD - projectDirPath - - projectReferences + buildRules - projectRoot - - targets - - 9775596B3CA16905FC8F66DA8E2A3C67 - 2F501FE84845EAD97B9087DAFCBBEE0E - 05257CC76400D71826E603561A0F73E6 - 7D9E32DAA93E15CFCF77A5BCD2D4BAA2 - FE2F1D7B9D9FCEA148517E4657B243F4 - E2FE87384A67337831E53490EEA8BF11 - 5813251FEA21E4AEE97385709F1912DE - A2118778317DA37C36420E58FB3923B3 - 722090AAE01BA442E883E6F02AA8DF40 - DE3B07ED7FF04F506B0C5E00F4973589 - E9AAC3590B391F4CFAF5F8348E6A8FE4 - + dependencies + + isa + PBXNativeTarget + name + DACircularProgress-iOS7.1 + productName + DACircularProgress-iOS7.1 + productReference + C4DEA7F0AD7DFDE3AE52970AE55B8AC6 + productType + com.apple.product-type.library.static - D42799488F38F2DB8A580730CEE13CE6 + DB7A25EF14CFD7798B0B7F7D0FA93811 fileRef - 3C5A51B8AE7322A210CF01AFBA648598 + 8B39D58452BAB8033EB28FB4491D1CFE isa PBXBuildFile settings @@ -7433,35 +9962,150 @@ - D47B0B4C04222F6784D38356F02BEB32 + DB7FF96A72899C075B72687DFF781198 - containerPortal - D41D8CD98F00B204E9800998ECF8427E + fileRef + CC08F424CAF98D9993BACA21F8610FD2 isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - FE2F1D7B9D9FCEA148517E4657B243F4 - remoteInfo - MBProgressHUD + PBXBuildFile - D52C083C7341E76797DB059849542613 + DB87EEF59BEAC8C1562C3F7116AE057C + + fileRef + D833067C97F24C277CD5F36AC7070DD0 + isa + PBXBuildFile + + DC1E827E82EB21B873C84ACA7124EAD0 + + fileRef + 741924A073B909B7AFBDDB23C25D9CE2 + isa + PBXBuildFile + + DC327BF9908C6657EEDF43607EC12C11 + + fileRef + 94B3E7FD543C524CF33D079199EE7059 + isa + PBXBuildFile + + DC338CD4FB09401ACDFD4DB129499981 + + fileRef + 40BE40DBAFEC3D9E63A756296424F8C3 + isa + PBXBuildFile + + DC44CA1C2969CFCC2A3836A538B2BB23 + + fileRef + 7C0F08326F5A918F2A311222533EC950 + isa + PBXBuildFile + + DC5FAD5C45A2C83EE7996EB5147E3366 + + children + + D74AF1EB77F87EA3EFAD95BBD0CA0175 + 32DC836D83D213BC101903CE49BF575C + F261561FF68DDFFE15CD3E85184B80DF + 149EB70FB77BF58B82891D36A3767810 + 8B42246CA0E8E327E5856E4FD283D80A + 6E1B606A74EFBFF5C21282DD1F9380F3 + D8368C89A91EC49B6FB459C2E1EEF559 + 36EF33AD9610A185983EBA61F85A14E4 + 01D3F330EEFE0D7FE6817AA3F61B5DD3 + 1697441AA29177C9A68FDF0E3C04E703 + 00DAAD802A7645CAECEDFD6DDE155D87 + DA94D42A7FA0CA4D6545C88275A83A74 + E7559EE8E94EF4568A698508AB5E5320 + 5CA5187B727BAACAE0E3D82B002FCF89 + 97FB237BF48E4FDD7DCE3CE2DC3599CF + 37F531C126B1896AC3926507C089C886 + 319E0B3A0EE31DDBCB51A7A65C686C6E + F218977F348D163003B9995918E4A1BB + C3AA1A1E963A98DB586351E0D793DF08 + 553487B6BEC699943895F6AE064CE07D + E30378296B05F85A162C4AF60A9FC71F + F54EB94D2D16B4CE657FBB2F8A2809AA + F3AD53C166BBA373F67EF94C58CD70E6 + 92A43DEB8B9BB0F7DF03C77AA68FF48C + 23B16555B9F61B5736971092E8DB5E8A + FABC12E2041BC3DC98A81A08158D56DC + 14F2D5060BA079F6E75C8E8951FCC4C2 + D57B246EE3741FF87B5BC22155CF1766 + 7F397A8A598DD08C158F22A5A1DAC0A9 + 997499B0DCD119F5D08A21E6633D2570 + 90633AED0F522AA974E785E46D4EB31E + 89A3B15DB6754B0B14CE047CBF54D8EA + C80EBD28D6E96BE37A6CB4AFCE903DFB + 8CF584384414E0B977D3126B8D442EDE + E7DEC901EF91A68AB312BBC09893E869 + 39DF90B59241BC39F89E1BE7D39B8E79 + BC34EE3C5922CCDC98558E642BBC9208 + CBD34BEE644AFF842828879033C0CD5F + A254E54DD33D0D4AC13B46F55F4A4C5F + E3D4A2FC51189B8F8BC6A2CD107D2E34 + 49BC151A9A9932CA3E4B51B8E4406030 + 09D98132C1A65D2CA3C6E5AAC718DB24 + 129854D8DBB08D47DFA818D6EE2724D1 + 0CAC5CDED0ABB07CC907801F7DEF93A8 + AEA10FDC6D2A4E0B8BB9E525D5007847 + 69335D299D54229201A668D2B55F53C0 + 3C85EA12507805BB691E7BF632EDAF13 + 3D2832CB35A6EE23A1644AFBCE862715 + E172841A0D1610F84C17075A4D8DAB74 + 8BD8C33E9B79FED19CBE99B8D300B700 + EEFE1552FA6CB791AF012FE9726274D9 + BEEEFBCA3C3FDFFFB1CA3162E3BD7E39 + EC66025612AB7AF586362D4587912B8D + 6AD7732938C49233624F7D65F7706AEB + DA5F1024E10268E26770AB791B1E9E8D + B3673B6102089791FA7076168FC943F1 + 3DCE30BEC4A66B63ACD53649C778D138 + E53153AD4E13D3365961E9BBD1D6ACA4 + 8460C31711C941E648E9B1D8C0160B3F + CAD5A917A7AF591519A67F98E5C8BEF4 + 7768E180287F65FB37DCC3EF5E5C5325 + FFCF2C3F17C8514584FCC49E473C2F09 + 92A79913B3F0E14239D2F359D76C98C6 + 2F8FE01380F8EF34F8D34A1855F7B917 + 548D6ED317501EC82BF1532DEA509727 + AB64ADBC48A8B7906340AD319D9456E7 + 2A012232008EE438D13D2498136877EB + D088BC9C1A77B11CDC82A669D3208DD0 + 8CB41C68CFC5F23CAB80F2E013292F1C + 886B28457E1880775AB779BF4053231E + CFB1B748E162C2F99D05217A5EF5F86B + 038F47EC159D577EA6F47F06F5D92463 + 76F49F5ECFFC7C15904E6C672C8D1C69 + 58E1D5CAE886B3357F355322DA49DCCA + + isa + PBXGroup + name + Expecta + path + Expecta + sourceTree + <group> + + DCEDF4A10BC8670D9EB6AE8BD88F362E - explicitFileType - archive.ar includeInIndex - 0 + 1 isa PBXFileReference - name - libFBSnapshotTestCase.a + lastKnownFileType + sourcecode.c.h path - libFBSnapshotTestCase.a + MBProgressHUD.h sourceTree - BUILT_PRODUCTS_DIR + <group> - D54993E311EDD8802711B01895286E4E + DD0943ECBA746AB703263F30711EE7EA includeInIndex 1 @@ -7470,24 +10114,38 @@ lastKnownFileType sourcecode.c.h name - FBSnapshotTestCasePlatform.h + MWPhotoBrowser-iOS7.1-prefix.pch path - FBSnapshotTestCase/FBSnapshotTestCasePlatform.h + ../MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1-prefix.pch sourceTree <group> - D583D511354F609B73EB28F4CFA2C32A + DD0FE45AD3D40E12614EB8D9A1AE2861 + + fileRef + 7AC0C9AF6FC29D788CA6CA72790CBDEA + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + DDF03D7BD04CF95B46036D01E9AB143D isa PBXTargetDependency name - DACircularProgress + MWPhotoBrowser-iOS7.1 target - 9775596B3CA16905FC8F66DA8E2A3C67 + C5974A562F915524799FBBD7D60C82DB targetProxy - 386634C7797B60DF71C8AD13DAAD315D + 684FC6B2FCBD849342F3B2E03EFB7A28 - D5DEC16E7CEEFEABBFEBAC3A10358C5A + DE54C3C91B980435BD044A42FD71152A includeInIndex 1 @@ -7496,24 +10154,24 @@ lastKnownFileType sourcecode.c.h path - FBSnapshotTestCase-prefix.pch + UIImage+MWPhotoBrowser.h sourceTree <group> - D5EE5F7C5A846B01ACF225DE04E52196 + DE865E31A9429063B7FBB7B3B89F5C91 includeInIndex 1 isa PBXFileReference lastKnownFileType - text.xcconfig + sourcecode.c.h path - Pods-MWPhotoBrowser_Example.debug.xcconfig + FBSnapshotTestCase-prefix.pch sourceTree <group> - D615D83AA6E624C9EEFAB11B6DAB4612 + DE88F9E71ECFEEE995CE8220E301E8ED includeInIndex 1 @@ -7522,57 +10180,48 @@ lastKnownFileType sourcecode.c.h name - SDWebImageOperation.h + SDWebImageDownloaderOperation.h path - SDWebImage/SDWebImageOperation.h + SDWebImage/SDWebImageDownloaderOperation.h sourceTree <group> - D64041D7A1004D2C8771C29362B59366 + DED5197B49D7E4CE0384FDA40600EFA0 - includeInIndex - 1 + fileRef + 2C7237EAF40D180CD096D5392125E14D isa - PBXFileReference - path - UIBarButtonItemGrid@3x.png - sourceTree - <group> + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - D68BA9A93FD415E751DFA95CCF7DCB8D + DF08D341B4BEA29674FCBC8D1259E685 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - EXPMatchers+beCloseTo.m path - Expecta/Matchers/EXPMatchers+beCloseTo.m + PlayButtonOverlayLargeTap.png sourceTree <group> - D70BED84191514A998A08D7F3B8BBB17 + DF6C37E3CCB5031E262799609A67B4E8 - includeInIndex - 1 + fileRef + 387B77A2F66A747E6E82D54865A7DF4F isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - EXPDoubleTuple.m - path - Expecta/EXPDoubleTuple.m - sourceTree - <group> + PBXBuildFile - D791C7B718024D8AED15BE84AA2FAAD0 + DFF580AE359407E841BA8D8DDCE6E299 fileRef - 518626B93DA6269F02901D111B4DBF26 + BC34EE3C5922CCDC98558E642BBC9208 isa PBXBuildFile settings @@ -7583,95 +10232,78 @@ - D7A0524D2A055F825B4DF69A9DBBFF98 + E06376455C1D5E45B97ACDC5438FC15B fileRef - A1195ED094D0C8B66BB073959AA2ACCD + 09D98132C1A65D2CA3C6E5AAC718DB24 isa PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + - D7B59E66FA2C765426650ADECEF955EF + E092BBC4E0493AEDCB18CB156F41D74B - containerPortal - D41D8CD98F00B204E9800998ECF8427E + fileRef + E49C2F72B5162553DB6026138E857EAF isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - FE2F1D7B9D9FCEA148517E4657B243F4 - remoteInfo - MBProgressHUD + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - D7F1441E30E059AC17B4C1CE1464C07B + E096805675BD49813DAEE20AA167E301 - explicitFileType - archive.ar - includeInIndex - 0 isa - PBXFileReference + PBXTargetDependency name - libMBProgressHUD.a - path - libMBProgressHUD.a - sourceTree - BUILT_PRODUCTS_DIR + SDWebImage-iOS7.1 + target + 5ED50B5F8CF57B6340E4ADE997542BE9 + targetProxy + 3865B3AEFFE7FEAB11E06342C3EF693D - D8619A771228AD0402C4D464E3C6EE53 + E0C60F74505B8CA4DF064D4B2A6B7709 - includeInIndex - 1 + children + + 20E1F60112AF206BFFDDD0E0153D60CD + DC5FAD5C45A2C83EE7996EB5147E3366 + 8C9E7654F18C2626BC0DC07736B79260 + A45C372FE12A3F0F4CB6B42725A6D7B7 + D0CA2B52B792E24615A3215C33D67DDB + 24997E2929A08A1BDE38B83A2E59C51D + 7C14E04E9CFF57952B7621958950F09F + isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - MWPhoto.h + PBXGroup + name + Pods sourceTree <group> - D8BBE4506E8863FF1D2FA4058580F0C8 + E0FF8A55E4FAC77410368EC41E04EDF2 - children - - 9A086D9BE521AADC7C972AE3D9CD5B48 - 9BF2584F8D336EF737485D7396CFBAFF - F3FAB75D28A2755E4F9F79FB9F2AF5DB - 6347B71E8C22BA00F73AB093F101B7D4 - 3CD608194F35F47CEC250368B43C48E9 - DBE203B988A948E71FDDCAE62BA1F4CC - 2ACE82A15131DC569A786CB49EFD1804 - 0668957FEB1B3CAE2EABBC4AA9ABA7C3 - 569060A075537DFE6A4D25D96C98668B - 56228B3CBF246784930BFE7B29EFDD04 - 2F29BE2EDEBA2861368726A4772F4E8E - 1AFDF0F0EF2A314336EACA38FCC6F784 - 818AFFCC037C608492FAE59C7C3E85C0 - 571096112AA1AD00C10596D216783599 - 1D772DC880BCFABF5028DA167DE6B119 - 49D43B7D98ABA386628BDA9FB6BA411B - 1398D1B84667A17FCB66182F776EAC42 - 8F2B443FA0D511403E4DA2A79DB3302A - 691CE6B20E64762C98682B93B31435E7 - F1948E226356BF652752F9FA7317BC73 - EF75C10714B7CFF9071553F07D94A550 - C2909BC6E2528AB50ADD2B0E4FE78DA1 - 1EF011C5AA1726984A1B50A46191CE9B - 1E360C94C47826C4CAEEDBFC04C36A42 - CA8230DE5C83368629EF3E62C4F0E7B7 - CD12BF87A360D901CFA6AC563638FED1 - + includeInIndex + 1 isa - PBXGroup + PBXFileReference + lastKnownFileType + sourcecode.c.objc name - Specta + SDImageCacheConfig.m path - Specta + SDWebImage/SDImageCacheConfig.m sourceTree <group> - D91F4635A8EDF54921FC9B759BE009F6 + E172841A0D1610F84C17075A4D8DAB74 includeInIndex 1 @@ -7680,80 +10312,109 @@ lastKnownFileType sourcecode.c.h name - UIView+WebCacheOperation.h + EXPMatchers+conformTo.h path - SDWebImage/UIView+WebCacheOperation.h + Expecta/Matchers/EXPMatchers+conformTo.h sourceTree <group> - D9E225250B8DAA16A4D7B6A66EC6574A + E267C5FC80FC77FFE4252A1075041AC7 fileRef - C2909BC6E2528AB50ADD2B0E4FE78DA1 + 2C7237EAF40D180CD096D5392125E14D isa PBXBuildFile settings - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 + ATTRIBUTES + + Public + - DA7F16221783A03C084D9BAAF7F404DB + E272AF35FCE3F97A94369B53F0A934A3 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc name - EXPMatchers+beginWith.h + SPTSpec.m path - Expecta/Matchers/EXPMatchers+beginWith.h + Specta/Specta/SPTSpec.m sourceTree <group> - DB7D9B8599935A5FF3862B90E049CABD - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - CoreGraphics.framework - path - Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/CoreGraphics.framework - sourceTree - DEVELOPER_DIR - - DBE203B988A948E71FDDCAE62BA1F4CC + E2D89738FC6A4BC254C60E3FCC3C569C includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + text.plist.xml name - SpectaUtility.m + ResourceBundle-MWPhotoBrowser-Info.plist path - Specta/Specta/SpectaUtility.m + ../MWPhotoBrowser-iOS7.1/ResourceBundle-MWPhotoBrowser-Info.plist sourceTree <group> - DC1F1DBD53679CB78C5967BA9DEC08CA + E2EBD18BA89D3FF648947DF31FA12D44 fileRef - 78759DF877B83416A90AA2BC606BF7ED + D088BC9C1A77B11CDC82A669D3208DD0 isa PBXBuildFile settings COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 + -fno-objc-arc + + + E2EC2F723658ED4EC8976D555838914E + + baseConfigurationReference + 93CEE4DD787EF512C9D9AA34A4223E43 + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/FBSnapshotTestCase/FBSnapshotTestCase-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + NO + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + isa + XCBuildConfiguration + name + Release - DD16771750E90A2599B84EDB4AFF9B9E + E30378296B05F85A162C4AF60A9FC71F includeInIndex 1 @@ -7761,12 +10422,14 @@ PBXFileReference lastKnownFileType sourcecode.c.h + name + EXPMatchers+beFalsy.h path - SDWebImage-prefix.pch + Expecta/Matchers/EXPMatchers+beFalsy.h sourceTree <group> - DD5F3D6C4044A157839220B037A055E8 + E3D4A2FC51189B8F8BC6A2CD107D2E34 includeInIndex 1 @@ -7775,108 +10438,97 @@ lastKnownFileType sourcecode.c.objc name - UIImage+Diff.m + EXPMatchers+beLessThanOrEqualTo.m path - FBSnapshotTestCase/UIImage+Diff.m + Expecta/Matchers/EXPMatchers+beLessThanOrEqualTo.m sourceTree <group> - DD7BDEE57A8E95F9F327AC87B6A78256 + E43664449F204164CFA04C3AAB7A4E98 fileRef - C402F1446422CAB85FC53BD77E5E9018 + B0AD4D3FD51000868948132517923991 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - - DDAA00E6C2E81A6C35534DD632143F09 - - children - - 7389D03E90A74E5A200DD5ADBB209885 - AF944A6486FDAD944BE766A70129E6D2 - E5EA159155EA435901485FBB8111088C - - isa - PBXGroup - name - Support Files - path - ../Target Support Files/DACircularProgress - sourceTree - <group> - DE0797009C8330FFDB1FC0EB8D2DA9DD + E4371F1778A8001BE32A2FBC2D69F8D3 - buildActionMask - 2147483647 - files - + fileRef + 1C4193B07580488BB5EFEFB38D0D46EB isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXBuildFile - DE369A67A17A1EE2351376730BB039A4 + E49C2F72B5162553DB6026138E857EAF includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h name - SDImageCache.m + UIImage+Diff.h path - SDWebImage/SDImageCache.m + FBSnapshotTestCase/Categories/UIImage+Diff.h sourceTree <group> - DE3B07ED7FF04F506B0C5E00F4973589 + E50C95BFEF67882BF48DDE9C964372AF - buildConfigurationList - 8D8B7C183B18D82F1958BB3115798433 - buildPhases - - 7357CD98F48585C602A75C901AD5E096 - B98B98DB394C072483E8066C6B594401 - A0C76077A20E75ED950BF4F88A252F83 - - buildRules - - dependencies - + fileRef + A0406B5CB3271476E514FB2CA3BBE643 isa - PBXNativeTarget - name - SDWebImage - productName - SDWebImage - productReference - C5284B0E2549CD42E31F469FB8B92DA8 - productType - com.apple.product-type.library.static + PBXBuildFile + + E5258C3CAC3022F4340281554D8D129B + + fileRef + D194AF2FF06BD3E4F74EE64FF700DAD6 + isa + PBXBuildFile - DF11024BF511A0D2225D4BA84770CED7 + E53153AD4E13D3365961E9BBD1D6ACA4 + includeInIndex + 1 isa PBXFileReference lastKnownFileType - wrapper.framework + sourcecode.c.objc name - Foundation.framework + EXPMatchers+haveCountOf.m path - Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/Foundation.framework + Expecta/Matchers/EXPMatchers+haveCountOf.m sourceTree - DEVELOPER_DIR + <group> + + E5D7FF0D2B8B95459CE85F846F907098 + + buildActionMask + 2147483647 + files + + D8E6736BD1008D08D381612A8AB42AA4 + 5FF3FD3784031603FE65BBE28FBAC449 + 1BD34A41B9EB7A3BF4EAE0E805DC1B2D + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + E63276CA3873172890CD5B2865137970 + + buildActionMask + 2147483647 + files + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 - DFA142DA2A1E6AB454178652BAC9A075 + E7559EE8E94EF4568A698508AB5E5320 includeInIndex 1 @@ -7885,81 +10537,38 @@ lastKnownFileType sourcecode.c.h name - EXPDoubleTuple.h + EXPFloatTuple.h path - Expecta/EXPDoubleTuple.h + Expecta/EXPFloatTuple.h sourceTree <group> - DFAB389ECAD69BF8BE6357CFADABBF5C + E7D2B4B79FD47EAC6865FC0C83827268 fileRef - 9E58B396BFA804075E0FCC2D7E764BA6 + 79A530184801D82737492F32015A008B isa PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - - - DFF580AE359407E841BA8D8DDCE6E299 - - fileRef - ED1EC819236EDC3B337FCB044454FEB6 - isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - - - E06376455C1D5E45B97ACDC5438FC15B - - fileRef - 40DAD22BCDD38D058B1C9A312C42DF49 - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - - E0EBF0357895E0C657A233A9D4D0E2C1 + E7DEC901EF91A68AB312BBC09893E869 - explicitFileType - archive.ar includeInIndex - 0 + 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h name - libPods-MWPhotoBrowser_Tests.a + EXPMatchers+beKindOf.h path - libPods-MWPhotoBrowser_Tests.a + Expecta/Matchers/EXPMatchers+beKindOf.h sourceTree - BUILT_PRODUCTS_DIR - - E127589B46F33617D24F341DBAE1E90D - - fileRef - 571096112AA1AD00C10596D216783599 - isa - PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - + <group> - E145A7E23B46A8C1E1549511735A041D + E867CBF850D20C314BF4BD790432455D fileRef - 69C3D12EC1F2F8AE628C05AC390D9D61 + 2A012232008EE438D13D2498136877EB isa PBXBuildFile settings @@ -7970,56 +10579,53 @@ - E287D744F886B15E1060AFEA475FC727 + E86A65F543DC3CC07C8D01B8642F7363 - fileRef - 4358F868C1553FF4273B0726E5AD2012 + containerPortal + D41D8CD98F00B204E9800998ECF8427E isa - PBXBuildFile + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 2F501FE84845EAD97B9087DAFCBBEE0E + remoteInfo + Expecta - E2EBD18BA89D3FF648947DF31FA12D44 + E8924B4259DE0CC17ED2F67036746C00 + + buildActionMask + 2147483647 + files + + 7188A4ECB571A653271DCB8D7489969F + C6F4A35B7BBD346A41720FAF7C294FD3 + 984644DEF463594AE83296244818496C + + isa + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + E922AE0F12E48E8977454839D564E061 fileRef - 24FAEADA1249F6042B4B4B135CDD0DF9 + B89A61B544CE3A653B8129ECFD996694 isa PBXBuildFile - settings - - COMPILER_FLAGS - -fno-objc-arc - - E2FE87384A67337831E53490EEA8BF11 + EA435551CC148753597DE1E0AF24A77C - buildConfigurationList - 0732716566238BF76BBF762F85C8ABAF - buildPhases - - F90E42BE0540AE823AEBE381B7F2AF8C - 886428740DB164747FBA1935F65900DF - 53FA1A78374A52A66FBFD0691645BCB8 - - buildRules - - dependencies - - D583D511354F609B73EB28F4CFA2C32A - 8EE5D8EDB6C595B190E81B76D3190EB3 - C3D6913F5E4E594A29E40A526602BBB7 - 299B50B04F45E1A2F52075C3B7A1AEB2 - + includeInIndex + 1 isa - PBXNativeTarget - name - MWPhotoBrowser - productName - MWPhotoBrowser - productReference - 50F87BFDC26A0B4CC6DE06D3ACBD0714 - productType - com.apple.product-type.library.static + PBXFileReference + path + UIBarButtonItemGrid.png + sourceTree + <group> - E348B132ABCC246013AE3A5532BC609F + EABDFB8D4ADD0F841ED44A71483A758F includeInIndex 1 @@ -8028,38 +10634,26 @@ lastKnownFileType sourcecode.c.h name - FBSnapshotTestCase.h + SDWebImagePrefetcher.h path - FBSnapshotTestCase/FBSnapshotTestCase.h + SDWebImage/SDWebImagePrefetcher.h sourceTree <group> - E40400D97F14785D20A7A5594F0E2C56 - - fileRef - 1398D1B84667A17FCB66182F776EAC42 - isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - - - E4436D58F27EAC932F3CC2A7619D5FD3 + EB4DE2009B511D62CF6BFE67FA73E321 includeInIndex 1 isa PBXFileReference + lastKnownFileType + text path - ImageSelectedSmallOn@2x.png + Pods-MWPhotoBrowser_Example-acknowledgements.markdown sourceTree <group> - E4AD00C4B132C99837C22CC9031DE9F8 + EB7C443793D663559DECA9726CE6643A includeInIndex 1 @@ -8068,27 +10662,57 @@ lastKnownFileType sourcecode.c.h name - EXPMatchers+beCloseTo.h + SPTExampleGroup.h path - Expecta/Matchers/EXPMatchers+beCloseTo.h + Specta/Specta/SPTExampleGroup.h sourceTree <group> - E54B859019C3D44B55F4723880F93D4D + EB805C04911EB4140BE3233E2BA733F2 fileRef - E7E794ADE2D5267DF8949DD0A42B935B + 061D9DA8C4A4B42AD2BEBF9CCD7791B5 isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - E5EA159155EA435901485FBB8111088C + EBD7ABE276C83631D459932245E75FBB + + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + name + UIView+WebCacheOperation.m + path + SDWebImage/UIView+WebCacheOperation.m + sourceTree + <group> + + EBF38F721EAD01DF913D78AD3EEB86FF + + buildActionMask + 2147483647 + files + + 5FC2F3F7A1FD4521368BF9A756EE527B + A75A6873917B3864E7605B02E33FCD54 + D9981CC619E5A93C4580DC17F742D94E + F44DCAA67F40DA6715D7ABE63ACD3684 + E4371F1778A8001BE32A2FBC2D69F8D3 + 95E9656A1A043C275A8228A3C15FD4C3 + 182FC73128ED60A5BD20F6DD2DD344C5 + 39050F2962622809DD1F0A8A48B6D075 + 0A10354E74CA3CBC8B24036A333FE834 + CA15C33B171378DC59BC0C381A6B478A + + isa + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + EC66025612AB7AF586362D4587912B8D includeInIndex 1 @@ -8096,57 +10720,77 @@ PBXFileReference lastKnownFileType sourcecode.c.h + name + EXPMatchers+endWith.h path - DACircularProgress-prefix.pch + Expecta/Matchers/EXPMatchers+endWith.h sourceTree <group> - E6798A1D89E725C8EB02146EE4B0E31E + EC924E4377BD0648FE0E5D36F63195B6 includeInIndex 1 isa PBXFileReference path - ImageSelectedOff@2x.png + VideoOverlay.png sourceTree <group> - E7B8141DB24F5AA0D1F847AFEC0DB018 + ED8EFFFDC60B478C026582DFA8C38F87 - baseConfigurationReference - 0557FD60A45F62CD51B4972ECE5C2584 - buildSettings + isa + PBXTargetDependency + name + DACircularProgress-iOS7.1 + target + DB44479B27C4E10F763DC6C92B9704CA + targetProxy + 4618D9D72E1A52C1E0009B66D3F8284C + + EE04EE8ADAB8F7DF7FCEFDDD1E801BE6 + + containerPortal + D41D8CD98F00B204E9800998ECF8427E + isa + PBXContainerItemProxy + proxyType + 1 + remoteGlobalIDString + 7D9E32DAA93E15CFCF77A5BCD2D4BAA2 + remoteInfo + FBSnapshotTestCase + + EE52A320EC3155B114104E06396D1B59 + + fileRef + A254E54DD33D0D4AC13B46F55F4A4C5F + isa + PBXBuildFile + settings - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/MBProgressHUD/MBProgressHUD-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MTL_ENABLE_DEBUG_INFO - YES - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES + ATTRIBUTES + + Public + + + EE76F070079F40A7C4D5BF098D2B6C53 + + fileRef + 7C0F08326F5A918F2A311222533EC950 + isa + PBXBuildFile + + EEE46EA5E24C876366488D4996BEBCFE + + fileRef + C4EE2327AA21B56F96948266BEE8B060 isa - XCBuildConfiguration - name - Debug + PBXBuildFile - E7E794ADE2D5267DF8949DD0A42B935B + EEFE1552FA6CB791AF012FE9726274D9 includeInIndex 1 @@ -8154,29 +10798,46 @@ PBXFileReference lastKnownFileType sourcecode.c.h + name + EXPMatchers+contain.h path - UIImage+MWPhotoBrowser.h + Expecta/Matchers/EXPMatchers+contain.h + sourceTree + <group> + + EFF7E02E20A76B9E8BA18B06D1BD1205 + + includeInIndex + 1 + isa + PBXFileReference + path + ImageSelectedOff.png sourceTree <group> - E81C08F5CCC0A5FBFF4559E2173164C7 + F09ED047C3C56D9426E717AFFAA6AFAC buildActionMask 2147483647 files - - 70D801E0B95C23BCC270E4EC8659D463 - 2989492A1A182744E36FD61DF1746D94 - + isa PBXFrameworksBuildPhase runOnlyForDeploymentPostprocessing 0 - E867CBF850D20C314BF4BD790432455D + F0C4A1D9AAF4D688333026F820B3971F fileRef - 05DA7841521B75C4D0C303F32E518117 + E0FF8A55E4FAC77410368EC41E04EDF2 + isa + PBXBuildFile + + F1AD284D2F91BF1258E4DE7E57C1A4D8 + + fileRef + F51C9D7C2B4BBE5F281ECA35EB91B81B isa PBXBuildFile settings @@ -8187,14 +10848,33 @@ - E8709320B1728545E4889D6232A39109 + F1B098D65EBCF5E206531765005B7938 + + fileRef + D0E862B0A7C9ACC538472981D6086B23 + isa + PBXBuildFile + + F1F4E65611F5567A86AF797EAC3E225B + + fileRef + F54EB94D2D16B4CE657FBB2F8A2809AA + isa + PBXBuildFile + settings + + COMPILER_FLAGS + -fno-objc-arc + + + F1FC61509B92BF205721A7A8BF86CAE3 fileRef - 216490FDC8376C36DB920710C65B92F3 + 40BE40DBAFEC3D9E63A756296424F8C3 isa PBXBuildFile - E906DDCC926C2EA5161E326AB04AC53F + F1FF622A2D916131FCDBC6882723CC7E includeInIndex 1 @@ -8203,143 +10883,217 @@ lastKnownFileType sourcecode.c.objc name - EXPBlockDefinedMatcher.m + UIButton+WebCache.m path - Expecta/EXPBlockDefinedMatcher.m + SDWebImage/UIButton+WebCache.m sourceTree <group> - E97CDC7A1DFD18DAAD3C505929F32105 + F218977F348D163003B9995918E4A1BB - fileRef - 9604D510A96A637DD9AE0D304B68A5A2 + includeInIndex + 1 isa - PBXBuildFile + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + EXPMatchers.h + path + Expecta/Matchers/EXPMatchers.h + sourceTree + <group> - E99804B4B10C0A5C7C08E5EF962804CE + F221DBD297FD9AFB5D2A5B9274F4BE43 - fileRef - 0A9B8E3E35177F52A643739AC50B00FA + buildActionMask + 2147483647 + files + + 948F2C926B1B0A6A0D26356FADC771B3 + 6A522FB7AA70859F16C7F4C7F66795E5 + B252E4D519B7D279286493227F739EF5 + isa - PBXBuildFile + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 - E9AAC3590B391F4CFAF5F8348E6A8FE4 + F24AD9E833A80510F4A2C486E1B1390B - buildConfigurationList - F4A25246330C837CF7FB43FCC4E2A63F - buildPhases - - 4C9C7890ED44DBC3090EEDFD92749F0A - 1684C2FDDE674F14B731CC940021D8C6 - 3907B3A4464A3069E24142505C76338D - - buildRules - - dependencies - + fileRef + 3B372ED237C136CF3F8A0CBA70EA987F isa - PBXNativeTarget - name - Specta - productName - Specta - productReference - 7CF892960748F43245AD2B5CD2AC41A5 - productType - com.apple.product-type.library.static + PBXBuildFile - EB4DE2009B511D62CF6BFE67FA73E321 + F261561FF68DDFFE15CD3E85184B80DF includeInIndex 1 isa PBXFileReference lastKnownFileType - text + sourcecode.c.h + name + EXPDefines.h path - Pods-MWPhotoBrowser_Example-acknowledgements.markdown + Expecta/EXPDefines.h sourceTree <group> - EB75F515760C184B2ED65E8649DC5792 + F325026B55060D3B22BEC0BAB5FA7344 - fileRef - 56228B3CBF246784930BFE7B29EFDD04 - isa - PBXBuildFile - settings + buildSettings - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 + ALWAYS_SEARCH_USER_PATHS + NO + CLANG_ANALYZER_NONNULL + YES + CLANG_CXX_LANGUAGE_STANDARD + gnu++0x + CLANG_CXX_LIBRARY + libc++ + CLANG_ENABLE_MODULES + YES + CLANG_ENABLE_OBJC_ARC + YES + CLANG_WARN_BOOL_CONVERSION + YES + CLANG_WARN_CONSTANT_CONVERSION + YES + CLANG_WARN_DIRECT_OBJC_ISA_USAGE + YES + CLANG_WARN_EMPTY_BODY + YES + CLANG_WARN_ENUM_CONVERSION + YES + CLANG_WARN_INT_CONVERSION + YES + CLANG_WARN_OBJC_ROOT_CLASS + YES + CLANG_WARN_UNREACHABLE_CODE + YES + CLANG_WARN__DUPLICATE_METHOD_MATCH + YES + COPY_PHASE_STRIP + YES + ENABLE_NS_ASSERTIONS + NO + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_PREPROCESSOR_DEFINITIONS + + POD_CONFIGURATION_RELEASE=1 + $(inherited) + + GCC_WARN_64_TO_32_BIT_CONVERSION + YES + GCC_WARN_ABOUT_RETURN_TYPE + YES + GCC_WARN_UNDECLARED_SELECTOR + YES + GCC_WARN_UNINITIALIZED_AUTOS + YES + GCC_WARN_UNUSED_FUNCTION + YES + GCC_WARN_UNUSED_VARIABLE + YES + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + STRIP_INSTALLED_PRODUCT + NO + SYMROOT + ${SRCROOT}/../build + VALIDATE_PRODUCT + YES + isa + XCBuildConfiguration + name + Release - EB88EE844F8ADBE7E78B381D8832162D + F35EEBFF3C4E87401FB26B516676CFCF includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc name - EXPMatchers+beFalsy.h + UIImage+MultiFormat.m path - Expecta/Matchers/EXPMatchers+beFalsy.h + SDWebImage/UIImage+MultiFormat.m sourceTree <group> - EC0223776620A3EA741C855D0211CB0A + F37B375C563F1F87382C999BF6A38450 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + sourcecode.c.objc name - SDWebImagePrefetcher.h + MBProgressHUD-iOS7.1-dummy.m path - SDWebImage/SDWebImagePrefetcher.h + ../MBProgressHUD-iOS7.1/MBProgressHUD-iOS7.1-dummy.m sourceTree <group> - EC9E28E1F941952C6708902F41FD209D + F385F52605FA61111578C914763D0C20 + + fileRef + AA15102B006F97F7D2C88A4D2B871A14 + isa + PBXBuildFile + + F3AD53C166BBA373F67EF94C58CD70E6 includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h name - EXPMatchers+beSupersetOf.m + EXPMatchers+beginWith.h path - Expecta/Matchers/EXPMatchers+beSupersetOf.m + Expecta/Matchers/EXPMatchers+beginWith.h sourceTree <group> - ECE81C5981477AA7D254ACC70534BE23 + F3B98D3FA528718F640F975D089E9A0E baseConfigurationReference - 6F1FCA0BD48258CDEC1B14D704BA3E5D + 81CF95A25497BD4688DA1D8BF1FEC75A buildSettings + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf ENABLE_STRICT_OBJC_MSGSEND YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/Specta/Specta-prefix.pch IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MACH_O_TYPE - staticlib + 4.3 MTL_ENABLE_DEBUG_INFO YES OTHER_LDFLAGS OTHER_LIBTOOLFLAGS - PODS_ROOT - $(SRCROOT) + PRIVATE_HEADERS_FOLDER_PATH + PRODUCT_NAME $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + SDKROOT iphoneos SKIP_INSTALL @@ -8350,64 +11104,108 @@ name Debug - ED177B9B7FCFE4E41DCDCCFB49692E1D + F415F451C67C56BD2821DFDC2802FE6C fileRef - 5289709799A254B807701A658BD9D425 + 0AAEE06FB4F7F495B1AAD1EDDEB2E9D2 isa PBXBuildFile - ED1EC819236EDC3B337FCB044454FEB6 + F43D608BBF8155390B5FEE94753DD348 - includeInIndex - 1 + fileRef + 523087C6D186A9F5BEE78D39F9A78F3F isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - EXPMatchers+beLessThan.h - path - Expecta/Matchers/EXPMatchers+beLessThan.h - sourceTree - <group> + PBXBuildFile - EDC1E77817E2D0252126B98EB0206A62 + F44DCAA67F40DA6715D7ABE63ACD3684 fileRef - 46F871A74D831312A633CCFC0A94F75D + D833067C97F24C277CD5F36AC7070DD0 isa PBXBuildFile - EDDE097EFD40E9A4E32E4B44C97CE44B + F4BE7E01BFFF5FB804D67D6D00AA98E6 + + baseConfigurationReference + 6D084FCB5695C1CC9ED017BF5FD93C9B + buildSettings + + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf + ENABLE_STRICT_OBJC_MSGSEND + YES + GCC_NO_COMMON_BLOCKS + YES + GCC_PREFIX_HEADER + Target Support Files/SDWebImage-iOS7.1/SDWebImage-iOS7.1-prefix.pch + IPHONEOS_DEPLOYMENT_TARGET + 7.0 + MTL_ENABLE_DEBUG_INFO + YES + OTHER_LDFLAGS + + OTHER_LIBTOOLFLAGS + + PRIVATE_HEADERS_FOLDER_PATH + + PRODUCT_NAME + $(TARGET_NAME) + PUBLIC_HEADERS_FOLDER_PATH + + SDKROOT + iphoneos + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Debug + + F4BFBC4B5729648485FC77656D89E137 + + buildActionMask + 2147483647 + files + + 7D1D454177DB3A5E19455B97494F6FB2 + 832FA69EBCDEA9EF6B4C3A73A96B187A + F7D8192B932414D557A5272E3EAA7C98 + 7AD81C2E09E2DB55B5ADB2399D44F96E + 2B9B06392F1B8AD1B340079A08C4415D + 45231A1E93E68FE1121A2DA54518EBDF + 7D44008C5BF7FBE3A1356775F129289A + FC639320DDCA59A73A7B01BDFAD06C5E + 33709BECCCA619DFEFBF9EA31B1923E1 + 7C8DC0DEB56BD98D083C73748A9EAA30 + 3E25F187442F409697101FDD868F9F39 + 4C387B267271570F9C5437A1B1D6D9AD + 6913BFE0EE13D6796DAB1C3C1C137FC1 + 9DB2D733B4CBE2C4A5063A8B43775A8F + 3E617CB6BB320DE432F9CD03EFC31A34 + 5D09B8F0D0525328A232EC8FD9806207 + D29BEF4774B4867A0329C9DBEA18F855 + 661EDECC0867122E0FF1D3FC203A4FD3 + + isa + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + F4C603FEA5C044A26E7B67B979AB517D fileRef - 10E446637EC5FF03088009E61B491E75 + 22C88C33F57CF0085CC8A7158F1C7B60 isa PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - - - EE04EE8ADAB8F7DF7FCEFDDD1E801BE6 - - containerPortal - D41D8CD98F00B204E9800998ECF8427E - isa - PBXContainerItemProxy - proxyType - 1 - remoteGlobalIDString - 7D9E32DAA93E15CFCF77A5BCD2D4BAA2 - remoteInfo - FBSnapshotTestCase - EE52A320EC3155B114104E06396D1B59 + F4CA468B5A9F8FF2A4DB8B236A8E71BF fileRef - 809101940909F56A7B70CE17D447640B + E30378296B05F85A162C4AF60A9FC71F isa PBXBuildFile settings @@ -8418,20 +11216,20 @@ - EF1C003613925663F17E023C73AF519C + F4CDA5FA9197A41E0081E84F932906EB - buildActionMask - 2147483647 - files + children - 5EB4F27B76513AE918BA5AE0868E87C8 + 11AE4DAD06780148E606FEE88A7342D2 isa - PBXHeadersBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXGroup + name + Frameworks + sourceTree + <group> - EF4D256729962DC82677BF90E861294B + F51C9D7C2B4BBE5F281ECA35EB91B81B includeInIndex 1 @@ -8439,72 +11237,75 @@ PBXFileReference lastKnownFileType sourcecode.c.h + name + SPTCallSite.h path - MBProgressHUD.h + Specta/Specta/SPTCallSite.h sourceTree <group> - EF5AC1222120F3BAB7481DA9615352B0 + F54EB94D2D16B4CE657FBB2F8A2809AA includeInIndex 1 isa PBXFileReference lastKnownFileType - text.xcconfig + sourcecode.c.objc + name + EXPMatchers+beFalsy.m path - FBSnapshotTestCase.xcconfig + Expecta/Matchers/EXPMatchers+beFalsy.m sourceTree <group> - EF75C10714B7CFF9071553F07D94A550 + F5B318E6604A7D1BA82A4F22B039020E - includeInIndex - 1 + fileRef + 6280459658EF922D585FDFFF8685D623 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - name - SPTTestSuite.h - path - Specta/Specta/SPTTestSuite.h - sourceTree - <group> + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - EF9006327AFFDBED3FD589DA04E2D36A + F5B682A956E9D968F3E186DF43B203D6 fileRef - C655D4974F9982F0810618C9AC07216F + 04969E3FA5A6426CA279D6D6E7FAD408 isa PBXBuildFile settings - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 + ATTRIBUTES + + Public + - EFE77B95F063C96D9B07BC2A988AB403 + F5C6510AA07AF66F5F7347B841677A64 fileRef - 9839B551DAF141B99431C2238C8EEBC0 + 7C0F08326F5A918F2A311222533EC950 isa PBXBuildFile - F0A8CE7CF766D19972CF0934C1652293 + F601833D09980E16136321674463BE81 - buildActionMask - 2147483647 - files - - CA0DFA401B2A45337DFC72F893A060EF - isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXTargetDependency + name + Expecta + target + 2F501FE84845EAD97B9087DAFCBBEE0E + targetProxy + C9B5F86F6244D78D3F80384F609427C6 - F1948E226356BF652752F9FA7317BC73 + F608E555A3767B056A969C7BD7CC4592 includeInIndex 1 @@ -8512,144 +11313,79 @@ PBXFileReference lastKnownFileType sourcecode.c.objc - name - SPTSpec.m path - Specta/Specta/SPTSpec.m + Expecta+Snapshots-dummy.m sourceTree <group> - F1F4E65611F5567A86AF797EAC3E225B + F66C8BD01B8A66DA04A7262AEF20023A fileRef - B0D25391E290ADE1BF90E18B8281F5F3 + 6AD045C441252CE5E582550E42134E86 isa PBXBuildFile settings COMPILER_FLAGS - -fno-objc-arc + -DOS_OBJECT_USE_OBJC=0 - F2168F9F63056AC8BFB344608C4158BE - - fileRef - 3CAA21F3728659DC1B58A336233AEB79 - isa - PBXBuildFile - - F2334A461A36CF285AC6F7E96F8FE0DB + F6C622A56E707FE440C99AF4ABD18859 + explicitFileType + archive.ar includeInIndex - 1 + 0 isa PBXFileReference + name + libMBProgressHUD-iOS7.0.a path - ImageSelectedOn.png + libMBProgressHUD-iOS7.0.a sourceTree - <group> + BUILT_PRODUCTS_DIR - F26631BB63543446C157972F2F6D1475 + F6EA94AE372FB813AB5CF80B23E506F2 fileRef - F2334A461A36CF285AC6F7E96F8FE0DB + 60D0F9290B4BECDD4224D58D24A7C6E9 isa PBXBuildFile - F2A9AAC03867BB4990470BAC5912E030 - - buildActionMask - 2147483647 - files - - 53FB0CBA14BE53F79F4EB4E7B46C523B - 072C184628072EDE522629576F1716DE - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - F2BDF8E898C762EFB3844211CE201024 - - buildActionMask - 2147483647 - files - - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - F2F5671C4613023EE94A2E62DA06031D - - buildConfigurations - - E7B8141DB24F5AA0D1F847AFEC0DB018 - C5AFFFCB54FD9036E7BC9BA54ADAAF30 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release - isa - XCConfigurationList - - F314DFE6C76A8EEBC3D8CAF03EB89850 + F70918D6E7628D3C76D084AD003CDF42 fileRef - 75F83323F205A277BEC18AABDA0FA739 + 2175A32C1039DDFCDA53B27892268F1A isa PBXBuildFile - F3BB0A963277282C6BF73E81250B6943 + F7D8192B932414D557A5272E3EAA7C98 fileRef - 38777F32EB3F13ED8D2047C1C9ED6D6D + 3F184CBBBB01F076EBB11C58EBF9881D isa PBXBuildFile - settings - - COMPILER_FLAGS - -DOS_OBJECT_USE_OBJC=0 - - F3FAB75D28A2755E4F9F79FB9F2AF5DB + F7DEF7616D85017E8FF321B491D386E6 - includeInIndex - 1 + fileRef + 79A530184801D82737492F32015A008B isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - SpectaDSL.m - path - Specta/Specta/SpectaDSL.m - sourceTree - <group> + PBXBuildFile - F40AD0DE1188AA331D98100B8766D6C8 + F849D405530B9B83168910A547B50F18 - includeInIndex - 1 + fileRef + BB920EC5877ECE3C5E5ADEFA16287551 isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - EXPMatchers+beLessThan.m - path - Expecta/Matchers/EXPMatchers+beLessThan.m - sourceTree - <group> + PBXBuildFile - F4A25246330C837CF7FB43FCC4E2A63F + F940708FEFF0BA2DBB60666C0F6A86F8 buildConfigurations - 1C1837DF96AE65F662773DF1956BFF09 - 04D4EDE1F05B96EE8BB9DCD368608620 + F3B98D3FA528718F640F975D089E9A0E + 0547B8EEB092A5919CE72466F49A0795 defaultConfigurationIsVisible 0 @@ -8658,232 +11394,135 @@ isa XCConfigurationList - F4CA468B5A9F8FF2A4DB8B236A8E71BF + F99D2A2FBDEC67C1E6C7E82C82B8E912 - fileRef - EB88EE844F8ADBE7E78B381D8832162D isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - + PBXTargetDependency + name + SDWebImage-iOS7.0 + target + CF95A047032EA05133C18EC3592E0E61 + targetProxy + C1D5F73734C071946CE4C1C3FEB2D566 - F4CDA5FA9197A41E0081E84F932906EB + F9C33F916FAEBB4445F3DA72F9523891 - children + buildActionMask + 2147483647 + files - D351C08D4390F427D8E1BEC3CB8A57BD + BE44E030D3B992226EEE8606576B691F + 3E6E2DB1D748E950C58BC5DA603CFE46 + 9FE560DD0BFBD00C19CCFDF08ACC2E3C + F0C4A1D9AAF4D688333026F820B3971F + F24AD9E833A80510F4A2C486E1B1390B + B23DC086942C02E497A40BE80166F4BA + 361EBF2070C5609958789A14E4A19248 + 1F1DDDC0D20B580AE127BB14B43C9BEA + AA3068F1DAC032F7293CBD24BC0C2F67 + 6381023275C6E39FF5BBFE8D0F9453E5 + 01B7F50C8A337E0862AE5E9DE45812CE + A3BCFF3925A1292E840FD688DA48694B + 32911CAF3E3471264803FEF3AABBA593 + 23F2F6A956EBE8B58AD50C1BE73FC4A5 + 3E5AC872152DF853E27229DD9C7E1DDE + 4EB5491EF17DC872964D855B4BE9048A + DC1E827E82EB21B873C84ACA7124EAD0 + 7A665AEF2BE41C7F23633A96B8547F77 isa - PBXGroup - name - Frameworks - sourceTree - <group> + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 - F5551459CFCB6B7914E9EC1783277D94 + FA38423F69FCFAB5130683CE16AFFA83 - includeInIndex - 1 + fileRef + EC924E4377BD0648FE0E5D36F63195B6 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - Expecta+Snapshots-prefix.pch - sourceTree - <group> + PBXBuildFile - F5963246D32249D4D198CE8A36B4DD12 + FA7B80D1B352FF18033709C9EF8533DC + explicitFileType + archive.ar includeInIndex - 1 + 0 isa PBXFileReference - lastKnownFileType - sourcecode.c.h name - EXPMatchers+raiseWithReason.h + libMWPhotoBrowser-iOS7.0.a path - Expecta/Matchers/EXPMatchers+raiseWithReason.h + libMWPhotoBrowser-iOS7.0.a sourceTree - <group> + BUILT_PRODUCTS_DIR - F5F4D07451FB3E10EE7C16A83010425F + FA8AD7CB7B01BC8438279B0042B9E43F fileRef - DF11024BF511A0D2225D4BA84770CED7 + D2D6B98D555A2768E2760397A4145753 isa PBXBuildFile - F601833D09980E16136321674463BE81 - - isa - PBXTargetDependency - name - Expecta - target - 2F501FE84845EAD97B9087DAFCBBEE0E - targetProxy - C9B5F86F6244D78D3F80384F609427C6 - - F6045A7604731086F9E1A9412E290302 + FAB2C715AB1CECBF81C21D4FA9071B49 - baseConfigurationReference - FAF77DDAA41AC524C38F1D92F2EE01AB - buildSettings - - ENABLE_STRICT_OBJC_MSGSEND - YES - GCC_PREFIX_HEADER - Target Support Files/Expecta+Snapshots/Expecta+Snapshots-prefix.pch - IPHONEOS_DEPLOYMENT_TARGET - 7.0 - MTL_ENABLE_DEBUG_INFO - YES - OTHER_LDFLAGS - - OTHER_LIBTOOLFLAGS - - PRIVATE_HEADERS_FOLDER_PATH - - PRODUCT_NAME - $(TARGET_NAME) - PUBLIC_HEADERS_FOLDER_PATH - - SDKROOT - iphoneos - SKIP_INSTALL - YES - + includeInIndex + 1 isa - XCBuildConfiguration - name - Debug + PBXFileReference + path + VideoOverlay@3x.png + sourceTree + <group> - F629BC640170D45C22A8048A42BAB040 + FABC12E2041BC3DC98A81A08158D56DC - children - - 37E4F69B3E6AFDEE8D68A3430CEC8BF5 - 40D39B6435EEF47A85F4E3FB684E72FE - 60ECF290B248258F453088B6258302E6 - C655D4974F9982F0810618C9AC07216F - DDAA00E6C2E81A6C35534DD632143F09 - + includeInIndex + 1 isa - PBXGroup + PBXFileReference + lastKnownFileType + sourcecode.c.objc name - DACircularProgress + EXPMatchers+beGreaterThan.m path - DACircularProgress + Expecta/Matchers/EXPMatchers+beGreaterThan.m sourceTree <group> - F6E655732BA75BED75FFACA472080CC4 + FB6ADEE24FB07E1430D11EDF1F4C7636 - children - - 0A924BC847BA99EBCBD0588603448B05 - E906DDCC926C2EA5161E326AB04AC53F - 7AAD7709C9FF6828905D6A28E69C4221 - DFA142DA2A1E6AB454178652BAC9A075 - D70BED84191514A998A08D7F3B8BBB17 - BA9D20AF1E1E4CF225AA2D772049336D - 1D536F869C3B7D603AC4630F3F6AB919 - 3DEC242716623D70F4CC9F4A1D32805C - D09A95F4452843967F4C8F3FA5EC1A68 - 4BE4F23029A1EDB234CF7F2AEB043EB0 - 3E7FFEF7BFB0350CE8FCC2D6D64D1396 - 92F064516748B6AA4C6E303A38C3FE6A - 8136A5BFC35DA48ABC2C0D94EA79B7F0 - 15082EF0D1C2F7B77B63E0116BDA622C - 700F6F4AFED22AEAA1D8943236F94924 - 79996E262256F57DB50CD16E5EBE5D52 - 232510EC13760470E86AABE302EF2B8E - 6ED6BE9A61002A3AF6D4C834E2277D8C - E4AD00C4B132C99837C22CC9031DE9F8 - D68BA9A93FD415E751DFA95CCF7DCB8D - EB88EE844F8ADBE7E78B381D8832162D - B0D25391E290ADE1BF90E18B8281F5F3 - DA7F16221783A03C084D9BAAF7F404DB - 1BB15402D8C2FB01A198273BA1991DED - 0683DF2C9B7FC27B576AB4B7B3B146ED - 7DACEAF8582049D6EB8B4CFFB6CA48CD - B5969E17FAFFDC548233DC602AAC6211 - AE917511985F6891AF3F8233B9D34001 - 2E7CBF297AA8A0E93C23BFAF1BE94DEE - 1AB26E75F7BCD415D6AD6B8BA5F03DDB - 3C5A51B8AE7322A210CF01AFBA648598 - 44D0D04C0DF98EC05B4909F397D6F7FF - 862018A7CC10880108A2BDC5146C8F3F - F9B2375A6E20F2774E7B3F08FB92909E - 29E6F040DB8ACF8886F7FE628840C480 - 3173089CCB6C063D260C58DD7BA3ABF5 - ED1EC819236EDC3B337FCB044454FEB6 - F40AD0DE1188AA331D98100B8766D6C8 - 809101940909F56A7B70CE17D447640B - 746A80915CF52BE732D200BAA851FBAB - 2779B434631901F1434BC316E3FB5AE9 - 40DAD22BCDD38D058B1C9A312C42DF49 - 71865C216F48AC822D486C8D9B03B13C - 0AB1B49E98BEDDFC8A45BB3C1FB54076 - 9A9B45D988FA49FD87F8587C42403EC5 - EC9E28E1F941952C6708902F41FD209D - 10E68FD4A81F628778B6A4992DB9D952 - C2CEB9C1175C4FC4D5BE5C6EF285E0A4 - FDE2A8151D1FDB6749FB32276220BE7C - 63010FB3922AB3E2DDD6D8CDD2D10BFA - 981F3EB0C06E97770D2421E673B013A1 - 9D5AE460F3B78B02A8AE8E5AD0DCC013 - 567A47FABAD9EE8B7DF32295CC53F937 - 56BD615DEEA3BC153C0B73BAC8A60A13 - D10BA2216A9B5F41557B4FC448EE865C - 70922EF029715CA28E814F87373F29C4 - AB8960E6933BD274C11AD9C15CF410AF - 6CF3D336192327338965DC88856BDFCF - 79D73FB4B6A3C92513B81243EA72E78C - 7250BEF99A7686EAB50B17986FDCED3E - 5F878B29A406784703BC9F07FBFDD99F - 3DA2CF997A09E53F375CF0DEEF25AFCF - B2CBEFFA54424B8FBBE1EB23EC879E69 - 788D548DE837CA2FA9D2D744D64FA847 - F5963246D32249D4D198CE8A36B4DD12 - FFC94BC21DE6B02A85C4BA9B703D222D - 05DA7841521B75C4D0C303F32E518117 - 24FAEADA1249F6042B4B4B135CDD0DF9 - 865FAF448207E691D600F40C4ACF7C58 - B23D9E49B5B3A5C76EAFFC9C7F40B4B9 - 66D391F04A8D672C0D42510DE811E7B2 - 18391089432560093C31CCA48ABB46AE - 5A06D9F124A077FE3345C713135D7E6C - 4209F7E4332FDC16B4C407CA07C3E8E8 - + includeInIndex + 1 isa - PBXGroup + PBXFileReference + lastKnownFileType + sourcecode.c.h name - Expecta + DACircularProgressView.h path - Expecta + DACircularProgress/DACircularProgressView.h sourceTree <group> - F84C57B89A97BB8108482354FFD8E157 + FBCEC5C8B899A450BBC3A217E518522C baseConfigurationReference - 86A1ADA0F8A843FA09BFF9142BEF76D5 + 4C9B4AA5421E244A92A44DC30389504F buildSettings + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf ENABLE_STRICT_OBJC_MSGSEND YES + GCC_NO_COMMON_BLOCKS + YES GCC_PREFIX_HEADER Target Support Files/Expecta/Expecta-prefix.pch IPHONEOS_DEPLOYMENT_TARGET - 7.0 + 5.1.1 MTL_ENABLE_DEBUG_INFO YES OTHER_LDFLAGS @@ -8906,39 +11545,10 @@ name Debug - F88B870D7D0531FB54EAD23EB162DB70 - - fileRef - 8DC04A9EEA14F0D2300FB6C0CAEB9CAB - isa - PBXBuildFile - - F90E42BE0540AE823AEBE381B7F2AF8C - - buildActionMask - 2147483647 - files - - 453678659359A72C87495DDD6D9BD0C6 - C5BD0A3729BF33E203724A88CFE727BC - A0BA05DFEF00406DC4E8898D36D7418D - CF37F67F6269058934EB779D902EE7AB - 1A0D2B172232171C3EB6DC4DFE575EE7 - 6EEA87D8E87914D02AA319693371EE2C - E8709320B1728545E4889D6232A39109 - 5023A97277B66BB3E83DA779FEBAE80C - D7A0524D2A055F825B4DF69A9DBBFF98 - ED177B9B7FCFE4E41DCDCCFB49692E1D - - isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - F9B0A541E338684F945B7539D802CF64 + FC0C98024FCCCF6BC9A914BD8C6ADE45 fileRef - 1A1E8E8494B9BFCEBBD8273148D44386 + D0F3E73DC78D3A2AF2AD0A475F906FD9 isa PBXBuildFile settings @@ -8949,45 +11559,10 @@ - F9B2375A6E20F2774E7B3F08FB92909E - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - name - EXPMatchers+beInTheRangeOf.m - path - Expecta/Matchers/EXPMatchers+beInTheRangeOf.m - sourceTree - <group> - - FAC85E18FE868D87FFB2E13C182F4DB9 - - fileRef - C9BF70FB69B8740763B185C23C560434 - isa - PBXBuildFile - - FAF77DDAA41AC524C38F1D92F2EE01AB - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - text.xcconfig - path - Expecta+Snapshots.xcconfig - sourceTree - <group> - - FB42B2F11B39412F3015A082008F1782 + FC1685015E9889DF9FD8ED7AE1DC176F fileRef - AE6C39B87AE391EC710DA8FB520ED3F5 + DE88F9E71ECFEEE995CE8220E301E8ED isa PBXBuildFile settings @@ -8998,67 +11573,73 @@ - FBADF2C12D471003AEB710314DA3FF49 + FC639320DDCA59A73A7B01BDFAD06C5E + + fileRef + CDA05C21D41229CCF5EF9D5971E53D12 + isa + PBXBuildFile + + FC6BD7BAB523ADDB0E77B78521F26AF4 fileRef - 28A20AE3D7A1F50CAD0D9D8B71205EC6 + B0AD4D3FD51000868948132517923991 isa PBXBuildFile - FC1172043A5F0542D166D63AE9EBC260 + FC71886B99B9318A86175962CC5851BA includeInIndex 1 isa PBXFileReference lastKnownFileType - sourcecode.c.objc + sourcecode.c.h + name + SPTExample.h path - MBProgressHUD-dummy.m + Specta/Specta/SPTExample.h sourceTree <group> - FC1FB976E1C29A75089D2374BDFCCC44 + FC80BCD11371A5C912F3A6FAF8848F75 - fileRef - C36BB9623ECA2B27942B66986A784EC9 isa - PBXBuildFile + PBXTargetDependency + name + MBProgressHUD-iOS7.1 + target + 312F48D37605F7A2FAFBF1F2AD9B19A7 + targetProxy + A497B424CF85B5330F0C28E38CC5EB8E - FC214077677D4F02E03C6C85F774E028 + FCAC10C76A9FA8252DB6FAEAB12A88F4 fileRef - FC1172043A5F0542D166D63AE9EBC260 + DF08D341B4BEA29674FCBC8D1259E685 isa PBXBuildFile - FCA01B035C5FC9AF0969977B2C54A7A9 - - includeInIndex - 1 - isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - MWGridCell.m - sourceTree - <group> - - FD6FA76757975A1FC954269CE5739798 + FD44049114F7EC3365B9C6D694EA162A baseConfigurationReference - EF5AC1222120F3BAB7481DA9615352B0 + 6D084FCB5695C1CC9ED017BF5FD93C9B buildSettings + CODE_SIGN_IDENTITY[sdk=iphoneos*] + iPhone Developer + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym ENABLE_STRICT_OBJC_MSGSEND YES + GCC_NO_COMMON_BLOCKS + YES GCC_PREFIX_HEADER - Target Support Files/FBSnapshotTestCase/FBSnapshotTestCase-prefix.pch + Target Support Files/SDWebImage-iOS7.1/SDWebImage-iOS7.1-prefix.pch IPHONEOS_DEPLOYMENT_TARGET 7.0 MTL_ENABLE_DEBUG_INFO - YES + NO OTHER_LDFLAGS OTHER_LIBTOOLFLAGS @@ -9077,9 +11658,37 @@ isa XCBuildConfiguration name - Debug + Release + + FD5065F4D9DB691DB9D50D88D9A7A8E7 + + fileRef + B8CB2EB954E316B2E45D2F5DE9F3895B + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + FD85A0FD46C5BC9071164818E771DB03 + + fileRef + DE54C3C91B980435BD044A42FD71152A + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - FDE2A8151D1FDB6749FB32276220BE7C + FD97BD7042E61F5298DA2ABBC1AA143D includeInIndex 1 @@ -9088,60 +11697,62 @@ lastKnownFileType sourcecode.c.h name - EXPMatchers+conformTo.h + UIView+WebCacheOperation.h path - Expecta/Matchers/EXPMatchers+conformTo.h + SDWebImage/UIView+WebCacheOperation.h sourceTree <group> - FDEE1AFEA9C68977819B7D652EE1F6F2 + FDF72740DBC37AFACFED73ED42282383 - children - - 362D9038C23D156F9F055EDF5565A5F1 - + fileRef + 5F87DBE7A03F8F1C3CEA6A92B390BB1B isa - PBXGroup - name - Pod - path - Pod - sourceTree - <group> + PBXBuildFile - FDF72740DBC37AFACFED73ED42282383 + FE0EE15B47DE4A629F70C92336E6A9B0 fileRef - A6A21F67B2A713138BF1A404E3460084 + 04359FC2EA7B7CE174FC15886814B0F5 isa PBXBuildFile + settings + + ATTRIBUTES + + Public + + - FE2F1D7B9D9FCEA148517E4657B243F4 + FEEB98AD4249D4B4D083774331737097 - buildConfigurationList - F2F5671C4613023EE94A2E62DA06031D - buildPhases - - 098439AB598DDF1AF51146A2E3E2E562 - E81C08F5CCC0A5FBFF4559E2173164C7 - EF1C003613925663F17E023C73AF519C - - buildRules - - dependencies - + fileRef + BF29141D751888DFCD02AC4659C5B58F isa - PBXNativeTarget - name - MBProgressHUD - productName - MBProgressHUD - productReference - D7F1441E30E059AC17B4C1CE1464C07B - productType - com.apple.product-type.library.static + PBXBuildFile + settings + + ATTRIBUTES + + Public + + - FE4A445C1692178764D9C71EAC64ABAC + FF17563EFAC8E049E7A73B79744EF5CB + + fileRef + 1331B671ACD38C99B153E679E3BD2947 + isa + PBXBuildFile + settings + + ATTRIBUTES + + Public + + + + FF1B1008F0BA28E26618F2C3DC0F898E containerPortal D41D8CD98F00B204E9800998ECF8427E @@ -9154,49 +11765,42 @@ remoteInfo Expecta+Snapshots - FE9D7A964178EF6E3CE5FC52134DF825 + FF45457A6D21020295150867C0C55328 - includeInIndex - 1 + children + + 7D7AD40D1D66D64A03EF0BB0DC1B5846 + isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc + PBXGroup name - UIImage+MultiFormat.m + Pod path - SDWebImage/UIImage+MultiFormat.m + Pod sourceTree <group> - FEFA85FDDB15B89CF28DF12C1C2071E1 + FF95F7794E2B33B14E41289C208DC156 fileRef - 1EF011C5AA1726984A1B50A46191CE9B + EA435551CC148753597DE1E0AF24A77C isa PBXBuildFile - settings - - ATTRIBUTES - - Public - - - FF6817E7D2D11A6D747BFAEA934D0FD1 + FFAB91B4F1055B6437303E38C104E6A0 - containerPortal - D41D8CD98F00B204E9800998ECF8427E - isa - PBXContainerItemProxy - proxyType + includeInIndex 1 - remoteGlobalIDString - FE2F1D7B9D9FCEA148517E4657B243F4 - remoteInfo - MBProgressHUD + isa + PBXFileReference + lastKnownFileType + sourcecode.c.objc + path + MBProgressHUD-iOS7.0-dummy.m + sourceTree + <group> - FFC94BC21DE6B02A85C4BA9B703D222D + FFCF2C3F17C8514584FCC49E473C2F09 includeInIndex 1 @@ -9205,26 +11809,12 @@ lastKnownFileType sourcecode.c.objc name - EXPMatchers+raiseWithReason.m + EXPMatchers+postNotification.m path - Expecta/Matchers/EXPMatchers+raiseWithReason.m + Expecta/Matchers/EXPMatchers+postNotification.m sourceTree <group> - FFF549D1FBC0937A99BED40CC44BC155 - - fileRef - C266061F84E4CFB93AF99D21EEB13401 - isa - PBXBuildFile - settings - - ATTRIBUTES - - Public - - - rootObject D41D8CD98F00B204E9800998ECF8427E diff --git a/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a62..000000000 --- a/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/MWPhotoBrowser.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/MWPhotoBrowser.xcscheme deleted file mode 100644 index a0b093cf0..000000000 --- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/MWPhotoBrowser.xcscheme +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-MWPhotoBrowser_Example-MWPhotoBrowser-MWPhotoBrowser.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-MWPhotoBrowser_Example-MWPhotoBrowser-MWPhotoBrowser.xcscheme deleted file mode 100644 index 7c93849f9..000000000 --- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-MWPhotoBrowser_Example-MWPhotoBrowser-MWPhotoBrowser.xcscheme +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-MWPhotoBrowser_Example-MWPhotoBrowser.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-MWPhotoBrowser_Example-MWPhotoBrowser.xcscheme deleted file mode 100644 index 6087f8b6d..000000000 --- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-MWPhotoBrowser_Example-MWPhotoBrowser.xcscheme +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-MWPhotoBrowser_Tests-MWPhotoBrowser-MWPhotoBrowser.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-MWPhotoBrowser_Tests-MWPhotoBrowser-MWPhotoBrowser.xcscheme deleted file mode 100644 index 9ab515f1f..000000000 --- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-MWPhotoBrowser_Tests-MWPhotoBrowser-MWPhotoBrowser.xcscheme +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-MWPhotoBrowser_Tests-MWPhotoBrowser.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-MWPhotoBrowser_Tests-MWPhotoBrowser.xcscheme deleted file mode 100644 index 9d0037e4d..000000000 --- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-MWPhotoBrowser_Tests-MWPhotoBrowser.xcscheme +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Example/Pods/SDWebImage/LICENSE b/Example/Pods/SDWebImage/LICENSE index ae783e175..810cf88a0 100644 --- a/Example/Pods/SDWebImage/LICENSE +++ b/Example/Pods/SDWebImage/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2009 Olivier Poitrey +Copyright (c) 2016 Olivier Poitrey rs@dailymotion.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Example/Pods/SDWebImage/README.md b/Example/Pods/SDWebImage/README.md index 62628f99c..e6214543c 100644 --- a/Example/Pods/SDWebImage/README.md +++ b/Example/Pods/SDWebImage/README.md @@ -1,185 +1,99 @@ -Web Image -========= +

+ +

+ + [![Build Status](http://img.shields.io/travis/rs/SDWebImage/master.svg?style=flat)](https://travis-ci.org/rs/SDWebImage) [![Pod Version](http://img.shields.io/cocoapods/v/SDWebImage.svg?style=flat)](http://cocoadocs.org/docsets/SDWebImage/) [![Pod Platform](http://img.shields.io/cocoapods/p/SDWebImage.svg?style=flat)](http://cocoadocs.org/docsets/SDWebImage/) [![Pod License](http://img.shields.io/cocoapods/l/SDWebImage.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0.html) -[![Dependency Status](https://www.versioneye.com/objective-c/sdwebimage/3.3/badge.svg?style=flat)](https://www.versioneye.com/objective-c/sdwebimage/3.3) +[![Dependency Status](https://www.versioneye.com/objective-c/sdwebimage/badge.svg?style=flat)](https://www.versioneye.com/objective-c/sdwebimage) [![Reference Status](https://www.versioneye.com/objective-c/sdwebimage/reference_badge.svg?style=flat)](https://www.versioneye.com/objective-c/sdwebimage/references) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/rs/SDWebImage) +[![codecov](https://codecov.io/gh/rs/SDWebImage/branch/master/graph/badge.svg)](https://codecov.io/gh/rs/SDWebImage) -This library provides a category for UIImageView with support for remote images coming from the web. - -It provides: - -- An `UIImageView` category adding web image and cache management to the Cocoa Touch framework -- An asynchronous image downloader -- An asynchronous memory + disk image caching with automatic cache expiration handling -- Animated GIF support -- WebP format support -- A background image decompression -- A guarantee that the same URL won't be downloaded several times -- A guarantee that bogus URLs won't be retried again and again -- A guarantee that main thread will never be blocked -- Performances! -- Use GCD and ARC -- Arm64 support - -NOTE: The version 3.0 of SDWebImage isn't fully backward compatible with 2.0 and requires iOS 5.1.1 -minimum deployment version. If you need iOS < 5.0 support, please use the last [2.0 version](https://github.com/rs/SDWebImage/tree/2.0-compat). - -[How is SDWebImage better than X?](https://github.com/rs/SDWebImage/wiki/How-is-SDWebImage-better-than-X%3F) - -Who Use It ----------- - -Find out [who uses SDWebImage](https://github.com/rs/SDWebImage/wiki/Who-Uses-SDWebImage) and add your app to the list. - -How To Use ----------- +This library provides an async image downloader with cache support. For convenience, we added categories for UI elements like `UIImageView`, `UIButton`, `MKAnnotationView`. -API documentation is available at [CocoaDocs - SDWebImage](http://cocoadocs.org/docsets/SDWebImage/) +## Features -### Using UIImageView+WebCache category with UITableView +- [x] Categories for `UIImageView`, `UIButton`, `MKAnnotationView` adding web image and cache management +- [x] An asynchronous image downloader +- [x] An asynchronous memory + disk image caching with automatic cache expiration handling +- [x] A background image decompression +- [x] A guarantee that the same URL won't be downloaded several times +- [x] A guarantee that bogus URLs won't be retried again and again +- [x] A guarantee that main thread will never be blocked +- [x] Performances! +- [x] Use GCD and ARC -Just #import the UIImageView+WebCache.h header, and call the sd_setImageWithURL:placeholderImage: -method from the tableView:cellForRowAtIndexPath: UITableViewDataSource method. Everything will be -handled for you, from async downloads to caching management. +## Supported Image Formats -```objective-c -#import +- Image formats supported by UIImage (JPEG, PNG, ...), including GIF +- WebP format, including animated WebP (use the `WebP` subspec) -... +## Requirements -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - static NSString *MyIdentifier = @"MyIdentifier"; +- iOS 7.0 or later +- tvOS 9.0 or later +- watchOS 2.0 or later +- OS X 10.8 or later +- Xcode 7.3 or later - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:MyIdentifier]; - if (cell == nil) { - cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault - reuseIdentifier:MyIdentifier] autorelease]; - } +#### Backwards compatibility - // Here we use the new provided sd_setImageWithURL: method to load the web image - [cell.imageView sd_setImageWithURL:[NSURL URLWithString:@"http://www.domain.com/path/to/image.jpg"] - placeholderImage:[UIImage imageNamed:@"placeholder.png"]]; - - cell.textLabel.text = @"My Text"; - return cell; -} -``` - -### Using blocks - -With blocks, you can be notified about the image download progress and whenever the image retrieval -has completed with success or not: - -```objective-c -// Here we use the new provided sd_setImageWithURL: method to load the web image -[cell.imageView sd_setImageWithURL:[NSURL URLWithString:@"http://www.domain.com/path/to/image.jpg"] - placeholderImage:[UIImage imageNamed:@"placeholder.png"] - completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - ... completion code here ... - }]; -``` +- For iOS 5 and 6, use [any 3.x version up to 3.7.6](https://github.com/rs/SDWebImage/tree/3.7.6) +- For iOS < 5.0, please use the last [2.0 version](https://github.com/rs/SDWebImage/tree/2.0-compat). -Note: neither your success nor failure block will be call if your image request is canceled before completion. +## Getting Started -### Using SDWebImageManager +- Read this Readme doc +- Read the [How to use section](https://github.com/rs/SDWebImage#how-to-use) +- Read the [documentation @ CocoaDocs](http://cocoadocs.org/docsets/SDWebImage/) +- Read [How is SDWebImage better than X?](https://github.com/rs/SDWebImage/wiki/How-is-SDWebImage-better-than-X%3F) +- Try the example by downloading the project from Github or even easier using CocoaPods try `pod try SDWebImage` +- Get to the [installation steps](https://github.com/rs/SDWebImage#installation) +- Read the [SDWebImage 4.0 Migration Guide](Docs/SDWebImage-4.0-Migration-guide.md) to get an idea of the changes from 3.x to 4.x -The SDWebImageManager is the class behind the UIImageView+WebCache category. It ties the -asynchronous downloader with the image cache store. You can use this class directly to benefit -from web image downloading with caching in another context than a UIView (ie: with Cocoa). +## Who Uses It +- Find out [who uses SDWebImage](https://github.com/rs/SDWebImage/wiki/Who-Uses-SDWebImage) and add your app to the list. -Here is a simple example of how to use SDWebImageManager: +## Communication -```objective-c -SDWebImageManager *manager = [SDWebImageManager sharedManager]; -[manager downloadImageWithURL:imageURL - options:0 - progress:^(NSInteger receivedSize, NSInteger expectedSize) { - // progression tracking code - } - completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { - if (image) { - // do something with image - } - }]; -``` +- If you **need help**, use [Stack Overflow](http://stackoverflow.com/questions/tagged/sdwebimage). (Tag 'sdwebimage') +- If you'd like to **ask a general question**, use [Stack Overflow](http://stackoverflow.com/questions/tagged/sdwebimage). +- If you **found a bug**, open an issue. +- If you **have a feature request**, open an issue. +- If you **want to contribute**, submit a pull request. -### Using Asynchronous Image Downloader Independently +## Installation -It's also possible to use the async image downloader independently: +## How To Use ```objective-c -SDWebImageDownloader *downloader = [SDWebImageDownloader sharedDownloader]; -[downloader downloadImageWithURL:imageURL - options:0 - progress:^(NSInteger receivedSize, NSInteger expectedSize) { - // progression tracking code - } - completed:^(UIImage *image, NSData *data, NSError *error, BOOL finished) { - if (image && finished) { - // do something with image - } - }]; -``` - -### Using Asynchronous Image Caching Independently +Objective-C: -It is also possible to use the async based image cache store independently. SDImageCache -maintains a memory cache and an optional disk cache. Disk cache write operations are performed -asynchronous so it doesn't add unnecessary latency to the UI. - -The SDImageCache class provides a singleton instance for convenience but you can create your own -instance if you want to create separated cache namespace. - -To lookup the cache, you use the `queryDiskCacheForKey:done:` method. If the method returns nil, it means the cache -doesn't currently own the image. You are thus responsible for generating and caching it. The cache -key is an application unique identifier for the image to cache. It is generally the absolute URL of -the image. - -```objective-c -SDImageCache *imageCache = [[SDImageCache alloc] initWithNamespace:@"myNamespace"]; -[imageCache queryDiskCacheForKey:myCacheKey done:^(UIImage *image) { - // image is not nil if image was found -}]; +#import +... +[imageView sd_setImageWithURL:[NSURL URLWithString:@"http://www.domain.com/path/to/image.jpg"] + placeholderImage:[UIImage imageNamed:@"placeholder.png"]]; ``` -By default SDImageCache will lookup the disk cache if an image can't be found in the memory cache. -You can prevent this from happening by calling the alternative method `imageFromMemoryCacheForKey:`. +```swift +Swift: -To store an image into the cache, you use the storeImage:forKey: method: +@import SDWebImage -```objective-c -[[SDImageCache sharedImageCache] storeImage:myImage forKey:myCacheKey]; +imageView.sd_setImage(with: URL(string: "http://www.domain.com/path/to/image.jpg"), placeholderImage: UIImage(named: "placeholder.png")) ``` -By default, the image will be stored in memory cache as well as on disk cache (asynchronously). If -you want only the memory cache, use the alternative method storeImage:forKey:toDisk: with a negative -third argument. +- For details about how to use the library and clear examples, see [The detailed How to use](Docs/HowToUse.md) -### Using cache key filter - -Sometime, you may not want to use the image URL as cache key because part of the URL is dynamic -(i.e.: for access control purpose). SDWebImageManager provides a way to set a cache key filter that -takes the NSURL as input, and output a cache key NSString. - -The following example sets a filter in the application delegate that will remove any query-string from -the URL before to use it as a cache key: - -```objective-c -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - SDWebImageManager.sharedManager.cacheKeyFilter = ^(NSURL *url) { - url = [[NSURL alloc] initWithScheme:url.scheme host:url.host path:url.path]; - return [url absoluteString]; - }; - - // Your app init code... - return YES; -} -``` +## Animated Images (GIF) support +- Starting with the 4.0 version, we rely on [FLAnimatedImage](https://github.com/Flipboard/FLAnimatedImage) to take care of our animated images. +- To use it, simply make sure you use `FLAnimatedImageView` instead of `UIImageView`. +- **Note**: there is a backwards compatible feature, so if you are still trying to load a GIF into a `UIImageView`, it will only show the 1st frame as a static image. +- **Important**: FLAnimatedImage only works on the iOS platform, so for all the other platforms (OS X, tvOS, watchOS) we will fallback to the backwards compatibility feature described above Common Problems --------------- @@ -201,21 +115,31 @@ If you don't control the image server you're using, you may not be able to chang ``` objective-c [imageView sd_setImageWithURL:[NSURL URLWithString:@"https://graph.facebook.com/olivier.poitrey/picture"] - placeholderImage:[UIImage imageNamed:@"avatar-placeholder.png"] - options:SDWebImageRefreshCached]; + placeholderImage:[UIImage imageNamed:@"avatar-placeholder.png"] + options:SDWebImageRefreshCached]; ``` ### Add a progress indicator -See this category: https://github.com/JJSaccolo/UIActivityIndicator-for-SDWebImage +Add these before you call ```sd_setImageWithURL``` + +``` objective-c +[imageView setShowActivityIndicatorView:YES]; +[imageView setIndicatorStyle:UIActivityIndicatorViewStyleGray]; +``` + +``` swift +imageView.setShowActivityIndicatorView(true) +imageView.setIndicatorStyle(.Gray) +``` Installation ------------ There are three ways to use SDWebImage in your project: -- using Cocoapods -- copying all the files into your project -- importing the project as a static library +- using CocoaPods +- using Carthage +- by cloning the project into your repository ### Installation with CocoaPods @@ -223,8 +147,8 @@ There are three ways to use SDWebImage in your project: #### Podfile ``` -platform :ios, '6.1' -pod 'SDWebImage', '~>3.7' +platform :ios, '7.0' +pod 'SDWebImage', '~>3.8' ``` If you are using Swift, be sure to add `use_frameworks!` and set your target to iOS 8+: @@ -253,63 +177,8 @@ To install with carthage, follow the instruction on [Carthage](https://github.co github "rs/SDWebImage" ``` -#### Usage -Swift - -If you installed using CocoaPods: -``` -import SDWebImage -``` - -If you installed manually: -``` -import WebImage -``` - -Objective-C - -``` -@import WebImage; -``` - ### Installation by cloning the repository - -In order to gain access to all the files from the repository, you should clone it. -``` -git clone --recursive https://github.com/rs/SDWebImage.git -``` - -### Add the SDWebImage project to your project - -- Download and unzip the last version of the framework from the [download page](https://github.com/rs/SDWebImage/releases) -- Right-click on the project navigator and select "Add Files to "Your Project": -- In the dialog, select SDWebImage.framework: -- Check the "Copy items into destination group's folder (if needed)" checkbox - -### Add dependencies - -- In you application project app’s target settings, find the "Build Phases" section and open the "Link Binary With Libraries" block: -- Click the "+" button again and select the "ImageIO.framework", this is needed by the progressive download feature: - -### Add Linker Flag - -Open the "Build Settings" tab, in the "Linking" section, locate the "Other Linker Flags" setting and add the "-ObjC" flag: - -![Other Linker Flags](http://dl.dropbox.com/u/123346/SDWebImage/10_other_linker_flags.jpg) - -Alternatively, if this causes compilation problems with frameworks that extend optional libraries, such as Parse, RestKit or opencv2, instead of the -ObjC flag use: -``` --force_load SDWebImage.framework/Versions/Current/SDWebImage -``` - -If you're using Cocoa Pods and have any frameworks that extend optional libraries, such as Parsen RestKit or opencv2, instead of the -ObjC flag use: -``` --force_load $(TARGET_BUILD_DIR)/libPods.a -``` -and this: -``` -$(inherited) -``` +- see [Manual install](Docs/ManualInstallation.md) ### Import headers in your source files @@ -324,11 +193,23 @@ In the source files where you need to use the library, import the header file: At this point your workspace should build without error. If you are having problem, post to the Issue and the community can help you solve it. -Future Enhancements -------------------- +## Author +- [Olivier Poitrey](https://github.com/rs) -- LRU memory cache cleanup instead of reset on memory warning +## Collaborators +- [Konstantinos K.](https://github.com/mythodeia) +- [Bogdan Poplauschi](https://github.com/bpoplauschi) ## Licenses All source code is licensed under the [MIT License](https://raw.github.com/rs/SDWebImage/master/LICENSE). + +## Architecture + +

+ +

+ +

+ +

diff --git a/Example/Pods/SDWebImage/SDWebImage/NSData+ImageContentType.h b/Example/Pods/SDWebImage/SDWebImage/NSData+ImageContentType.h index 69c76dc77..b23b0bd41 100644 --- a/Example/Pods/SDWebImage/SDWebImage/NSData+ImageContentType.h +++ b/Example/Pods/SDWebImage/SDWebImage/NSData+ImageContentType.h @@ -1,26 +1,33 @@ -// -// Created by Fabrice Aneche on 06/01/14. -// Copyright (c) 2014 Dailymotion. All rights reserved. -// +/* + * This file is part of the SDWebImage package. + * (c) Olivier Poitrey + * (c) Fabrice Aneche + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ #import +#import "SDWebImageCompat.h" + +typedef NS_ENUM(NSInteger, SDImageFormat) { + SDImageFormatUndefined = -1, + SDImageFormatJPEG = 0, + SDImageFormatPNG, + SDImageFormatGIF, + SDImageFormatTIFF, + SDImageFormatWebP +}; @interface NSData (ImageContentType) /** - * Compute the content type for an image data + * Return image format * - * @param data the input data + * @param data the input image data * - * @return the content type as string (i.e. image/jpeg, image/gif) + * @return the image format as `SDImageFormat` (enum) */ -+ (NSString *)sd_contentTypeForImageData:(NSData *)data; - -@end - - -@interface NSData (ImageContentTypeDeprecated) - -+ (NSString *)contentTypeForImageData:(NSData *)data __deprecated_msg("Use `sd_contentTypeForImageData:`"); ++ (SDImageFormat)sd_imageFormatForImageData:(nullable NSData *)data; @end diff --git a/Example/Pods/SDWebImage/SDWebImage/NSData+ImageContentType.m b/Example/Pods/SDWebImage/SDWebImage/NSData+ImageContentType.m index 0941cfaa0..7364715ff 100644 --- a/Example/Pods/SDWebImage/SDWebImage/NSData+ImageContentType.m +++ b/Example/Pods/SDWebImage/SDWebImage/NSData+ImageContentType.m @@ -1,49 +1,46 @@ -// -// Created by Fabrice Aneche on 06/01/14. -// Copyright (c) 2014 Dailymotion. All rights reserved. -// +/* + * This file is part of the SDWebImage package. + * (c) Olivier Poitrey + * (c) Fabrice Aneche + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ #import "NSData+ImageContentType.h" @implementation NSData (ImageContentType) -+ (NSString *)sd_contentTypeForImageData:(NSData *)data { ++ (SDImageFormat)sd_imageFormatForImageData:(nullable NSData *)data { + if (!data) { + return SDImageFormatUndefined; + } + uint8_t c; [data getBytes:&c length:1]; switch (c) { case 0xFF: - return @"image/jpeg"; + return SDImageFormatJPEG; case 0x89: - return @"image/png"; + return SDImageFormatPNG; case 0x47: - return @"image/gif"; + return SDImageFormatGIF; case 0x49: case 0x4D: - return @"image/tiff"; + return SDImageFormatTIFF; case 0x52: // R as RIFF for WEBP - if ([data length] < 12) { - return nil; + if (data.length < 12) { + return SDImageFormatUndefined; } - + NSString *testString = [[NSString alloc] initWithData:[data subdataWithRange:NSMakeRange(0, 12)] encoding:NSASCIIStringEncoding]; if ([testString hasPrefix:@"RIFF"] && [testString hasSuffix:@"WEBP"]) { - return @"image/webp"; + return SDImageFormatWebP; } - - return nil; } - return nil; -} - -@end - - -@implementation NSData (ImageContentTypeDeprecated) - -+ (NSString *)contentTypeForImageData:(NSData *)data { - return [self sd_contentTypeForImageData:data]; + return SDImageFormatUndefined; } @end diff --git a/Example/Pods/SDWebImage/SDWebImage/NSImage+WebCache.h b/Example/Pods/SDWebImage/SDWebImage/NSImage+WebCache.h new file mode 100644 index 000000000..7515d4074 --- /dev/null +++ b/Example/Pods/SDWebImage/SDWebImage/NSImage+WebCache.h @@ -0,0 +1,23 @@ +/* + * This file is part of the SDWebImage package. + * (c) Olivier Poitrey + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +#import "SDWebImageCompat.h" + +#if SD_MAC + +#import + +@interface NSImage (WebCache) + +- (CGImageRef)CGImage; +- (NSArray *)images; +- (BOOL)isGIF; + +@end + +#endif diff --git a/Example/Pods/SDWebImage/SDWebImage/NSImage+WebCache.m b/Example/Pods/SDWebImage/SDWebImage/NSImage+WebCache.m new file mode 100644 index 000000000..518b498ce --- /dev/null +++ b/Example/Pods/SDWebImage/SDWebImage/NSImage+WebCache.m @@ -0,0 +1,32 @@ +/* + * This file is part of the SDWebImage package. + * (c) Olivier Poitrey + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +#import "NSImage+WebCache.h" + +#if SD_MAC + +@implementation NSImage (WebCache) + +- (CGImageRef)CGImage { + NSRect imageRect = NSMakeRect(0, 0, self.size.width, self.size.height); + CGImageRef cgImage = [self CGImageForProposedRect:&imageRect context:NULL hints:nil]; + return cgImage; +} + +- (NSArray *)images { + return nil; +} + +- (BOOL)isGIF { + return NO; +} + +@end + +#endif + diff --git a/Example/Pods/SDWebImage/SDWebImage/SDImageCache.h b/Example/Pods/SDWebImage/SDWebImage/SDImageCache.h index 957772671..9ae2eb444 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDImageCache.h +++ b/Example/Pods/SDWebImage/SDWebImage/SDImageCache.h @@ -9,6 +9,8 @@ #import #import "SDWebImageCompat.h" +@class SDImageCacheConfig; + typedef NS_ENUM(NSInteger, SDImageCacheType) { /** * The image wasn't available the SDWebImage caches, but was downloaded from the web. @@ -24,33 +26,25 @@ typedef NS_ENUM(NSInteger, SDImageCacheType) { SDImageCacheTypeMemory }; -typedef void(^SDWebImageQueryCompletedBlock)(UIImage *image, SDImageCacheType cacheType); +typedef void(^SDCacheQueryCompletedBlock)(UIImage * _Nullable image, NSData * _Nullable data, SDImageCacheType cacheType); typedef void(^SDWebImageCheckCacheCompletionBlock)(BOOL isInCache); typedef void(^SDWebImageCalculateSizeBlock)(NSUInteger fileCount, NSUInteger totalSize); + /** * SDImageCache maintains a memory cache and an optional disk cache. Disk cache write operations are performed * asynchronous so it doesn’t add unnecessary latency to the UI. */ @interface SDImageCache : NSObject -/** - * Decompressing images that are downloaded and cached can improve performance but can consume lot of memory. - * Defaults to YES. Set this to NO if you are experiencing a crash due to excessive memory consumption. - */ -@property (assign, nonatomic) BOOL shouldDecompressImages; - -/** - * disable iCloud backup [defaults to YES] - */ -@property (assign, nonatomic) BOOL shouldDisableiCloud; +#pragma mark - Properties /** - * use memory cache [defaults to YES] + * Cache Config object - storing all kind of settings */ -@property (assign, nonatomic) BOOL shouldCacheImagesInMemory; +@property (nonatomic, nonnull, readonly) SDImageCacheConfig *config; /** * The maximum "total cost" of the in-memory image cache. The cost function is the number of pixels held in memory. @@ -62,29 +56,21 @@ typedef void(^SDWebImageCalculateSizeBlock)(NSUInteger fileCount, NSUInteger tot */ @property (assign, nonatomic) NSUInteger maxMemoryCountLimit; -/** - * The maximum length of time to keep an image in the cache, in seconds - */ -@property (assign, nonatomic) NSInteger maxCacheAge; - -/** - * The maximum size of the cache, in bytes. - */ -@property (assign, nonatomic) NSUInteger maxCacheSize; +#pragma mark - Singleton and initialization /** * Returns global shared cache instance * * @return SDImageCache global instance */ -+ (SDImageCache *)sharedImageCache; ++ (nonnull instancetype)sharedImageCache; /** * Init a new cache store with a specific namespace * * @param ns The namespace to use for this cache store */ -- (id)initWithNamespace:(NSString *)ns; +- (nonnull instancetype)initWithNamespace:(nonnull NSString *)ns; /** * Init a new cache store with a specific namespace and directory @@ -92,9 +78,12 @@ typedef void(^SDWebImageCalculateSizeBlock)(NSUInteger fileCount, NSUInteger tot * @param ns The namespace to use for this cache store * @param directory Directory to cache disk images in */ -- (id)initWithNamespace:(NSString *)ns diskCacheDirectory:(NSString *)directory; +- (nonnull instancetype)initWithNamespace:(nonnull NSString *)ns + diskCacheDirectory:(nonnull NSString *)directory NS_DESIGNATED_INITIALIZER; + +#pragma mark - Cache paths --(NSString *)makeDiskCachePath:(NSString*)fullNamespace; +- (nullable NSString *)makeDiskCachePath:(nonnull NSString*)fullNamespace; /** * Add a read-only cache path to search for images pre-cached by SDImageCache @@ -102,91 +91,123 @@ typedef void(^SDWebImageCalculateSizeBlock)(NSUInteger fileCount, NSUInteger tot * * @param path The path to use for this read-only cache path */ -- (void)addReadOnlyCachePath:(NSString *)path; +- (void)addReadOnlyCachePath:(nonnull NSString *)path; + +#pragma mark - Store Ops /** - * Store an image into memory and disk cache at the given key. + * Asynchronously store an image into memory and disk cache at the given key. * - * @param image The image to store - * @param key The unique image cache key, usually it's image absolute URL + * @param image The image to store + * @param key The unique image cache key, usually it's image absolute URL + * @param completionBlock A block executed after the operation is finished */ -- (void)storeImage:(UIImage *)image forKey:(NSString *)key; +- (void)storeImage:(nullable UIImage *)image + forKey:(nullable NSString *)key + completion:(nullable SDWebImageNoParamsBlock)completionBlock; /** - * Store an image into memory and optionally disk cache at the given key. + * Asynchronously store an image into memory and disk cache at the given key. * - * @param image The image to store - * @param key The unique image cache key, usually it's image absolute URL - * @param toDisk Store the image to disk cache if YES + * @param image The image to store + * @param key The unique image cache key, usually it's image absolute URL + * @param toDisk Store the image to disk cache if YES + * @param completionBlock A block executed after the operation is finished */ -- (void)storeImage:(UIImage *)image forKey:(NSString *)key toDisk:(BOOL)toDisk; +- (void)storeImage:(nullable UIImage *)image + forKey:(nullable NSString *)key + toDisk:(BOOL)toDisk + completion:(nullable SDWebImageNoParamsBlock)completionBlock; /** - * Store an image into memory and optionally disk cache at the given key. + * Asynchronously store an image into memory and disk cache at the given key. + * + * @param image The image to store + * @param imageData The image data as returned by the server, this representation will be used for disk storage + * instead of converting the given image object into a storable/compressed image format in order + * to save quality and CPU + * @param key The unique image cache key, usually it's image absolute URL + * @param toDisk Store the image to disk cache if YES + * @param completionBlock A block executed after the operation is finished + */ +- (void)storeImage:(nullable UIImage *)image + imageData:(nullable NSData *)imageData + forKey:(nullable NSString *)key + toDisk:(BOOL)toDisk + completion:(nullable SDWebImageNoParamsBlock)completionBlock; + +/** + * Synchronously store image NSData into disk cache at the given key. + * + * @warning This method is synchronous, make sure to call it from the ioQueue * - * @param image The image to store - * @param recalculate BOOL indicates if imageData can be used or a new data should be constructed from the UIImage - * @param imageData The image data as returned by the server, this representation will be used for disk storage - * instead of converting the given image object into a storable/compressed image format in order - * to save quality and CPU - * @param key The unique image cache key, usually it's image absolute URL - * @param toDisk Store the image to disk cache if YES + * @param imageData The image data to store + * @param key The unique image cache key, usually it's image absolute URL */ -- (void)storeImage:(UIImage *)image recalculateFromImage:(BOOL)recalculate imageData:(NSData *)imageData forKey:(NSString *)key toDisk:(BOOL)toDisk; +- (void)storeImageDataToDisk:(nullable NSData *)imageData forKey:(nullable NSString *)key; + +#pragma mark - Query and Retrieve Ops /** - * Query the disk cache asynchronously. + * Async check if image exists in disk cache already (does not load the image) * - * @param key The unique key used to store the wanted image + * @param key the key describing the url + * @param completionBlock the block to be executed when the check is done. + * @note the completion block will be always executed on the main queue */ -- (NSOperation *)queryDiskCacheForKey:(NSString *)key done:(SDWebImageQueryCompletedBlock)doneBlock; +- (void)diskImageExistsWithKey:(nullable NSString *)key completion:(nullable SDWebImageCheckCacheCompletionBlock)completionBlock; /** - * Query the memory cache synchronously. + * Operation that queries the cache asynchronously and call the completion when done. * - * @param key The unique key used to store the wanted image + * @param key The unique key used to store the wanted image + * @param doneBlock The completion block. Will not get called if the operation is cancelled + * + * @return a NSOperation instance containing the cache op */ -- (UIImage *)imageFromMemoryCacheForKey:(NSString *)key; +- (nullable NSOperation *)queryCacheOperationForKey:(nullable NSString *)key done:(nullable SDCacheQueryCompletedBlock)doneBlock; /** - * Query the disk cache synchronously after checking the memory cache. + * Query the memory cache synchronously. * - * @param key The unique key used to store the wanted image + * @param key The unique key used to store the image */ -- (UIImage *)imageFromDiskCacheForKey:(NSString *)key; +- (nullable UIImage *)imageFromMemoryCacheForKey:(nullable NSString *)key; /** - * Remove the image from memory and disk cache synchronously + * Query the disk cache synchronously. * - * @param key The unique image cache key + * @param key The unique key used to store the image */ -- (void)removeImageForKey:(NSString *)key; - +- (nullable UIImage *)imageFromDiskCacheForKey:(nullable NSString *)key; /** - * Remove the image from memory and disk cache asynchronously + * Query the cache (memory and or disk) synchronously after checking the memory cache. * - * @param key The unique image cache key - * @param completion An block that should be executed after the image has been removed (optional) + * @param key The unique key used to store the image */ -- (void)removeImageForKey:(NSString *)key withCompletion:(SDWebImageNoParamsBlock)completion; +- (nullable UIImage *)imageFromCacheForKey:(nullable NSString *)key; + +#pragma mark - Remove Ops /** - * Remove the image from memory and optionally disk cache asynchronously + * Remove the image from memory and disk cache asynchronously * - * @param key The unique image cache key - * @param fromDisk Also remove cache entry from disk if YES + * @param key The unique image cache key + * @param completion A block that should be executed after the image has been removed (optional) */ -- (void)removeImageForKey:(NSString *)key fromDisk:(BOOL)fromDisk; +- (void)removeImageForKey:(nullable NSString *)key withCompletion:(nullable SDWebImageNoParamsBlock)completion; /** * Remove the image from memory and optionally disk cache asynchronously * * @param key The unique image cache key * @param fromDisk Also remove cache entry from disk if YES - * @param completion An block that should be executed after the image has been removed (optional) + * @param completion A block that should be executed after the image has been removed (optional) */ -- (void)removeImageForKey:(NSString *)key fromDisk:(BOOL)fromDisk withCompletion:(SDWebImageNoParamsBlock)completion; +- (void)removeImageForKey:(nullable NSString *)key fromDisk:(BOOL)fromDisk withCompletion:(nullable SDWebImageNoParamsBlock)completion; + +#pragma mark - Cache clean Ops /** * Clear all memory cached images @@ -194,28 +215,18 @@ typedef void(^SDWebImageCalculateSizeBlock)(NSUInteger fileCount, NSUInteger tot - (void)clearMemory; /** - * Clear all disk cached images. Non-blocking method - returns immediately. - * @param completion An block that should be executed after cache expiration completes (optional) - */ -- (void)clearDiskOnCompletion:(SDWebImageNoParamsBlock)completion; - -/** - * Clear all disk cached images - * @see clearDiskOnCompletion: + * Async clear all disk cached images. Non-blocking method - returns immediately. + * @param completion A block that should be executed after cache expiration completes (optional) */ -- (void)clearDisk; +- (void)clearDiskOnCompletion:(nullable SDWebImageNoParamsBlock)completion; /** - * Remove all expired cached image from disk. Non-blocking method - returns immediately. - * @param completionBlock An block that should be executed after cache expiration completes (optional) + * Async remove all expired cached image from disk. Non-blocking method - returns immediately. + * @param completionBlock A block that should be executed after cache expiration completes (optional) */ -- (void)cleanDiskWithCompletionBlock:(SDWebImageNoParamsBlock)completionBlock; +- (void)deleteOldFilesWithCompletionBlock:(nullable SDWebImageNoParamsBlock)completionBlock; -/** - * Remove all expired cached image from disk - * @see cleanDiskWithCompletionBlock: - */ -- (void)cleanDisk; +#pragma mark - Cache Info /** * Get the size used by the disk cache @@ -230,25 +241,9 @@ typedef void(^SDWebImageCalculateSizeBlock)(NSUInteger fileCount, NSUInteger tot /** * Asynchronously calculate the disk cache's size. */ -- (void)calculateSizeWithCompletionBlock:(SDWebImageCalculateSizeBlock)completionBlock; +- (void)calculateSizeWithCompletionBlock:(nullable SDWebImageCalculateSizeBlock)completionBlock; -/** - * Async check if image exists in disk cache already (does not load the image) - * - * @param key the key describing the url - * @param completionBlock the block to be executed when the check is done. - * @note the completion block will be always executed on the main queue - */ -- (void)diskImageExistsWithKey:(NSString *)key completion:(SDWebImageCheckCacheCompletionBlock)completionBlock; - -/** - * Check if image exists in disk cache already (does not load the image) - * - * @param key the key describing the url - * - * @return YES if an image exists for the given key - */ -- (BOOL)diskImageExistsWithKey:(NSString *)key; +#pragma mark - Cache Paths /** * Get the cache path for a certain key (needs the cache path root folder) @@ -258,7 +253,7 @@ typedef void(^SDWebImageCalculateSizeBlock)(NSUInteger fileCount, NSUInteger tot * * @return the cache path */ -- (NSString *)cachePathForKey:(NSString *)key inPath:(NSString *)path; +- (nullable NSString *)cachePathForKey:(nullable NSString *)key inPath:(nonnull NSString *)path; /** * Get the default cache path for a certain key @@ -267,6 +262,6 @@ typedef void(^SDWebImageCalculateSizeBlock)(NSUInteger fileCount, NSUInteger tot * * @return the default cache path */ -- (NSString *)defaultCachePathForKey:(NSString *)key; +- (nullable NSString *)defaultCachePathForKey:(nullable NSString *)key; @end diff --git a/Example/Pods/SDWebImage/SDWebImage/SDImageCache.m b/Example/Pods/SDWebImage/SDWebImage/SDImageCache.m index aa0ff6c90..acd5ee6a3 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDImageCache.m +++ b/Example/Pods/SDWebImage/SDWebImage/SDImageCache.m @@ -10,6 +10,10 @@ #import "SDWebImageDecoder.h" #import "UIImage+MultiFormat.h" #import +#import "UIImage+GIF.h" +#import "NSData+ImageContentType.h" +#import "NSImage+WebCache.h" +#import "SDImageCacheConfig.h" // See https://github.com/rs/SDWebImage/pull/1141 for discussion @interface AutoPurgeCache : NSCache @@ -17,51 +21,40 @@ @interface AutoPurgeCache : NSCache @implementation AutoPurgeCache -- (id)init -{ +- (nonnull instancetype)init { self = [super init]; if (self) { +#if SD_UIKIT [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(removeAllObjects) name:UIApplicationDidReceiveMemoryWarningNotification object:nil]; +#endif } return self; } -- (void)dealloc -{ +- (void)dealloc { +#if SD_UIKIT [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidReceiveMemoryWarningNotification object:nil]; - +#endif } @end -static const NSInteger kDefaultCacheMaxCacheAge = 60 * 60 * 24 * 7; // 1 week -// PNG signature bytes and data (below) -static unsigned char kPNGSignatureBytes[8] = {0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A}; -static NSData *kPNGSignatureData = nil; - -BOOL ImageDataHasPNGPreffix(NSData *data); - -BOOL ImageDataHasPNGPreffix(NSData *data) { - NSUInteger pngSignatureLength = [kPNGSignatureData length]; - if ([data length] >= pngSignatureLength) { - if ([[data subdataWithRange:NSMakeRange(0, pngSignatureLength)] isEqualToData:kPNGSignatureData]) { - return YES; - } - } - - return NO; -} FOUNDATION_STATIC_INLINE NSUInteger SDCacheCostForImage(UIImage *image) { +#if SD_MAC + return image.size.height * image.size.width; +#elif SD_UIKIT || SD_WATCH return image.size.height * image.size.width * image.scale * image.scale; +#endif } @interface SDImageCache () -@property (strong, nonatomic) NSCache *memCache; -@property (strong, nonatomic) NSString *diskCachePath; -@property (strong, nonatomic) NSMutableArray *customPaths; -@property (SDDispatchQueueSetterSementics, nonatomic) dispatch_queue_t ioQueue; +#pragma mark - Properties +@property (strong, nonatomic, nonnull) NSCache *memCache; +@property (strong, nonatomic, nonnull) NSString *diskCachePath; +@property (strong, nonatomic, nullable) NSMutableArray *customPaths; +@property (SDDispatchQueueSetterSementics, nonatomic, nullable) dispatch_queue_t ioQueue; @end @@ -70,7 +63,9 @@ @implementation SDImageCache { NSFileManager *_fileManager; } -+ (SDImageCache *)sharedImageCache { +#pragma mark - Singleton, init, dealloc + ++ (nonnull instancetype)sharedImageCache { static dispatch_once_t once; static id instance; dispatch_once(&once, ^{ @@ -79,28 +74,25 @@ + (SDImageCache *)sharedImageCache { return instance; } -- (id)init { +- (instancetype)init { return [self initWithNamespace:@"default"]; } -- (id)initWithNamespace:(NSString *)ns { +- (nonnull instancetype)initWithNamespace:(nonnull NSString *)ns { NSString *path = [self makeDiskCachePath:ns]; return [self initWithNamespace:ns diskCacheDirectory:path]; } -- (id)initWithNamespace:(NSString *)ns diskCacheDirectory:(NSString *)directory { +- (nonnull instancetype)initWithNamespace:(nonnull NSString *)ns + diskCacheDirectory:(nonnull NSString *)directory { if ((self = [super init])) { NSString *fullNamespace = [@"com.hackemist.SDWebImageCache." stringByAppendingString:ns]; - - // initialise PNG signature data - kPNGSignatureData = [NSData dataWithBytes:kPNGSignatureBytes length:8]; - + // Create IO serial queue _ioQueue = dispatch_queue_create("com.hackemist.SDWebImageCache", DISPATCH_QUEUE_SERIAL); - - // Init default values - _maxCacheAge = kDefaultCacheMaxCacheAge; - + + _config = [[SDImageCacheConfig alloc] init]; + // Init the memory cache _memCache = [[AutoPurgeCache alloc] init]; _memCache.name = fullNamespace; @@ -113,20 +105,11 @@ - (id)initWithNamespace:(NSString *)ns diskCacheDirectory:(NSString *)directory _diskCachePath = path; } - // Set decompression to YES - _shouldDecompressImages = YES; - - // memory cache enabled - _shouldCacheImagesInMemory = YES; - - // Disable iCloud - _shouldDisableiCloud = YES; - dispatch_sync(_ioQueue, ^{ _fileManager = [NSFileManager new]; }); -#if TARGET_OS_IPHONE +#if SD_UIKIT // Subscribe to app events [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(clearMemory) @@ -134,12 +117,12 @@ - (id)initWithNamespace:(NSString *)ns diskCacheDirectory:(NSString *)directory object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(cleanDisk) + selector:@selector(deleteOldFiles) name:UIApplicationWillTerminateNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(backgroundCleanDisk) + selector:@selector(backgroundDeleteOldFiles) name:UIApplicationDidEnterBackgroundNotification object:nil]; #endif @@ -153,7 +136,17 @@ - (void)dealloc { SDDispatchQueueRelease(_ioQueue); } -- (void)addReadOnlyCachePath:(NSString *)path { +- (void)checkIfQueueIsIOQueue { + const char *currentQueueLabel = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL); + const char *ioQueueLabel = dispatch_queue_get_label(self.ioQueue); + if (strcmp(currentQueueLabel, ioQueueLabel) != 0) { + NSLog(@"This method should be called from the ioQueue"); + } +} + +#pragma mark - Cache paths + +- (void)addReadOnlyCachePath:(nonnull NSString *)path { if (!self.customPaths) { self.customPaths = [NSMutableArray new]; } @@ -163,19 +156,17 @@ - (void)addReadOnlyCachePath:(NSString *)path { } } -- (NSString *)cachePathForKey:(NSString *)key inPath:(NSString *)path { +- (nullable NSString *)cachePathForKey:(nullable NSString *)key inPath:(nonnull NSString *)path { NSString *filename = [self cachedFileNameForKey:key]; return [path stringByAppendingPathComponent:filename]; } -- (NSString *)defaultCachePathForKey:(NSString *)key { +- (nullable NSString *)defaultCachePathForKey:(nullable NSString *)key { return [self cachePathForKey:key inPath:self.diskCachePath]; } -#pragma mark SDImageCache (private) - -- (NSString *)cachedFileNameForKey:(NSString *)key { - const char *str = [key UTF8String]; +- (nullable NSString *)cachedFileNameForKey:(nullable NSString *)key { + const char *str = key.UTF8String; if (str == NULL) { str = ""; } @@ -183,117 +174,105 @@ - (NSString *)cachedFileNameForKey:(NSString *)key { CC_MD5(str, (CC_LONG)strlen(str), r); NSString *filename = [NSString stringWithFormat:@"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%@", r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], - r[11], r[12], r[13], r[14], r[15], [[key pathExtension] isEqualToString:@""] ? @"" : [NSString stringWithFormat:@".%@", [key pathExtension]]]; + r[11], r[12], r[13], r[14], r[15], [key.pathExtension isEqualToString:@""] ? @"" : [NSString stringWithFormat:@".%@", key.pathExtension]]; return filename; } -#pragma mark ImageCache - -// Init the disk cache --(NSString *)makeDiskCachePath:(NSString*)fullNamespace{ - NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES); +- (nullable NSString *)makeDiskCachePath:(nonnull NSString*)fullNamespace { + NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES); return [paths[0] stringByAppendingPathComponent:fullNamespace]; } -- (void)storeImage:(UIImage *)image recalculateFromImage:(BOOL)recalculate imageData:(NSData *)imageData forKey:(NSString *)key toDisk:(BOOL)toDisk { +#pragma mark - Store Ops + +- (void)storeImage:(nullable UIImage *)image + forKey:(nullable NSString *)key + completion:(nullable SDWebImageNoParamsBlock)completionBlock { + [self storeImage:image imageData:nil forKey:key toDisk:YES completion:completionBlock]; +} + +- (void)storeImage:(nullable UIImage *)image + forKey:(nullable NSString *)key + toDisk:(BOOL)toDisk + completion:(nullable SDWebImageNoParamsBlock)completionBlock { + [self storeImage:image imageData:nil forKey:key toDisk:toDisk completion:completionBlock]; +} + +- (void)storeImage:(nullable UIImage *)image + imageData:(nullable NSData *)imageData + forKey:(nullable NSString *)key + toDisk:(BOOL)toDisk + completion:(nullable SDWebImageNoParamsBlock)completionBlock { if (!image || !key) { + if (completionBlock) { + completionBlock(); + } return; } // if memory cache is enabled - if (self.shouldCacheImagesInMemory) { + if (self.config.shouldCacheImagesInMemory) { NSUInteger cost = SDCacheCostForImage(image); [self.memCache setObject:image forKey:key cost:cost]; } - + if (toDisk) { dispatch_async(self.ioQueue, ^{ NSData *data = imageData; - - if (image && (recalculate || !data)) { -#if TARGET_OS_IPHONE - // We need to determine if the image is a PNG or a JPEG - // PNGs are easier to detect because they have a unique signature (http://www.w3.org/TR/PNG-Structure.html) - // The first eight bytes of a PNG file always contain the following (decimal) values: - // 137 80 78 71 13 10 26 10 - - // If the imageData is nil (i.e. if trying to save a UIImage directly or the image was transformed on download) - // and the image has an alpha channel, we will consider it PNG to avoid losing the transparency - int alphaInfo = CGImageGetAlphaInfo(image.CGImage); - BOOL hasAlpha = !(alphaInfo == kCGImageAlphaNone || - alphaInfo == kCGImageAlphaNoneSkipFirst || - alphaInfo == kCGImageAlphaNoneSkipLast); - BOOL imageIsPng = hasAlpha; - - // But if we have an image data, we will look at the preffix - if ([imageData length] >= [kPNGSignatureData length]) { - imageIsPng = ImageDataHasPNGPreffix(imageData); - } - - if (imageIsPng) { - data = UIImagePNGRepresentation(image); - } - else { - data = UIImageJPEGRepresentation(image, (CGFloat)1.0); - } -#else - data = [NSBitmapImageRep representationOfImageRepsInArray:image.representations usingType: NSJPEGFileType properties:nil]; -#endif + + if (!data && image) { + SDImageFormat imageFormatFromData = [NSData sd_imageFormatForImageData:data]; + data = [image sd_imageDataAsFormat:imageFormatFromData]; } - - if (data) { - if (![_fileManager fileExistsAtPath:_diskCachePath]) { - [_fileManager createDirectoryAtPath:_diskCachePath withIntermediateDirectories:YES attributes:nil error:NULL]; - } - - // get cache Path for image key - NSString *cachePathForKey = [self defaultCachePathForKey:key]; - // transform to NSUrl - NSURL *fileURL = [NSURL fileURLWithPath:cachePathForKey]; - - [_fileManager createFileAtPath:cachePathForKey contents:data attributes:nil]; - - // disable iCloud backup - if (self.shouldDisableiCloud) { - [fileURL setResourceValue:[NSNumber numberWithBool:YES] forKey:NSURLIsExcludedFromBackupKey error:nil]; - } + + [self storeImageDataToDisk:data forKey:key]; + if (completionBlock) { + dispatch_async(dispatch_get_main_queue(), ^{ + completionBlock(); + }); } }); + } else { + if (completionBlock) { + completionBlock(); + } } } -- (void)storeImage:(UIImage *)image forKey:(NSString *)key { - [self storeImage:image recalculateFromImage:YES imageData:nil forKey:key toDisk:YES]; -} - -- (void)storeImage:(UIImage *)image forKey:(NSString *)key toDisk:(BOOL)toDisk { - [self storeImage:image recalculateFromImage:YES imageData:nil forKey:key toDisk:toDisk]; -} - -- (BOOL)diskImageExistsWithKey:(NSString *)key { - BOOL exists = NO; +- (void)storeImageDataToDisk:(nullable NSData *)imageData forKey:(nullable NSString *)key { + if (!imageData || !key) { + return; + } - // this is an exception to access the filemanager on another queue than ioQueue, but we are using the shared instance - // from apple docs on NSFileManager: The methods of the shared NSFileManager object can be called from multiple threads safely. - exists = [[NSFileManager defaultManager] fileExistsAtPath:[self defaultCachePathForKey:key]]; - - // fallback because of https://github.com/rs/SDWebImage/pull/976 that added the extension to the disk file name - // checking the key with and without the extension - if (!exists) { - exists = [[NSFileManager defaultManager] fileExistsAtPath:[[self defaultCachePathForKey:key] stringByDeletingPathExtension]]; + [self checkIfQueueIsIOQueue]; + + if (![_fileManager fileExistsAtPath:_diskCachePath]) { + [_fileManager createDirectoryAtPath:_diskCachePath withIntermediateDirectories:YES attributes:nil error:NULL]; } - return exists; + // get cache Path for image key + NSString *cachePathForKey = [self defaultCachePathForKey:key]; + // transform to NSUrl + NSURL *fileURL = [NSURL fileURLWithPath:cachePathForKey]; + + [_fileManager createFileAtPath:cachePathForKey contents:imageData attributes:nil]; + + // disable iCloud backup + if (self.config.shouldDisableiCloud) { + [fileURL setResourceValue:@YES forKey:NSURLIsExcludedFromBackupKey error:nil]; + } } -- (void)diskImageExistsWithKey:(NSString *)key completion:(SDWebImageCheckCacheCompletionBlock)completionBlock { +#pragma mark - Query and Retrieve Ops + +- (void)diskImageExistsWithKey:(nullable NSString *)key completion:(nullable SDWebImageCheckCacheCompletionBlock)completionBlock { dispatch_async(_ioQueue, ^{ BOOL exists = [_fileManager fileExistsAtPath:[self defaultCachePathForKey:key]]; // fallback because of https://github.com/rs/SDWebImage/pull/976 that added the extension to the disk file name // checking the key with and without the extension if (!exists) { - exists = [_fileManager fileExistsAtPath:[[self defaultCachePathForKey:key] stringByDeletingPathExtension]]; + exists = [_fileManager fileExistsAtPath:[self defaultCachePathForKey:key].stringByDeletingPathExtension]; } if (completionBlock) { @@ -304,29 +283,33 @@ - (void)diskImageExistsWithKey:(NSString *)key completion:(SDWebImageCheckCacheC }); } -- (UIImage *)imageFromMemoryCacheForKey:(NSString *)key { +- (nullable UIImage *)imageFromMemoryCacheForKey:(nullable NSString *)key { return [self.memCache objectForKey:key]; } -- (UIImage *)imageFromDiskCacheForKey:(NSString *)key { +- (nullable UIImage *)imageFromDiskCacheForKey:(nullable NSString *)key { + UIImage *diskImage = [self diskImageForKey:key]; + if (diskImage && self.config.shouldCacheImagesInMemory) { + NSUInteger cost = SDCacheCostForImage(diskImage); + [self.memCache setObject:diskImage forKey:key cost:cost]; + } + return diskImage; +} + +- (nullable UIImage *)imageFromCacheForKey:(nullable NSString *)key { // First check the in-memory cache... UIImage *image = [self imageFromMemoryCacheForKey:key]; if (image) { return image; } - + // Second check the disk cache... - UIImage *diskImage = [self diskImageForKey:key]; - if (diskImage && self.shouldCacheImagesInMemory) { - NSUInteger cost = SDCacheCostForImage(diskImage); - [self.memCache setObject:diskImage forKey:key cost:cost]; - } - - return diskImage; + image = [self imageFromDiskCacheForKey:key]; + return image; } -- (NSData *)diskImageDataBySearchingAllPathsForKey:(NSString *)key { +- (nullable NSData *)diskImageDataBySearchingAllPathsForKey:(nullable NSString *)key { NSString *defaultPath = [self defaultCachePathForKey:key]; NSData *data = [NSData dataWithContentsOfFile:defaultPath]; if (data) { @@ -335,12 +318,12 @@ - (NSData *)diskImageDataBySearchingAllPathsForKey:(NSString *)key { // fallback because of https://github.com/rs/SDWebImage/pull/976 that added the extension to the disk file name // checking the key with and without the extension - data = [NSData dataWithContentsOfFile:[defaultPath stringByDeletingPathExtension]]; + data = [NSData dataWithContentsOfFile:defaultPath.stringByDeletingPathExtension]; if (data) { return data; } - NSArray *customPaths = [self.customPaths copy]; + NSArray *customPaths = [self.customPaths copy]; for (NSString *path in customPaths) { NSString *filePath = [self cachePathForKey:key inPath:path]; NSData *imageData = [NSData dataWithContentsOfFile:filePath]; @@ -350,7 +333,7 @@ - (NSData *)diskImageDataBySearchingAllPathsForKey:(NSString *)key { // fallback because of https://github.com/rs/SDWebImage/pull/976 that added the extension to the disk file name // checking the key with and without the extension - imageData = [NSData dataWithContentsOfFile:[filePath stringByDeletingPathExtension]]; + imageData = [NSData dataWithContentsOfFile:filePath.stringByDeletingPathExtension]; if (imageData) { return imageData; } @@ -359,12 +342,12 @@ - (NSData *)diskImageDataBySearchingAllPathsForKey:(NSString *)key { return nil; } -- (UIImage *)diskImageForKey:(NSString *)key { +- (nullable UIImage *)diskImageForKey:(nullable NSString *)key { NSData *data = [self diskImageDataBySearchingAllPathsForKey:key]; if (data) { UIImage *image = [UIImage sd_imageWithData:data]; image = [self scaledImageForKey:key image:image]; - if (self.shouldDecompressImages) { + if (self.config.shouldDecompressImages) { image = [UIImage decodedImageWithImage:image]; } return image; @@ -374,68 +357,69 @@ - (UIImage *)diskImageForKey:(NSString *)key { } } -- (UIImage *)scaledImageForKey:(NSString *)key image:(UIImage *)image { +- (nullable UIImage *)scaledImageForKey:(nullable NSString *)key image:(nullable UIImage *)image { return SDScaledImageForKey(key, image); } -- (NSOperation *)queryDiskCacheForKey:(NSString *)key done:(SDWebImageQueryCompletedBlock)doneBlock { - if (!doneBlock) { - return nil; - } - +- (nullable NSOperation *)queryCacheOperationForKey:(nullable NSString *)key done:(nullable SDCacheQueryCompletedBlock)doneBlock { if (!key) { - doneBlock(nil, SDImageCacheTypeNone); + if (doneBlock) { + doneBlock(nil, nil, SDImageCacheTypeNone); + } return nil; } // First check the in-memory cache... UIImage *image = [self imageFromMemoryCacheForKey:key]; if (image) { - doneBlock(image, SDImageCacheTypeMemory); + NSData *diskData = nil; + if ([image isGIF]) { + diskData = [self diskImageDataBySearchingAllPathsForKey:key]; + } + if (doneBlock) { + doneBlock(image, diskData, SDImageCacheTypeMemory); + } return nil; } NSOperation *operation = [NSOperation new]; dispatch_async(self.ioQueue, ^{ if (operation.isCancelled) { + // do not call the completion if cancelled return; } @autoreleasepool { + NSData *diskData = [self diskImageDataBySearchingAllPathsForKey:key]; UIImage *diskImage = [self diskImageForKey:key]; - if (diskImage && self.shouldCacheImagesInMemory) { + if (diskImage && self.config.shouldCacheImagesInMemory) { NSUInteger cost = SDCacheCostForImage(diskImage); [self.memCache setObject:diskImage forKey:key cost:cost]; } - dispatch_async(dispatch_get_main_queue(), ^{ - doneBlock(diskImage, SDImageCacheTypeDisk); - }); + if (doneBlock) { + dispatch_async(dispatch_get_main_queue(), ^{ + doneBlock(diskImage, diskData, SDImageCacheTypeDisk); + }); + } } }); return operation; } -- (void)removeImageForKey:(NSString *)key { - [self removeImageForKey:key withCompletion:nil]; -} +#pragma mark - Remove Ops -- (void)removeImageForKey:(NSString *)key withCompletion:(SDWebImageNoParamsBlock)completion { +- (void)removeImageForKey:(nullable NSString *)key withCompletion:(nullable SDWebImageNoParamsBlock)completion { [self removeImageForKey:key fromDisk:YES withCompletion:completion]; } -- (void)removeImageForKey:(NSString *)key fromDisk:(BOOL)fromDisk { - [self removeImageForKey:key fromDisk:fromDisk withCompletion:nil]; -} - -- (void)removeImageForKey:(NSString *)key fromDisk:(BOOL)fromDisk withCompletion:(SDWebImageNoParamsBlock)completion { - +- (void)removeImageForKey:(nullable NSString *)key fromDisk:(BOOL)fromDisk withCompletion:(nullable SDWebImageNoParamsBlock)completion { if (key == nil) { return; } - if (self.shouldCacheImagesInMemory) { + if (self.config.shouldCacheImagesInMemory) { [self.memCache removeObjectForKey:key]; } @@ -455,6 +439,8 @@ - (void)removeImageForKey:(NSString *)key fromDisk:(BOOL)fromDisk withCompletion } +# pragma mark - Mem Cache settings + - (void)setMaxMemoryCost:(NSUInteger)maxMemoryCost { self.memCache.totalCostLimit = maxMemoryCost; } @@ -471,16 +457,13 @@ - (void)setMaxMemoryCountLimit:(NSUInteger)maxCountLimit { self.memCache.countLimit = maxCountLimit; } +#pragma mark - Cache clean Ops + - (void)clearMemory { [self.memCache removeAllObjects]; } -- (void)clearDisk { - [self clearDiskOnCompletion:nil]; -} - -- (void)clearDiskOnCompletion:(SDWebImageNoParamsBlock)completion -{ +- (void)clearDiskOnCompletion:(nullable SDWebImageNoParamsBlock)completion { dispatch_async(self.ioQueue, ^{ [_fileManager removeItemAtPath:self.diskCachePath error:nil]; [_fileManager createDirectoryAtPath:self.diskCachePath @@ -496,14 +479,14 @@ - (void)clearDiskOnCompletion:(SDWebImageNoParamsBlock)completion }); } -- (void)cleanDisk { - [self cleanDiskWithCompletionBlock:nil]; +- (void)deleteOldFiles { + [self deleteOldFilesWithCompletionBlock:nil]; } -- (void)cleanDiskWithCompletionBlock:(SDWebImageNoParamsBlock)completionBlock { +- (void)deleteOldFilesWithCompletionBlock:(nullable SDWebImageNoParamsBlock)completionBlock { dispatch_async(self.ioQueue, ^{ NSURL *diskCacheURL = [NSURL fileURLWithPath:self.diskCachePath isDirectory:YES]; - NSArray *resourceKeys = @[NSURLIsDirectoryKey, NSURLContentModificationDateKey, NSURLTotalFileAllocatedSizeKey]; + NSArray *resourceKeys = @[NSURLIsDirectoryKey, NSURLContentModificationDateKey, NSURLTotalFileAllocatedSizeKey]; // This enumerator prefetches useful properties for our cache files. NSDirectoryEnumerator *fileEnumerator = [_fileManager enumeratorAtURL:diskCacheURL @@ -511,20 +494,21 @@ - (void)cleanDiskWithCompletionBlock:(SDWebImageNoParamsBlock)completionBlock { options:NSDirectoryEnumerationSkipsHiddenFiles errorHandler:NULL]; - NSDate *expirationDate = [NSDate dateWithTimeIntervalSinceNow:-self.maxCacheAge]; - NSMutableDictionary *cacheFiles = [NSMutableDictionary dictionary]; + NSDate *expirationDate = [NSDate dateWithTimeIntervalSinceNow:-self.config.maxCacheAge]; + NSMutableDictionary *> *cacheFiles = [NSMutableDictionary dictionary]; NSUInteger currentCacheSize = 0; // Enumerate all of the files in the cache directory. This loop has two purposes: // // 1. Removing files that are older than the expiration date. // 2. Storing file attributes for the size-based cleanup pass. - NSMutableArray *urlsToDelete = [[NSMutableArray alloc] init]; + NSMutableArray *urlsToDelete = [[NSMutableArray alloc] init]; for (NSURL *fileURL in fileEnumerator) { - NSDictionary *resourceValues = [fileURL resourceValuesForKeys:resourceKeys error:NULL]; + NSError *error; + NSDictionary *resourceValues = [fileURL resourceValuesForKeys:resourceKeys error:&error]; - // Skip directories. - if ([resourceValues[NSURLIsDirectoryKey] boolValue]) { + // Skip directories and errors. + if (error || !resourceValues || [resourceValues[NSURLIsDirectoryKey] boolValue]) { continue; } @@ -537,8 +521,8 @@ - (void)cleanDiskWithCompletionBlock:(SDWebImageNoParamsBlock)completionBlock { // Store a reference to this file and account for its total size. NSNumber *totalAllocatedSize = resourceValues[NSURLTotalFileAllocatedSizeKey]; - currentCacheSize += [totalAllocatedSize unsignedIntegerValue]; - [cacheFiles setObject:resourceValues forKey:fileURL]; + currentCacheSize += totalAllocatedSize.unsignedIntegerValue; + cacheFiles[fileURL] = resourceValues; } for (NSURL *fileURL in urlsToDelete) { @@ -547,22 +531,22 @@ - (void)cleanDiskWithCompletionBlock:(SDWebImageNoParamsBlock)completionBlock { // If our remaining disk cache exceeds a configured maximum size, perform a second // size-based cleanup pass. We delete the oldest files first. - if (self.maxCacheSize > 0 && currentCacheSize > self.maxCacheSize) { + if (self.config.maxCacheSize > 0 && currentCacheSize > self.config.maxCacheSize) { // Target half of our maximum cache size for this cleanup pass. - const NSUInteger desiredCacheSize = self.maxCacheSize / 2; + const NSUInteger desiredCacheSize = self.config.maxCacheSize / 2; // Sort the remaining cache files by their last modification time (oldest first). - NSArray *sortedFiles = [cacheFiles keysSortedByValueWithOptions:NSSortConcurrent - usingComparator:^NSComparisonResult(id obj1, id obj2) { - return [obj1[NSURLContentModificationDateKey] compare:obj2[NSURLContentModificationDateKey]]; - }]; + NSArray *sortedFiles = [cacheFiles keysSortedByValueWithOptions:NSSortConcurrent + usingComparator:^NSComparisonResult(id obj1, id obj2) { + return [obj1[NSURLContentModificationDateKey] compare:obj2[NSURLContentModificationDateKey]]; + }]; // Delete files until we fall below our desired cache size. for (NSURL *fileURL in sortedFiles) { if ([_fileManager removeItemAtURL:fileURL error:nil]) { - NSDictionary *resourceValues = cacheFiles[fileURL]; + NSDictionary *resourceValues = cacheFiles[fileURL]; NSNumber *totalAllocatedSize = resourceValues[NSURLTotalFileAllocatedSizeKey]; - currentCacheSize -= [totalAllocatedSize unsignedIntegerValue]; + currentCacheSize -= totalAllocatedSize.unsignedIntegerValue; if (currentCacheSize < desiredCacheSize) { break; @@ -578,7 +562,8 @@ - (void)cleanDiskWithCompletionBlock:(SDWebImageNoParamsBlock)completionBlock { }); } -- (void)backgroundCleanDisk { +#if SD_UIKIT +- (void)backgroundDeleteOldFiles { Class UIApplicationClass = NSClassFromString(@"UIApplication"); if(!UIApplicationClass || ![UIApplicationClass respondsToSelector:@selector(sharedApplication)]) { return; @@ -592,11 +577,14 @@ - (void)backgroundCleanDisk { }]; // Start the long-running task and return immediately. - [self cleanDiskWithCompletionBlock:^{ + [self deleteOldFilesWithCompletionBlock:^{ [application endBackgroundTask:bgTask]; bgTask = UIBackgroundTaskInvalid; }]; } +#endif + +#pragma mark - Cache Info - (NSUInteger)getSize { __block NSUInteger size = 0; @@ -604,7 +592,7 @@ - (NSUInteger)getSize { NSDirectoryEnumerator *fileEnumerator = [_fileManager enumeratorAtPath:self.diskCachePath]; for (NSString *fileName in fileEnumerator) { NSString *filePath = [self.diskCachePath stringByAppendingPathComponent:fileName]; - NSDictionary *attrs = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil]; + NSDictionary *attrs = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil]; size += [attrs fileSize]; } }); @@ -615,12 +603,12 @@ - (NSUInteger)getDiskCount { __block NSUInteger count = 0; dispatch_sync(self.ioQueue, ^{ NSDirectoryEnumerator *fileEnumerator = [_fileManager enumeratorAtPath:self.diskCachePath]; - count = [[fileEnumerator allObjects] count]; + count = fileEnumerator.allObjects.count; }); return count; } -- (void)calculateSizeWithCompletionBlock:(SDWebImageCalculateSizeBlock)completionBlock { +- (void)calculateSizeWithCompletionBlock:(nullable SDWebImageCalculateSizeBlock)completionBlock { NSURL *diskCacheURL = [NSURL fileURLWithPath:self.diskCachePath isDirectory:YES]; dispatch_async(self.ioQueue, ^{ @@ -635,7 +623,7 @@ - (void)calculateSizeWithCompletionBlock:(SDWebImageCalculateSizeBlock)completio for (NSURL *fileURL in fileEnumerator) { NSNumber *fileSize; [fileURL getResourceValue:&fileSize forKey:NSURLFileSizeKey error:NULL]; - totalSize += [fileSize unsignedIntegerValue]; + totalSize += fileSize.unsignedIntegerValue; fileCount += 1; } @@ -648,3 +636,4 @@ - (void)calculateSizeWithCompletionBlock:(SDWebImageCalculateSizeBlock)completio } @end + diff --git a/Example/Pods/SDWebImage/SDWebImage/SDImageCacheConfig.h b/Example/Pods/SDWebImage/SDWebImage/SDImageCacheConfig.h new file mode 100644 index 000000000..fd83527d8 --- /dev/null +++ b/Example/Pods/SDWebImage/SDWebImage/SDImageCacheConfig.h @@ -0,0 +1,40 @@ +// +// SDImageCacheConfig.h +// SDWebImage +// +// Created by Bogdan on 09/09/16. +// Copyright © 2016 Dailymotion. All rights reserved. +// + +#import +#import "SDWebImageCompat.h" + +@interface SDImageCacheConfig : NSObject + +/** + * Decompressing images that are downloaded and cached can improve performance but can consume lot of memory. + * Defaults to YES. Set this to NO if you are experiencing a crash due to excessive memory consumption. + */ +@property (assign, nonatomic) BOOL shouldDecompressImages; + +/** + * disable iCloud backup [defaults to YES] + */ +@property (assign, nonatomic) BOOL shouldDisableiCloud; + +/** + * use memory cache [defaults to YES] + */ +@property (assign, nonatomic) BOOL shouldCacheImagesInMemory; + +/** + * The maximum length of time to keep an image in the cache, in seconds + */ +@property (assign, nonatomic) NSInteger maxCacheAge; + +/** + * The maximum size of the cache, in bytes. + */ +@property (assign, nonatomic) NSUInteger maxCacheSize; + +@end diff --git a/Example/Pods/SDWebImage/SDWebImage/SDImageCacheConfig.m b/Example/Pods/SDWebImage/SDWebImage/SDImageCacheConfig.m new file mode 100644 index 000000000..c154265a0 --- /dev/null +++ b/Example/Pods/SDWebImage/SDWebImage/SDImageCacheConfig.m @@ -0,0 +1,26 @@ +// +// SDImageCacheConfig.m +// SDWebImage +// +// Created by Bogdan on 09/09/16. +// Copyright © 2016 Dailymotion. All rights reserved. +// + +#import "SDImageCacheConfig.h" + +static const NSInteger kDefaultCacheMaxCacheAge = 60 * 60 * 24 * 7; // 1 week + +@implementation SDImageCacheConfig + +- (instancetype)init { + if (self = [super init]) { + _shouldDecompressImages = YES; + _shouldDisableiCloud = YES; + _shouldCacheImagesInMemory = YES; + _maxCacheAge = kDefaultCacheMaxCacheAge; + _maxCacheSize = 0; + } + return self; +} + +@end diff --git a/Example/Pods/SDWebImage/SDWebImage/SDWebImageCompat.h b/Example/Pods/SDWebImage/SDWebImage/SDWebImageCompat.h index 3c21b4137..f555c27d0 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDWebImageCompat.h +++ b/Example/Pods/SDWebImage/SDWebImage/SDWebImageCompat.h @@ -10,25 +10,67 @@ #import #ifdef __OBJC_GC__ -#error SDWebImage does not support Objective-C Garbage Collection + #error SDWebImage does not support Objective-C Garbage Collection #endif -#if __IPHONE_OS_VERSION_MIN_REQUIRED != 20000 && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_5_0 -#error SDWebImage doesn't support Deployment Target version < 5.0 +// Apple's defines from TargetConditionals.h are a bit weird. +// Seems like TARGET_OS_MAC is always defined (on all platforms). +// To determine if we are running on OSX, we can only relly on TARGET_OS_IPHONE=0 and all the other platforms +#if !TARGET_OS_IPHONE && !TARGET_OS_IOS && !TARGET_OS_TV && !TARGET_OS_WATCH + #define SD_MAC 1 +#else + #define SD_MAC 0 #endif -#if !TARGET_OS_IPHONE -#import -#ifndef UIImage -#define UIImage NSImage +// iOS and tvOS are very similar, UIKit exists on both platforms +// Note: watchOS also has UIKit, but it's very limited +#if TARGET_OS_IOS || TARGET_OS_TV + #define SD_UIKIT 1 +#else + #define SD_UIKIT 0 +#endif + +#if TARGET_OS_IOS + #define SD_IOS 1 +#else + #define SD_IOS 0 #endif -#ifndef UIImageView -#define UIImageView NSImageView + +#if TARGET_OS_TV + #define SD_TV 1 +#else + #define SD_TV 0 #endif + +#if TARGET_OS_WATCH + #define SD_WATCH 1 #else + #define SD_WATCH 0 +#endif -#import +#if SD_MAC + #import + #ifndef UIImage + #define UIImage NSImage + #endif + #ifndef UIImageView + #define UIImageView NSImageView + #endif + #ifndef UIView + #define UIView NSView + #endif +#else + #if __IPHONE_OS_VERSION_MIN_REQUIRED != 20000 && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_5_0 + #error SDWebImage doesn't support Deployment Target version < 5.0 + #endif + + #if SD_UIKIT + #import + #endif + #if SD_WATCH + #import + #endif #endif #ifndef NS_ENUM @@ -45,10 +87,10 @@ #define SDDispatchQueueRelease(q) #define SDDispatchQueueSetterSementics strong #else -#undef SDDispatchQueueRelease -#undef SDDispatchQueueSetterSementics -#define SDDispatchQueueRelease(q) (dispatch_release(q)) -#define SDDispatchQueueSetterSementics assign + #undef SDDispatchQueueRelease + #undef SDDispatchQueueSetterSementics + #define SDDispatchQueueRelease(q) (dispatch_release(q)) + #define SDDispatchQueueSetterSementics assign #endif extern UIImage *SDScaledImageForKey(NSString *key, UIImage *image); @@ -57,16 +99,13 @@ typedef void(^SDWebImageNoParamsBlock)(); extern NSString *const SDWebImageErrorDomain; -#define dispatch_main_sync_safe(block)\ - if ([NSThread isMainThread]) {\ - block();\ - } else {\ - dispatch_sync(dispatch_get_main_queue(), block);\ - } - +#ifndef dispatch_main_async_safe #define dispatch_main_async_safe(block)\ - if ([NSThread isMainThread]) {\ + if (strcmp(dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL), dispatch_queue_get_label(dispatch_get_main_queue())) == 0) {\ block();\ } else {\ dispatch_async(dispatch_get_main_queue(), block);\ } +#endif + +static int64_t kAsyncTestTimeout = 5; diff --git a/Example/Pods/SDWebImage/SDWebImage/SDWebImageCompat.m b/Example/Pods/SDWebImage/SDWebImage/SDWebImageCompat.m index 9a011bc02..ade04be16 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDWebImageCompat.m +++ b/Example/Pods/SDWebImage/SDWebImage/SDWebImageCompat.m @@ -1,10 +1,10 @@ -// -// SDWebImageCompat.m -// SDWebImage -// -// Created by Olivier Poitrey on 11/12/12. -// Copyright (c) 2012 Dailymotion. All rights reserved. -// +/* + * This file is part of the SDWebImage package. + * (c) Olivier Poitrey + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ #import "SDWebImageCompat.h" @@ -12,13 +12,16 @@ #error SDWebImage is ARC only. Either turn on ARC for the project or use -fobjc-arc flag #endif -inline UIImage *SDScaledImageForKey(NSString *key, UIImage *image) { +inline UIImage *SDScaledImageForKey(NSString * _Nullable key, UIImage * _Nullable image) { if (!image) { return nil; } - if ([image.images count] > 0) { - NSMutableArray *scaledImages = [NSMutableArray array]; +#if SD_MAC + return image; +#elif SD_UIKIT || SD_WATCH + if ((image.images).count > 0) { + NSMutableArray *scaledImages = [NSMutableArray array]; for (UIImage *tempImage in image.images) { [scaledImages addObject:SDScaledImageForKey(key, tempImage)]; @@ -27,8 +30,12 @@ return [UIImage animatedImageWithImages:scaledImages duration:image.duration]; } else { +#if SD_WATCH + if ([[WKInterfaceDevice currentDevice] respondsToSelector:@selector(screenScale)]) { +#elif SD_UIKIT if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)]) { - CGFloat scale = [UIScreen mainScreen].scale; +#endif + CGFloat scale = 1; if (key.length >= 8) { NSRange range = [key rangeOfString:@"@2x."]; if (range.location != NSNotFound) { @@ -46,6 +53,7 @@ } return image; } +#endif } NSString *const SDWebImageErrorDomain = @"SDWebImageErrorDomain"; diff --git a/Example/Pods/SDWebImage/SDWebImage/SDWebImageDecoder.h b/Example/Pods/SDWebImage/SDWebImage/SDWebImageDecoder.h index 0176a7bae..8f8df86b7 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDWebImageDecoder.h +++ b/Example/Pods/SDWebImage/SDWebImage/SDWebImageDecoder.h @@ -1,8 +1,7 @@ /* * This file is part of the SDWebImage package. * (c) Olivier Poitrey - * - * Created by james on 9/28/11. + * (c) james * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -13,6 +12,8 @@ @interface UIImage (ForceDecode) -+ (UIImage *)decodedImageWithImage:(UIImage *)image; ++ (nullable UIImage *)decodedImageWithImage:(nullable UIImage *)image; + ++ (nullable UIImage *)decodedAndScaledDownImageWithImage:(nullable UIImage *)image; @end diff --git a/Example/Pods/SDWebImage/SDWebImage/SDWebImageDecoder.m b/Example/Pods/SDWebImage/SDWebImage/SDWebImageDecoder.m index a7c02468b..cf5e67603 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDWebImageDecoder.m +++ b/Example/Pods/SDWebImage/SDWebImage/SDWebImageDecoder.m @@ -1,8 +1,7 @@ /* * This file is part of the SDWebImage package. * (c) Olivier Poitrey - * - * Created by james on 9/28/11. + * (c) james * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -12,58 +11,269 @@ @implementation UIImage (ForceDecode) -+ (UIImage *)decodedImageWithImage:(UIImage *)image { - // while downloading huge amount of images - // autorelease the bitmap context - // and all vars to help system to free memory - // when there are memory warning. - // on iOS7, do not forget to call - // [[SDImageCache sharedImageCache] clearMemory]; - @autoreleasepool{ - // do not decode animated images - if (image.images) { return image; } +#if SD_UIKIT || SD_WATCH +static const size_t kBytesPerPixel = 4; +static const size_t kBitsPerComponent = 8; + ++ (nullable UIImage *)decodedImageWithImage:(nullable UIImage *)image { + if (![UIImage shouldDecodeImage:image]) { + return image; + } + // autorelease the bitmap context and all vars to help system to free memory when there are memory warning. + // on iOS7, do not forget to call [[SDImageCache sharedImageCache] clearMemory]; + @autoreleasepool{ + CGImageRef imageRef = image.CGImage; - - CGImageAlphaInfo alpha = CGImageGetAlphaInfo(imageRef); - BOOL anyAlpha = (alpha == kCGImageAlphaFirst || - alpha == kCGImageAlphaLast || - alpha == kCGImageAlphaPremultipliedFirst || - alpha == kCGImageAlphaPremultipliedLast); - - if (anyAlpha) { return image; } - + CGColorSpaceRef colorspaceRef = [UIImage colorSpaceForImageRef:imageRef]; + size_t width = CGImageGetWidth(imageRef); size_t height = CGImageGetHeight(imageRef); - - // current - CGColorSpaceModel imageColorSpaceModel = CGColorSpaceGetModel(CGImageGetColorSpace(imageRef)); - CGColorSpaceRef colorspaceRef = CGImageGetColorSpace(imageRef); - - bool unsupportedColorSpace = (imageColorSpaceModel == 0 || imageColorSpaceModel == -1 || imageColorSpaceModel == kCGColorSpaceModelCMYK || imageColorSpaceModel == kCGColorSpaceModelIndexed); - if (unsupportedColorSpace) - colorspaceRef = CGColorSpaceCreateDeviceRGB(); - - CGContextRef context = CGBitmapContextCreate(NULL, width, + size_t bytesPerRow = kBytesPerPixel * width; + + // kCGImageAlphaNone is not supported in CGBitmapContextCreate. + // Since the original image here has no alpha info, use kCGImageAlphaNoneSkipLast + // to create bitmap graphics contexts without alpha info. + CGContextRef context = CGBitmapContextCreate(NULL, + width, height, - CGImageGetBitsPerComponent(imageRef), - 0, + kBitsPerComponent, + bytesPerRow, colorspaceRef, - kCGBitmapByteOrderDefault | kCGImageAlphaPremultipliedFirst); - - // Draw the image into the context and retrieve the new image, which will now have an alpha layer + kCGBitmapByteOrderDefault|kCGImageAlphaNoneSkipLast); + if (context == NULL) { + return image; + } + + // Draw the image into the context and retrieve the new bitmap image without alpha CGContextDrawImage(context, CGRectMake(0, 0, width, height), imageRef); - CGImageRef imageRefWithAlpha = CGBitmapContextCreateImage(context); - UIImage *imageWithAlpha = [UIImage imageWithCGImage:imageRefWithAlpha scale:image.scale orientation:image.imageOrientation]; - - if (unsupportedColorSpace) - CGColorSpaceRelease(colorspaceRef); + CGImageRef imageRefWithoutAlpha = CGBitmapContextCreateImage(context); + UIImage *imageWithoutAlpha = [UIImage imageWithCGImage:imageRefWithoutAlpha + scale:image.scale + orientation:image.imageOrientation]; CGContextRelease(context); - CGImageRelease(imageRefWithAlpha); + CGImageRelease(imageRefWithoutAlpha); + + return imageWithoutAlpha; + } +} + +/* + * Defines the maximum size in MB of the decoded image when the flag `SDWebImageScaleDownLargeImages` is set + * Suggested value for iPad1 and iPhone 3GS: 60. + * Suggested value for iPad2 and iPhone 4: 120. + * Suggested value for iPhone 3G and iPod 2 and earlier devices: 30. + */ +static const CGFloat kDestImageSizeMB = 60.0f; + +/* + * Defines the maximum size in MB of a tile used to decode image when the flag `SDWebImageScaleDownLargeImages` is set + * Suggested value for iPad1 and iPhone 3GS: 20. + * Suggested value for iPad2 and iPhone 4: 40. + * Suggested value for iPhone 3G and iPod 2 and earlier devices: 10. + */ +static const CGFloat kSourceImageTileSizeMB = 20.0f; + +static const CGFloat kBytesPerMB = 1024.0f * 1024.0f; +static const CGFloat kPixelsPerMB = kBytesPerMB / kBytesPerPixel; +static const CGFloat kDestTotalPixels = kDestImageSizeMB * kPixelsPerMB; +static const CGFloat kTileTotalPixels = kSourceImageTileSizeMB * kPixelsPerMB; + +static const CGFloat kDestSeemOverlap = 2.0f; // the numbers of pixels to overlap the seems where tiles meet. + ++ (nullable UIImage *)decodedAndScaledDownImageWithImage:(nullable UIImage *)image { + if (![UIImage shouldDecodeImage:image]) { + return image; + } + + if (![UIImage shouldScaleDownImage:image]) { + return [UIImage decodedImageWithImage:image]; + } + + CGContextRef destContext; + + // autorelease the bitmap context and all vars to help system to free memory when there are memory warning. + // on iOS7, do not forget to call [[SDImageCache sharedImageCache] clearMemory]; + @autoreleasepool { + CGImageRef sourceImageRef = image.CGImage; + + CGSize sourceResolution = CGSizeZero; + sourceResolution.width = CGImageGetWidth(sourceImageRef); + sourceResolution.height = CGImageGetHeight(sourceImageRef); + float sourceTotalPixels = sourceResolution.width * sourceResolution.height; + // Determine the scale ratio to apply to the input image + // that results in an output image of the defined size. + // see kDestImageSizeMB, and how it relates to destTotalPixels. + float imageScale = kDestTotalPixels / sourceTotalPixels; + CGSize destResolution = CGSizeZero; + destResolution.width = (int)(sourceResolution.width*imageScale); + destResolution.height = (int)(sourceResolution.height*imageScale); + + // current color space + CGColorSpaceRef colorspaceRef = [UIImage colorSpaceForImageRef:sourceImageRef]; + + size_t bytesPerRow = kBytesPerPixel * destResolution.width; + + // Allocate enough pixel data to hold the output image. + void* destBitmapData = malloc( bytesPerRow * destResolution.height ); + if (destBitmapData == NULL) { + return image; + } + + // kCGImageAlphaNone is not supported in CGBitmapContextCreate. + // Since the original image here has no alpha info, use kCGImageAlphaNoneSkipLast + // to create bitmap graphics contexts without alpha info. + destContext = CGBitmapContextCreate(destBitmapData, + destResolution.width, + destResolution.height, + kBitsPerComponent, + bytesPerRow, + colorspaceRef, + kCGBitmapByteOrderDefault|kCGImageAlphaNoneSkipLast); - return imageWithAlpha; + if (destContext == NULL) { + free(destBitmapData); + return image; + } + CGContextSetInterpolationQuality(destContext, kCGInterpolationHigh); + + // Now define the size of the rectangle to be used for the + // incremental blits from the input image to the output image. + // we use a source tile width equal to the width of the source + // image due to the way that iOS retrieves image data from disk. + // iOS must decode an image from disk in full width 'bands', even + // if current graphics context is clipped to a subrect within that + // band. Therefore we fully utilize all of the pixel data that results + // from a decoding opertion by achnoring our tile size to the full + // width of the input image. + CGRect sourceTile = CGRectZero; + sourceTile.size.width = sourceResolution.width; + // The source tile height is dynamic. Since we specified the size + // of the source tile in MB, see how many rows of pixels high it + // can be given the input image width. + sourceTile.size.height = (int)(kTileTotalPixels / sourceTile.size.width ); + sourceTile.origin.x = 0.0f; + // The output tile is the same proportions as the input tile, but + // scaled to image scale. + CGRect destTile; + destTile.size.width = destResolution.width; + destTile.size.height = sourceTile.size.height * imageScale; + destTile.origin.x = 0.0f; + // The source seem overlap is proportionate to the destination seem overlap. + // this is the amount of pixels to overlap each tile as we assemble the ouput image. + float sourceSeemOverlap = (int)((kDestSeemOverlap/destResolution.height)*sourceResolution.height); + CGImageRef sourceTileImageRef; + // calculate the number of read/write operations required to assemble the + // output image. + int iterations = (int)( sourceResolution.height / sourceTile.size.height ); + // If tile height doesn't divide the image height evenly, add another iteration + // to account for the remaining pixels. + int remainder = (int)sourceResolution.height % (int)sourceTile.size.height; + if(remainder) { + iterations++; + } + // Add seem overlaps to the tiles, but save the original tile height for y coordinate calculations. + float sourceTileHeightMinusOverlap = sourceTile.size.height; + sourceTile.size.height += sourceSeemOverlap; + destTile.size.height += kDestSeemOverlap; + for( int y = 0; y < iterations; ++y ) { + @autoreleasepool { + sourceTile.origin.y = y * sourceTileHeightMinusOverlap + sourceSeemOverlap; + destTile.origin.y = destResolution.height - (( y + 1 ) * sourceTileHeightMinusOverlap * imageScale + kDestSeemOverlap); + sourceTileImageRef = CGImageCreateWithImageInRect( sourceImageRef, sourceTile ); + if( y == iterations - 1 && remainder ) { + float dify = destTile.size.height; + destTile.size.height = CGImageGetHeight( sourceTileImageRef ) * imageScale; + dify -= destTile.size.height; + destTile.origin.y += dify; + } + CGContextDrawImage( destContext, destTile, sourceTileImageRef ); + CGImageRelease( sourceTileImageRef ); + } + } + + CGImageRef destImageRef = CGBitmapContextCreateImage(destContext); + CGContextRelease(destContext); + if (destImageRef == NULL) { + return image; + } + UIImage *destImage = [UIImage imageWithCGImage:destImageRef scale:image.scale orientation:image.imageOrientation]; + CGImageRelease(destImageRef); + if (destImage == nil) { + return image; + } + return destImage; + } +} + ++ (BOOL)shouldDecodeImage:(nullable UIImage *)image { + // Prevent "CGBitmapContextCreateImage: invalid context 0x0" error + if (image == nil) { + return NO; + } + + // do not decode animated images + if (image.images != nil) { + return NO; } + + CGImageRef imageRef = image.CGImage; + + CGImageAlphaInfo alpha = CGImageGetAlphaInfo(imageRef); + BOOL anyAlpha = (alpha == kCGImageAlphaFirst || + alpha == kCGImageAlphaLast || + alpha == kCGImageAlphaPremultipliedFirst || + alpha == kCGImageAlphaPremultipliedLast); + // do not decode images with alpha + if (anyAlpha) { + return NO; + } + + return YES; +} + ++ (BOOL)shouldScaleDownImage:(nonnull UIImage *)image { + BOOL shouldScaleDown = YES; + + CGImageRef sourceImageRef = image.CGImage; + CGSize sourceResolution = CGSizeZero; + sourceResolution.width = CGImageGetWidth(sourceImageRef); + sourceResolution.height = CGImageGetHeight(sourceImageRef); + float sourceTotalPixels = sourceResolution.width * sourceResolution.height; + float imageScale = kDestTotalPixels / sourceTotalPixels; + if (imageScale < 1) { + shouldScaleDown = YES; + } else { + shouldScaleDown = NO; + } + + return shouldScaleDown; +} + ++ (CGColorSpaceRef)colorSpaceForImageRef:(CGImageRef)imageRef { + // current + CGColorSpaceModel imageColorSpaceModel = CGColorSpaceGetModel(CGImageGetColorSpace(imageRef)); + CGColorSpaceRef colorspaceRef = CGImageGetColorSpace(imageRef); + + BOOL unsupportedColorSpace = (imageColorSpaceModel == kCGColorSpaceModelUnknown || + imageColorSpaceModel == kCGColorSpaceModelMonochrome || + imageColorSpaceModel == kCGColorSpaceModelCMYK || + imageColorSpaceModel == kCGColorSpaceModelIndexed); + if (unsupportedColorSpace) { + colorspaceRef = CGColorSpaceCreateDeviceRGB(); + CFAutorelease(colorspaceRef); + } + return colorspaceRef; +} +#elif SD_MAC ++ (nullable UIImage *)decodedImageWithImage:(nullable UIImage *)image { + return image; +} + ++ (nullable UIImage *)decodedAndScaledDownImageWithImage:(nullable UIImage *)image { + return image; } +#endif @end diff --git a/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloader.h b/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloader.h index b64fb1300..94bc76e59 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloader.h +++ b/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloader.h @@ -15,7 +15,7 @@ typedef NS_OPTIONS(NSUInteger, SDWebImageDownloaderOptions) { SDWebImageDownloaderProgressiveDownload = 1 << 1, /** - * By default, request prevent the of NSURLCache. With this flag, NSURLCache + * By default, request prevent the use of NSURLCache. With this flag, NSURLCache * is used with default policies. */ SDWebImageDownloaderUseNSURLCache = 1 << 2, @@ -49,6 +49,11 @@ typedef NS_OPTIONS(NSUInteger, SDWebImageDownloaderOptions) { * Put the image in the high priority queue. */ SDWebImageDownloaderHighPriority = 1 << 7, + + /** + * Scale down the image + */ + SDWebImageDownloaderScaleDownLargeImages = 1 << 8, }; typedef NS_ENUM(NSInteger, SDWebImageDownloaderExecutionOrder) { @@ -63,14 +68,28 @@ typedef NS_ENUM(NSInteger, SDWebImageDownloaderExecutionOrder) { SDWebImageDownloaderLIFOExecutionOrder }; -extern NSString *const SDWebImageDownloadStartNotification; -extern NSString *const SDWebImageDownloadStopNotification; +extern NSString * _Nonnull const SDWebImageDownloadStartNotification; +extern NSString * _Nonnull const SDWebImageDownloadStopNotification; + +typedef void(^SDWebImageDownloaderProgressBlock)(NSInteger receivedSize, NSInteger expectedSize, NSURL * _Nullable targetURL); -typedef void(^SDWebImageDownloaderProgressBlock)(NSInteger receivedSize, NSInteger expectedSize); +typedef void(^SDWebImageDownloaderCompletedBlock)(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, BOOL finished); -typedef void(^SDWebImageDownloaderCompletedBlock)(UIImage *image, NSData *data, NSError *error, BOOL finished); +typedef NSDictionary SDHTTPHeadersDictionary; +typedef NSMutableDictionary SDHTTPHeadersMutableDictionary; + +typedef SDHTTPHeadersDictionary * _Nullable (^SDWebImageDownloaderHeadersFilterBlock)(NSURL * _Nullable url, SDHTTPHeadersDictionary * _Nullable headers); + +/** + * A token associated with each download. Can be used to cancel a download + */ +@interface SDWebImageDownloadToken : NSObject + +@property (nonatomic, strong, nullable) NSURL *url; +@property (nonatomic, strong, nullable) id downloadOperationCancelToken; + +@end -typedef NSDictionary *(^SDWebImageDownloaderHeadersFilterBlock)(NSURL *url, NSDictionary *headers); /** * Asynchronous downloader dedicated and optimized for image loading. @@ -83,6 +102,9 @@ typedef NSDictionary *(^SDWebImageDownloaderHeadersFilterBlock)(NSURL *url, NSDi */ @property (assign, nonatomic) BOOL shouldDecompressImages; +/** + * The maximum number of concurrent downloads + */ @property (assign, nonatomic) NSInteger maxConcurrentDownloads; /** @@ -107,22 +129,22 @@ typedef NSDictionary *(^SDWebImageDownloaderHeadersFilterBlock)(NSURL *url, NSDi * * @return global shared instance of downloader class */ -+ (SDWebImageDownloader *)sharedDownloader; ++ (nonnull instancetype)sharedDownloader; /** * Set the default URL credential to be set for request operations. */ -@property (strong, nonatomic) NSURLCredential *urlCredential; +@property (strong, nonatomic, nullable) NSURLCredential *urlCredential; /** * Set username */ -@property (strong, nonatomic) NSString *username; +@property (strong, nonatomic, nullable) NSString *username; /** * Set password */ -@property (strong, nonatomic) NSString *password; +@property (strong, nonatomic, nullable) NSString *password; /** * Set filter to pick headers for downloading image HTTP request. @@ -130,7 +152,14 @@ typedef NSDictionary *(^SDWebImageDownloaderHeadersFilterBlock)(NSURL *url, NSDi * This block will be invoked for each downloading image request, returned * NSDictionary will be used as headers in corresponding HTTP request. */ -@property (nonatomic, copy) SDWebImageDownloaderHeadersFilterBlock headersFilter; +@property (nonatomic, copy, nullable) SDWebImageDownloaderHeadersFilterBlock headersFilter; + +/** + * Creates an instance of a downloader with specified session configuration. + * *Note*: `timeoutIntervalForRequest` is going to be overwritten. + * @return new instance of downloader class + */ +- (nonnull instancetype)initWithSessionConfiguration:(nullable NSURLSessionConfiguration *)sessionConfiguration NS_DESIGNATED_INITIALIZER; /** * Set a value for a HTTP header to be appended to each download HTTP request. @@ -138,14 +167,14 @@ typedef NSDictionary *(^SDWebImageDownloaderHeadersFilterBlock)(NSURL *url, NSDi * @param value The value for the header field. Use `nil` value to remove the header. * @param field The name of the header field to set. */ -- (void)setValue:(NSString *)value forHTTPHeaderField:(NSString *)field; +- (void)setValue:(nullable NSString *)value forHTTPHeaderField:(nullable NSString *)field; /** * Returns the value of the specified HTTP header field. * * @return The value associated with the header field field, or `nil` if there is no corresponding header field. */ -- (NSString *)valueForHTTPHeaderField:(NSString *)field; +- (nullable NSString *)valueForHTTPHeaderField:(nullable NSString *)field; /** * Sets a subclass of `SDWebImageDownloaderOperation` as the default @@ -155,7 +184,7 @@ typedef NSDictionary *(^SDWebImageDownloaderHeadersFilterBlock)(NSURL *url, NSDi * @param operationClass The subclass of `SDWebImageDownloaderOperation` to set * as default. Passing `nil` will revert to `SDWebImageDownloaderOperation`. */ -- (void)setOperationClass:(Class)operationClass; +- (void)setOperationClass:(nullable Class)operationClass; /** * Creates a SDWebImageDownloader async downloader instance with a given URL @@ -167,6 +196,7 @@ typedef NSDictionary *(^SDWebImageDownloaderHeadersFilterBlock)(NSURL *url, NSDi * @param url The URL to the image to download * @param options The options to be used for this download * @param progressBlock A block called repeatedly while the image is downloading + * @note the progress block is executed on a background queue * @param completedBlock A block called once the download is completed. * If the download succeeded, the image parameter is set, in case of error, * error parameter is set with the error. The last parameter is always YES @@ -176,16 +206,28 @@ typedef NSDictionary *(^SDWebImageDownloaderHeadersFilterBlock)(NSURL *url, NSDi * before to be called a last time with the full image and finished argument * set to YES. In case of error, the finished argument is always YES. * - * @return A cancellable SDWebImageOperation + * @return A token (SDWebImageDownloadToken) that can be passed to -cancel: to cancel this operation */ -- (id )downloadImageWithURL:(NSURL *)url - options:(SDWebImageDownloaderOptions)options - progress:(SDWebImageDownloaderProgressBlock)progressBlock - completed:(SDWebImageDownloaderCompletedBlock)completedBlock; +- (nullable SDWebImageDownloadToken *)downloadImageWithURL:(nullable NSURL *)url + options:(SDWebImageDownloaderOptions)options + progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDWebImageDownloaderCompletedBlock)completedBlock; + +/** + * Cancels a download that was previously queued using -downloadImageWithURL:options:progress:completed: + * + * @param token The token received from -downloadImageWithURL:options:progress:completed: that should be canceled. + */ +- (void)cancel:(nullable SDWebImageDownloadToken *)token; /** * Sets the download queue suspension state */ - (void)setSuspended:(BOOL)suspended; +/** + * Cancels all download operations in the queue + */ +- (void)cancelAllDownloads; + @end diff --git a/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloader.m b/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloader.m index 1fdcfc92f..189d16303 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloader.m +++ b/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloader.m @@ -10,18 +10,22 @@ #import "SDWebImageDownloaderOperation.h" #import -static NSString *const kProgressCallbackKey = @"progress"; -static NSString *const kCompletedCallbackKey = @"completed"; +@implementation SDWebImageDownloadToken +@end + -@interface SDWebImageDownloader () +@interface SDWebImageDownloader () -@property (strong, nonatomic) NSOperationQueue *downloadQueue; -@property (weak, nonatomic) NSOperation *lastAddedOperation; -@property (assign, nonatomic) Class operationClass; -@property (strong, nonatomic) NSMutableDictionary *URLCallbacks; -@property (strong, nonatomic) NSMutableDictionary *HTTPHeaders; +@property (strong, nonatomic, nonnull) NSOperationQueue *downloadQueue; +@property (weak, nonatomic, nullable) NSOperation *lastAddedOperation; +@property (assign, nonatomic, nullable) Class operationClass; +@property (strong, nonatomic, nonnull) NSMutableDictionary *URLOperations; +@property (strong, nonatomic, nullable) SDHTTPHeadersMutableDictionary *HTTPHeaders; // This queue is used to serialize the handling of the network responses of all the download operation in a single queue -@property (SDDispatchQueueSetterSementics, nonatomic) dispatch_queue_t barrierQueue; +@property (SDDispatchQueueSetterSementics, nonatomic, nullable) dispatch_queue_t barrierQueue; + +// The session in which data tasks will run +@property (strong, nonatomic) NSURLSession *session; @end @@ -50,7 +54,7 @@ + (void)initialize { } } -+ (SDWebImageDownloader *)sharedDownloader { ++ (nonnull instancetype)sharedDownloader { static dispatch_once_t once; static id instance; dispatch_once(&once, ^{ @@ -59,14 +63,19 @@ + (SDWebImageDownloader *)sharedDownloader { return instance; } -- (id)init { +- (nonnull instancetype)init { + return [self initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]]; +} + +- (nonnull instancetype)initWithSessionConfiguration:(nullable NSURLSessionConfiguration *)sessionConfiguration { if ((self = [super init])) { _operationClass = [SDWebImageDownloaderOperation class]; _shouldDecompressImages = YES; _executionOrder = SDWebImageDownloaderFIFOExecutionOrder; _downloadQueue = [NSOperationQueue new]; _downloadQueue.maxConcurrentOperationCount = 6; - _URLCallbacks = [NSMutableDictionary new]; + _downloadQueue.name = @"com.hackemist.SDWebImageDownloader"; + _URLOperations = [NSMutableDictionary new]; #ifdef SD_WEBP _HTTPHeaders = [@{@"Accept": @"image/webp,image/*;q=0.8"} mutableCopy]; #else @@ -74,16 +83,30 @@ - (id)init { #endif _barrierQueue = dispatch_queue_create("com.hackemist.SDWebImageDownloaderBarrierQueue", DISPATCH_QUEUE_CONCURRENT); _downloadTimeout = 15.0; + + sessionConfiguration.timeoutIntervalForRequest = _downloadTimeout; + + /** + * Create the session for this task + * We send nil as delegate queue so that the session creates a serial operation queue for performing all delegate + * method calls and completion handler calls. + */ + self.session = [NSURLSession sessionWithConfiguration:sessionConfiguration + delegate:self + delegateQueue:nil]; } return self; } - (void)dealloc { + [self.session invalidateAndCancel]; + self.session = nil; + [self.downloadQueue cancelAllOperations]; SDDispatchQueueRelease(_barrierQueue); } -- (void)setValue:(NSString *)value forHTTPHeaderField:(NSString *)field { +- (void)setValue:(nullable NSString *)value forHTTPHeaderField:(nullable NSString *)field { if (value) { self.HTTPHeaders[field] = value; } @@ -92,7 +115,7 @@ - (void)setValue:(NSString *)value forHTTPHeaderField:(NSString *)field { } } -- (NSString *)valueForHTTPHeaderField:(NSString *)field { +- (nullable NSString *)valueForHTTPHeaderField:(nullable NSString *)field { return self.HTTPHeaders[field]; } @@ -108,16 +131,23 @@ - (NSInteger)maxConcurrentDownloads { return _downloadQueue.maxConcurrentOperationCount; } -- (void)setOperationClass:(Class)operationClass { - _operationClass = operationClass ?: [SDWebImageDownloaderOperation class]; +- (void)setOperationClass:(nullable Class)operationClass { + if (operationClass && [operationClass isSubclassOfClass:[NSOperation class]] && [operationClass conformsToProtocol:@protocol(SDWebImageDownloaderOperationInterface)]) { + _operationClass = operationClass; + } else { + _operationClass = [SDWebImageDownloaderOperation class]; + } } -- (id )downloadImageWithURL:(NSURL *)url options:(SDWebImageDownloaderOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageDownloaderCompletedBlock)completedBlock { - __block SDWebImageDownloaderOperation *operation; - __weak __typeof(self)wself = self; +- (nullable SDWebImageDownloadToken *)downloadImageWithURL:(nullable NSURL *)url + options:(SDWebImageDownloaderOptions)options + progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDWebImageDownloaderCompletedBlock)completedBlock { + __weak SDWebImageDownloader *wself = self; - [self addProgressCallback:progressBlock completedBlock:completedBlock forURL:url createCallback:^{ - NSTimeInterval timeoutInterval = wself.downloadTimeout; + return [self addProgressCallback:progressBlock completedBlock:completedBlock forURL:url createCallback:^SDWebImageDownloaderOperation *{ + __strong __typeof (wself) sself = wself; + NSTimeInterval timeoutInterval = sself.downloadTimeout; if (timeoutInterval == 0.0) { timeoutInterval = 15.0; } @@ -126,56 +156,19 @@ - (void)setOperationClass:(Class)operationClass { NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:url cachePolicy:(options & SDWebImageDownloaderUseNSURLCache ? NSURLRequestUseProtocolCachePolicy : NSURLRequestReloadIgnoringLocalCacheData) timeoutInterval:timeoutInterval]; request.HTTPShouldHandleCookies = (options & SDWebImageDownloaderHandleCookies); request.HTTPShouldUsePipelining = YES; - if (wself.headersFilter) { - request.allHTTPHeaderFields = wself.headersFilter(url, [wself.HTTPHeaders copy]); + if (sself.headersFilter) { + request.allHTTPHeaderFields = sself.headersFilter(url, [sself.HTTPHeaders copy]); } else { - request.allHTTPHeaderFields = wself.HTTPHeaders; + request.allHTTPHeaderFields = sself.HTTPHeaders; } - operation = [[wself.operationClass alloc] initWithRequest:request - options:options - progress:^(NSInteger receivedSize, NSInteger expectedSize) { - SDWebImageDownloader *sself = wself; - if (!sself) return; - __block NSArray *callbacksForURL; - dispatch_sync(sself.barrierQueue, ^{ - callbacksForURL = [sself.URLCallbacks[url] copy]; - }); - for (NSDictionary *callbacks in callbacksForURL) { - dispatch_async(dispatch_get_main_queue(), ^{ - SDWebImageDownloaderProgressBlock callback = callbacks[kProgressCallbackKey]; - if (callback) callback(receivedSize, expectedSize); - }); - } - } - completed:^(UIImage *image, NSData *data, NSError *error, BOOL finished) { - SDWebImageDownloader *sself = wself; - if (!sself) return; - __block NSArray *callbacksForURL; - dispatch_barrier_sync(sself.barrierQueue, ^{ - callbacksForURL = [sself.URLCallbacks[url] copy]; - if (finished) { - [sself.URLCallbacks removeObjectForKey:url]; - } - }); - for (NSDictionary *callbacks in callbacksForURL) { - SDWebImageDownloaderCompletedBlock callback = callbacks[kCompletedCallbackKey]; - if (callback) callback(image, data, error, finished); - } - } - cancelled:^{ - SDWebImageDownloader *sself = wself; - if (!sself) return; - dispatch_barrier_async(sself.barrierQueue, ^{ - [sself.URLCallbacks removeObjectForKey:url]; - }); - }]; - operation.shouldDecompressImages = wself.shouldDecompressImages; + SDWebImageDownloaderOperation *operation = [[sself.operationClass alloc] initWithRequest:request inSession:sself.session options:options]; + operation.shouldDecompressImages = sself.shouldDecompressImages; - if (wself.urlCredential) { - operation.credential = wself.urlCredential; - } else if (wself.username && wself.password) { - operation.credential = [NSURLCredential credentialWithUser:wself.username password:wself.password persistence:NSURLCredentialPersistenceForSession]; + if (sself.urlCredential) { + operation.credential = sself.urlCredential; + } else if (sself.username && sself.password) { + operation.credential = [NSURLCredential credentialWithUser:sself.username password:sself.password persistence:NSURLCredentialPersistenceForSession]; } if (options & SDWebImageDownloaderHighPriority) { @@ -184,49 +177,139 @@ - (void)setOperationClass:(Class)operationClass { operation.queuePriority = NSOperationQueuePriorityLow; } - [wself.downloadQueue addOperation:operation]; - if (wself.executionOrder == SDWebImageDownloaderLIFOExecutionOrder) { + [sself.downloadQueue addOperation:operation]; + if (sself.executionOrder == SDWebImageDownloaderLIFOExecutionOrder) { // Emulate LIFO execution order by systematically adding new operations as last operation's dependency - [wself.lastAddedOperation addDependency:operation]; - wself.lastAddedOperation = operation; + [sself.lastAddedOperation addDependency:operation]; + sself.lastAddedOperation = operation; } + + return operation; }]; +} - return operation; +- (void)cancel:(nullable SDWebImageDownloadToken *)token { + dispatch_barrier_async(self.barrierQueue, ^{ + SDWebImageDownloaderOperation *operation = self.URLOperations[token.url]; + BOOL canceled = [operation cancel:token.downloadOperationCancelToken]; + if (canceled) { + [self.URLOperations removeObjectForKey:token.url]; + } + }); } -- (void)addProgressCallback:(SDWebImageDownloaderProgressBlock)progressBlock completedBlock:(SDWebImageDownloaderCompletedBlock)completedBlock forURL:(NSURL *)url createCallback:(SDWebImageNoParamsBlock)createCallback { +- (nullable SDWebImageDownloadToken *)addProgressCallback:(SDWebImageDownloaderProgressBlock)progressBlock + completedBlock:(SDWebImageDownloaderCompletedBlock)completedBlock + forURL:(nullable NSURL *)url + createCallback:(SDWebImageDownloaderOperation *(^)())createCallback { // The URL will be used as the key to the callbacks dictionary so it cannot be nil. If it is nil immediately call the completed block with no image or data. if (url == nil) { if (completedBlock != nil) { completedBlock(nil, nil, nil, NO); } - return; + return nil; } - dispatch_barrier_sync(self.barrierQueue, ^{ - BOOL first = NO; - if (!self.URLCallbacks[url]) { - self.URLCallbacks[url] = [NSMutableArray new]; - first = YES; - } + __block SDWebImageDownloadToken *token = nil; - // Handle single download of simultaneous download request for the same URL - NSMutableArray *callbacksForURL = self.URLCallbacks[url]; - NSMutableDictionary *callbacks = [NSMutableDictionary new]; - if (progressBlock) callbacks[kProgressCallbackKey] = [progressBlock copy]; - if (completedBlock) callbacks[kCompletedCallbackKey] = [completedBlock copy]; - [callbacksForURL addObject:callbacks]; - self.URLCallbacks[url] = callbacksForURL; + dispatch_barrier_sync(self.barrierQueue, ^{ + SDWebImageDownloaderOperation *operation = self.URLOperations[url]; + if (!operation) { + operation = createCallback(); + self.URLOperations[url] = operation; - if (first) { - createCallback(); + __weak SDWebImageDownloaderOperation *woperation = operation; + operation.completionBlock = ^{ + SDWebImageDownloaderOperation *soperation = woperation; + if (!soperation) return; + if (self.URLOperations[url] == soperation) { + [self.URLOperations removeObjectForKey:url]; + }; + }; } + id downloadOperationCancelToken = [operation addHandlersForProgress:progressBlock completed:completedBlock]; + + token = [SDWebImageDownloadToken new]; + token.url = url; + token.downloadOperationCancelToken = downloadOperationCancelToken; }); + + return token; } - (void)setSuspended:(BOOL)suspended { - [self.downloadQueue setSuspended:suspended]; + (self.downloadQueue).suspended = suspended; +} + +- (void)cancelAllDownloads { + [self.downloadQueue cancelAllOperations]; +} + +#pragma mark Helper methods + +- (SDWebImageDownloaderOperation *)operationWithTask:(NSURLSessionTask *)task { + SDWebImageDownloaderOperation *returnOperation = nil; + for (SDWebImageDownloaderOperation *operation in self.downloadQueue.operations) { + if (operation.dataTask.taskIdentifier == task.taskIdentifier) { + returnOperation = operation; + break; + } + } + return returnOperation; +} + +#pragma mark NSURLSessionDataDelegate + +- (void)URLSession:(NSURLSession *)session + dataTask:(NSURLSessionDataTask *)dataTask +didReceiveResponse:(NSURLResponse *)response + completionHandler:(void (^)(NSURLSessionResponseDisposition disposition))completionHandler { + + // Identify the operation that runs this task and pass it the delegate method + SDWebImageDownloaderOperation *dataOperation = [self operationWithTask:dataTask]; + + [dataOperation URLSession:session dataTask:dataTask didReceiveResponse:response completionHandler:completionHandler]; +} + +- (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveData:(NSData *)data { + + // Identify the operation that runs this task and pass it the delegate method + SDWebImageDownloaderOperation *dataOperation = [self operationWithTask:dataTask]; + + [dataOperation URLSession:session dataTask:dataTask didReceiveData:data]; +} + +- (void)URLSession:(NSURLSession *)session + dataTask:(NSURLSessionDataTask *)dataTask + willCacheResponse:(NSCachedURLResponse *)proposedResponse + completionHandler:(void (^)(NSCachedURLResponse *cachedResponse))completionHandler { + + // Identify the operation that runs this task and pass it the delegate method + SDWebImageDownloaderOperation *dataOperation = [self operationWithTask:dataTask]; + + [dataOperation URLSession:session dataTask:dataTask willCacheResponse:proposedResponse completionHandler:completionHandler]; +} + +#pragma mark NSURLSessionTaskDelegate + +- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error { + // Identify the operation that runs this task and pass it the delegate method + SDWebImageDownloaderOperation *dataOperation = [self operationWithTask:task]; + + [dataOperation URLSession:session task:task didCompleteWithError:error]; +} + +- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task willPerformHTTPRedirection:(NSHTTPURLResponse *)response newRequest:(NSURLRequest *)request completionHandler:(void (^)(NSURLRequest * _Nullable))completionHandler { + + completionHandler(request); +} + +- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler { + + // Identify the operation that runs this task and pass it the delegate method + SDWebImageDownloaderOperation *dataOperation = [self operationWithTask:task]; + + [dataOperation URLSession:session task:task didReceiveChallenge:challenge completionHandler:completionHandler]; } @end diff --git a/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloaderOperation.h b/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloaderOperation.h index dd48b2286..b1908550e 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloaderOperation.h +++ b/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloaderOperation.h @@ -10,34 +10,61 @@ #import "SDWebImageDownloader.h" #import "SDWebImageOperation.h" -extern NSString *const SDWebImageDownloadStartNotification; -extern NSString *const SDWebImageDownloadReceiveResponseNotification; -extern NSString *const SDWebImageDownloadStopNotification; -extern NSString *const SDWebImageDownloadFinishNotification; +extern NSString * _Nonnull const SDWebImageDownloadStartNotification; +extern NSString * _Nonnull const SDWebImageDownloadReceiveResponseNotification; +extern NSString * _Nonnull const SDWebImageDownloadStopNotification; +extern NSString * _Nonnull const SDWebImageDownloadFinishNotification; -@interface SDWebImageDownloaderOperation : NSOperation + + +/** + Describes a downloader operation. If one wants to use a custom downloader op, it needs to inherit from `NSOperation` and conform to this protocol + */ +@protocol SDWebImageDownloaderOperationInterface + +- (nonnull instancetype)initWithRequest:(nullable NSURLRequest *)request + inSession:(nullable NSURLSession *)session + options:(SDWebImageDownloaderOptions)options; + +- (nullable id)addHandlersForProgress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDWebImageDownloaderCompletedBlock)completedBlock; + +- (BOOL)shouldDecompressImages; +- (void)setShouldDecompressImages:(BOOL)value; + +- (nullable NSURLCredential *)credential; +- (void)setCredential:(nullable NSURLCredential *)value; + +@end + + +@interface SDWebImageDownloaderOperation : NSOperation + +/** + * The request used by the operation's task. + */ +@property (strong, nonatomic, readonly, nullable) NSURLRequest *request; /** - * The request used by the operation's connection. + * The operation's task */ -@property (strong, nonatomic, readonly) NSURLRequest *request; +@property (strong, nonatomic, readonly, nullable) NSURLSessionTask *dataTask; @property (assign, nonatomic) BOOL shouldDecompressImages; /** - * Whether the URL connection should consult the credential storage for authenticating the connection. `YES` by default. - * - * This is the value that is returned in the `NSURLConnectionDelegate` method `-connectionShouldUseCredentialStorage:`. + * Was used to determine whether the URL connection should consult the credential storage for authenticating the connection. + * @deprecated Not used for a couple of versions */ -@property (nonatomic, assign) BOOL shouldUseCredentialStorage; +@property (nonatomic, assign) BOOL shouldUseCredentialStorage __deprecated_msg("Property deprecated. Does nothing. Kept only for backwards compatibility"); /** * The credential used for authentication challenges in `-connection:didReceiveAuthenticationChallenge:`. * * This will be overridden by any shared credentials that exist for the username or password of the request URL, if present. */ -@property (nonatomic, strong) NSURLCredential *credential; +@property (nonatomic, strong, nullable) NSURLCredential *credential; /** * The SDWebImageDownloaderOptions for the receiver. @@ -52,7 +79,7 @@ extern NSString *const SDWebImageDownloadFinishNotification; /** * The response returned by the operation's connection. */ -@property (strong, nonatomic) NSURLResponse *response; +@property (strong, nonatomic, nullable) NSURLResponse *response; /** * Initializes a `SDWebImageDownloaderOperation` object @@ -60,19 +87,36 @@ extern NSString *const SDWebImageDownloadFinishNotification; * @see SDWebImageDownloaderOperation * * @param request the URL request + * @param session the URL session in which this operation will run * @param options downloader options - * @param progressBlock the block executed when a new chunk of data arrives. + * + * @return the initialized instance + */ +- (nonnull instancetype)initWithRequest:(nullable NSURLRequest *)request + inSession:(nullable NSURLSession *)session + options:(SDWebImageDownloaderOptions)options NS_DESIGNATED_INITIALIZER; + +/** + * Adds handlers for progress and completion. Returns a tokent that can be passed to -cancel: to cancel this set of + * callbacks. + * + * @param progressBlock the block executed when a new chunk of data arrives. * @note the progress block is executed on a background queue - * @param completedBlock the block executed when the download is done. + * @param completedBlock the block executed when the download is done. * @note the completed block is executed on the main queue for success. If errors are found, there is a chance the block will be executed on a background queue - * @param cancelBlock the block executed if the download (operation) is cancelled * - * @return the initialized instance + * @return the token to use to cancel this set of handlers + */ +- (nullable id)addHandlersForProgress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDWebImageDownloaderCompletedBlock)completedBlock; + +/** + * Cancels a set of callbacks. Once all callbacks are canceled, the operation is cancelled. + * + * @param token the token representing a set of callbacks to cancel + * + * @return YES if the operation was stopped because this was the last token to be canceled. NO otherwise. */ -- (id)initWithRequest:(NSURLRequest *)request - options:(SDWebImageDownloaderOptions)options - progress:(SDWebImageDownloaderProgressBlock)progressBlock - completed:(SDWebImageDownloaderCompletedBlock)completedBlock - cancelled:(SDWebImageNoParamsBlock)cancelBlock; +- (BOOL)cancel:(nullable id)token; @end diff --git a/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloaderOperation.m b/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloaderOperation.m index 5a8bd11fc..63df1afe8 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloaderOperation.m +++ b/Example/Pods/SDWebImage/SDWebImage/SDWebImageDownloaderOperation.m @@ -11,25 +11,37 @@ #import "UIImage+MultiFormat.h" #import #import "SDWebImageManager.h" +#import "NSImage+WebCache.h" NSString *const SDWebImageDownloadStartNotification = @"SDWebImageDownloadStartNotification"; NSString *const SDWebImageDownloadReceiveResponseNotification = @"SDWebImageDownloadReceiveResponseNotification"; NSString *const SDWebImageDownloadStopNotification = @"SDWebImageDownloadStopNotification"; NSString *const SDWebImageDownloadFinishNotification = @"SDWebImageDownloadFinishNotification"; -@interface SDWebImageDownloaderOperation () +static NSString *const kProgressCallbackKey = @"progress"; +static NSString *const kCompletedCallbackKey = @"completed"; -@property (copy, nonatomic) SDWebImageDownloaderProgressBlock progressBlock; -@property (copy, nonatomic) SDWebImageDownloaderCompletedBlock completedBlock; -@property (copy, nonatomic) SDWebImageNoParamsBlock cancelBlock; +typedef NSMutableDictionary SDCallbacksDictionary; + +@interface SDWebImageDownloaderOperation () + +@property (strong, nonatomic, nonnull) NSMutableArray *callbackBlocks; @property (assign, nonatomic, getter = isExecuting) BOOL executing; @property (assign, nonatomic, getter = isFinished) BOOL finished; -@property (strong, nonatomic) NSMutableData *imageData; -@property (strong, nonatomic) NSURLConnection *connection; -@property (strong, atomic) NSThread *thread; +@property (strong, nonatomic, nullable) NSMutableData *imageData; + +// This is weak because it is injected by whoever manages this session. If this gets nil-ed out, we won't be able to run +// the task associated with this operation +@property (weak, nonatomic, nullable) NSURLSession *unownedSession; +// This is set if we're using not using an injected NSURLSession. We're responsible of invalidating this one +@property (strong, nonatomic, nullable) NSURLSession *ownedSession; + +@property (strong, nonatomic, readwrite, nullable) NSURLSessionTask *dataTask; + +@property (SDDispatchQueueSetterSementics, nonatomic, nullable) dispatch_queue_t barrierQueue; -#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_4_0 +#if SD_UIKIT @property (assign, nonatomic) UIBackgroundTaskIdentifier backgroundTaskId; #endif @@ -37,34 +49,76 @@ @interface SDWebImageDownloaderOperation () @implementation SDWebImageDownloaderOperation { size_t width, height; +#if SD_UIKIT || SD_WATCH UIImageOrientation orientation; +#endif BOOL responseFromCached; } @synthesize executing = _executing; @synthesize finished = _finished; -- (id)initWithRequest:(NSURLRequest *)request - options:(SDWebImageDownloaderOptions)options - progress:(SDWebImageDownloaderProgressBlock)progressBlock - completed:(SDWebImageDownloaderCompletedBlock)completedBlock - cancelled:(SDWebImageNoParamsBlock)cancelBlock { +- (nonnull instancetype)init { + return [self initWithRequest:nil inSession:nil options:0]; +} + +- (nonnull instancetype)initWithRequest:(nullable NSURLRequest *)request + inSession:(nullable NSURLSession *)session + options:(SDWebImageDownloaderOptions)options { if ((self = [super init])) { - _request = request; + _request = [request copy]; _shouldDecompressImages = YES; - _shouldUseCredentialStorage = YES; _options = options; - _progressBlock = [progressBlock copy]; - _completedBlock = [completedBlock copy]; - _cancelBlock = [cancelBlock copy]; + _callbackBlocks = [NSMutableArray new]; _executing = NO; _finished = NO; _expectedSize = 0; - responseFromCached = YES; // Initially wrong until `connection:willCacheResponse:` is called or not called + _unownedSession = session; + responseFromCached = YES; // Initially wrong until `- URLSession:dataTask:willCacheResponse:completionHandler: is called or not called + _barrierQueue = dispatch_queue_create("com.hackemist.SDWebImageDownloaderOperationBarrierQueue", DISPATCH_QUEUE_CONCURRENT); } return self; } +- (void)dealloc { + SDDispatchQueueRelease(_barrierQueue); +} + +- (nullable id)addHandlersForProgress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDWebImageDownloaderCompletedBlock)completedBlock { + SDCallbacksDictionary *callbacks = [NSMutableDictionary new]; + if (progressBlock) callbacks[kProgressCallbackKey] = [progressBlock copy]; + if (completedBlock) callbacks[kCompletedCallbackKey] = [completedBlock copy]; + dispatch_barrier_async(self.barrierQueue, ^{ + [self.callbackBlocks addObject:callbacks]; + }); + return callbacks; +} + +- (nullable NSArray *)callbacksForKey:(NSString *)key { + __block NSMutableArray *callbacks = nil; + dispatch_sync(self.barrierQueue, ^{ + // We need to remove [NSNull null] because there might not always be a progress block for each callback + callbacks = [[self.callbackBlocks valueForKey:key] mutableCopy]; + [callbacks removeObjectIdenticalTo:[NSNull null]]; + }); + return [callbacks copy]; // strip mutability here +} + +- (BOOL)cancel:(nullable id)token { + __block BOOL shouldCancel = NO; + dispatch_barrier_sync(self.barrierQueue, ^{ + [self.callbackBlocks removeObjectIdenticalTo:token]; + if (self.callbackBlocks.count == 0) { + shouldCancel = YES; + } + }); + if (shouldCancel) { + [self cancel]; + } + return shouldCancel; +} + - (void)start { @synchronized (self) { if (self.isCancelled) { @@ -73,7 +127,7 @@ - (void)start { return; } -#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_4_0 +#if SD_UIKIT Class UIApplicationClass = NSClassFromString(@"UIApplication"); BOOL hasApplication = UIApplicationClass && [UIApplicationClass respondsToSelector:@selector(sharedApplication)]; if (hasApplication && [self shouldContinueWhenAppEntersBackground]) { @@ -91,44 +145,40 @@ - (void)start { }]; } #endif - + NSURLSession *session = self.unownedSession; + if (!self.unownedSession) { + NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration]; + sessionConfig.timeoutIntervalForRequest = 15; + + /** + * Create the session for this task + * We send nil as delegate queue so that the session creates a serial operation queue for performing all delegate + * method calls and completion handler calls. + */ + self.ownedSession = [NSURLSession sessionWithConfiguration:sessionConfig + delegate:self + delegateQueue:nil]; + session = self.ownedSession; + } + + self.dataTask = [session dataTaskWithRequest:self.request]; self.executing = YES; - self.connection = [[NSURLConnection alloc] initWithRequest:self.request delegate:self startImmediately:NO]; - self.thread = [NSThread currentThread]; } + + [self.dataTask resume]; - [self.connection start]; - - if (self.connection) { - if (self.progressBlock) { - self.progressBlock(0, NSURLResponseUnknownLength); + if (self.dataTask) { + for (SDWebImageDownloaderProgressBlock progressBlock in [self callbacksForKey:kProgressCallbackKey]) { + progressBlock(0, NSURLResponseUnknownLength, self.request.URL); } dispatch_async(dispatch_get_main_queue(), ^{ [[NSNotificationCenter defaultCenter] postNotificationName:SDWebImageDownloadStartNotification object:self]; }); - - if (floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_5_1) { - // Make sure to run the runloop in our background thread so it can process downloaded data - // Note: we use a timeout to work around an issue with NSURLConnection cancel under iOS 5 - // not waking up the runloop, leading to dead threads (see https://github.com/rs/SDWebImage/issues/466) - CFRunLoopRunInMode(kCFRunLoopDefaultMode, 10, false); - } - else { - CFRunLoopRun(); - } - - if (!self.isFinished) { - [self.connection cancel]; - [self connection:self.connection didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorTimedOut userInfo:@{NSURLErrorFailingURLErrorKey : self.request.URL}]]; - } - } - else { - if (self.completedBlock) { - self.completedBlock(nil, nil, [NSError errorWithDomain:NSURLErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey : @"Connection can't be initialized"}], YES); - } + } else { + [self callCompletionBlocksWithError:[NSError errorWithDomain:NSURLErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey : @"Connection can't be initialized"}]]; } -#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_4_0 +#if SD_UIKIT Class UIApplicationClass = NSClassFromString(@"UIApplication"); if(!UIApplicationClass || ![UIApplicationClass respondsToSelector:@selector(sharedApplication)]) { return; @@ -143,28 +193,16 @@ - (void)start { - (void)cancel { @synchronized (self) { - if (self.thread) { - [self performSelector:@selector(cancelInternalAndStop) onThread:self.thread withObject:nil waitUntilDone:NO]; - } - else { - [self cancelInternal]; - } + [self cancelInternal]; } } -- (void)cancelInternalAndStop { - if (self.isFinished) return; - [self cancelInternal]; - CFRunLoopStop(CFRunLoopGetCurrent()); -} - - (void)cancelInternal { if (self.isFinished) return; [super cancel]; - if (self.cancelBlock) self.cancelBlock(); - if (self.connection) { - [self.connection cancel]; + if (self.dataTask) { + [self.dataTask cancel]; dispatch_async(dispatch_get_main_queue(), ^{ [[NSNotificationCenter defaultCenter] postNotificationName:SDWebImageDownloadStopNotification object:self]; }); @@ -185,12 +223,15 @@ - (void)done { } - (void)reset { - self.cancelBlock = nil; - self.completedBlock = nil; - self.progressBlock = nil; - self.connection = nil; + dispatch_barrier_async(self.barrierQueue, ^{ + [self.callbackBlocks removeAllObjects]; + }); + self.dataTask = nil; self.imageData = nil; - self.thread = nil; + if (self.ownedSession) { + [self.ownedSession invalidateAndCancel]; + self.ownedSession = nil; + } } - (void)setFinished:(BOOL)finished { @@ -209,18 +250,21 @@ - (BOOL)isConcurrent { return YES; } -#pragma mark NSURLConnection (delegate) +#pragma mark NSURLSessionDataDelegate -- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response { +- (void)URLSession:(NSURLSession *)session + dataTask:(NSURLSessionDataTask *)dataTask +didReceiveResponse:(NSURLResponse *)response + completionHandler:(void (^)(NSURLSessionResponseDisposition disposition))completionHandler { //'304 Not Modified' is an exceptional one - if (![response respondsToSelector:@selector(statusCode)] || ([((NSHTTPURLResponse *)response) statusCode] < 400 && [((NSHTTPURLResponse *)response) statusCode] != 304)) { + if (![response respondsToSelector:@selector(statusCode)] || (((NSHTTPURLResponse *)response).statusCode < 400 && ((NSHTTPURLResponse *)response).statusCode != 304)) { NSInteger expected = response.expectedContentLength > 0 ? (NSInteger)response.expectedContentLength : 0; self.expectedSize = expected; - if (self.progressBlock) { - self.progressBlock(0, expected); + for (SDWebImageDownloaderProgressBlock progressBlock in [self callbacksForKey:kProgressCallbackKey]) { + progressBlock(0, expected, self.request.URL); } - + self.imageData = [[NSMutableData alloc] initWithCapacity:expected]; self.response = response; dispatch_async(dispatch_get_main_queue(), ^{ @@ -228,31 +272,33 @@ - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLRespon }); } else { - NSUInteger code = [((NSHTTPURLResponse *)response) statusCode]; + NSUInteger code = ((NSHTTPURLResponse *)response).statusCode; //This is the case when server returns '304 Not Modified'. It means that remote image is not changed. //In case of 304 we need just cancel the operation and return cached image from the cache. if (code == 304) { [self cancelInternal]; } else { - [self.connection cancel]; + [self.dataTask cancel]; } dispatch_async(dispatch_get_main_queue(), ^{ [[NSNotificationCenter defaultCenter] postNotificationName:SDWebImageDownloadStopNotification object:self]; }); + + [self callCompletionBlocksWithError:[NSError errorWithDomain:NSURLErrorDomain code:((NSHTTPURLResponse *)response).statusCode userInfo:nil]]; - if (self.completedBlock) { - self.completedBlock(nil, nil, [NSError errorWithDomain:NSURLErrorDomain code:[((NSHTTPURLResponse *)response) statusCode] userInfo:nil], YES); - } - CFRunLoopStop(CFRunLoopGetCurrent()); [self done]; } + + if (completionHandler) { + completionHandler(NSURLSessionResponseAllow); + } } -- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data { +- (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveData:(NSData *)data { [self.imageData appendData:data]; - if ((self.options & SDWebImageDownloaderProgressiveDownload) && self.expectedSize > 0 && self.completedBlock) { + if ((self.options & SDWebImageDownloaderProgressiveDownload) && self.expectedSize > 0) { // The following code is from http://www.cocoaintheshell.com/2011/05/progressive-images-download-imageio/ // Thanks to the author @Nyx0uf @@ -277,17 +323,18 @@ - (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data { // When we draw to Core Graphics, we lose orientation information, // which means the image below born of initWithCGIImage will be // oriented incorrectly sometimes. (Unlike the image born of initWithData - // in connectionDidFinishLoading.) So save it here and pass it on later. + // in didCompleteWithError.) So save it here and pass it on later. +#if SD_UIKIT || SD_WATCH orientation = [[self class] orientationFromPropertyValue:(orientationValue == -1 ? 1 : orientationValue)]; +#endif } - } if (width + height > 0 && totalSize < self.expectedSize) { // Create the image CGImageRef partialImageRef = CGImageSourceCreateImageAtIndex(imageSource, 0, NULL); -#ifdef TARGET_OS_IPHONE +#if SD_UIKIT || SD_WATCH // Workaround for iOS anamorphic image if (partialImageRef) { const size_t partialHeight = CGImageGetHeight(partialImageRef); @@ -308,7 +355,11 @@ - (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data { #endif if (partialImageRef) { +#if SD_UIKIT || SD_WATCH UIImage *image = [UIImage imageWithCGImage:partialImageRef scale:1 orientation:orientation]; +#elif SD_MAC + UIImage *image = [[UIImage alloc] initWithCGImage:partialImageRef size:NSZeroSize]; +#endif NSString *key = [[SDWebImageManager sharedManager] cacheKeyForURL:self.request.URL]; UIImage *scaledImage = [self scaledImageForKey:key image:image]; if (self.shouldDecompressImages) { @@ -318,22 +369,126 @@ - (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data { image = scaledImage; } CGImageRelease(partialImageRef); - dispatch_main_sync_safe(^{ - if (self.completedBlock) { - self.completedBlock(image, nil, nil, NO); - } - }); + + [self callCompletionBlocksWithImage:image imageData:nil error:nil finished:NO]; } } CFRelease(imageSource); } - if (self.progressBlock) { - self.progressBlock(self.imageData.length, self.expectedSize); + for (SDWebImageDownloaderProgressBlock progressBlock in [self callbacksForKey:kProgressCallbackKey]) { + progressBlock(self.imageData.length, self.expectedSize, self.request.URL); + } +} + +- (void)URLSession:(NSURLSession *)session + dataTask:(NSURLSessionDataTask *)dataTask + willCacheResponse:(NSCachedURLResponse *)proposedResponse + completionHandler:(void (^)(NSCachedURLResponse *cachedResponse))completionHandler { + + responseFromCached = NO; // If this method is called, it means the response wasn't read from cache + NSCachedURLResponse *cachedResponse = proposedResponse; + + if (self.request.cachePolicy == NSURLRequestReloadIgnoringLocalCacheData) { + // Prevents caching of responses + cachedResponse = nil; + } + if (completionHandler) { + completionHandler(cachedResponse); } } +#pragma mark NSURLSessionTaskDelegate + +- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error { + @synchronized(self) { + self.dataTask = nil; + dispatch_async(dispatch_get_main_queue(), ^{ + [[NSNotificationCenter defaultCenter] postNotificationName:SDWebImageDownloadStopNotification object:self]; + if (!error) { + [[NSNotificationCenter defaultCenter] postNotificationName:SDWebImageDownloadFinishNotification object:self]; + } + }); + } + + if (error) { + [self callCompletionBlocksWithError:error]; + } else { + if ([self callbacksForKey:kCompletedCallbackKey].count > 0) { + /** + * See #1608 and #1623 - apparently, there is a race condition on `NSURLCache` that causes a crash + * Limited the calls to `cachedResponseForRequest:` only for cases where we should ignore the cached response + * and images for which responseFromCached is YES (only the ones that cannot be cached). + * Note: responseFromCached is set to NO inside `willCacheResponse:`. This method doesn't get called for large images or images behind authentication + */ + if (self.options & SDWebImageDownloaderIgnoreCachedResponse && responseFromCached && [[NSURLCache sharedURLCache] cachedResponseForRequest:self.request]) { + // hack + [self callCompletionBlocksWithImage:nil imageData:nil error:nil finished:YES]; + } else if (self.imageData) { + UIImage *image = [UIImage sd_imageWithData:self.imageData]; + NSString *key = [[SDWebImageManager sharedManager] cacheKeyForURL:self.request.URL]; + image = [self scaledImageForKey:key image:image]; + + // Do not force decoding animated GIFs + if (!image.images) { + if (self.shouldDecompressImages) { + if (self.options & SDWebImageDownloaderScaleDownLargeImages) { +#if SD_UIKIT || SD_WATCH + image = [UIImage decodedAndScaledDownImageWithImage:image]; + [self.imageData setData:UIImagePNGRepresentation(image)]; +#endif + } else { + image = [UIImage decodedImageWithImage:image]; + } + } + } + if (CGSizeEqualToSize(image.size, CGSizeZero)) { + [self callCompletionBlocksWithError:[NSError errorWithDomain:SDWebImageErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey : @"Downloaded image has 0 pixels"}]]; + } else { + [self callCompletionBlocksWithImage:image imageData:self.imageData error:nil finished:YES]; + } + } else { + [self callCompletionBlocksWithError:[NSError errorWithDomain:SDWebImageErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey : @"Image data is nil"}]]; + } + } + } + [self done]; +} + +- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler { + + NSURLSessionAuthChallengeDisposition disposition = NSURLSessionAuthChallengePerformDefaultHandling; + __block NSURLCredential *credential = nil; + + if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { + if (!(self.options & SDWebImageDownloaderAllowInvalidSSLCertificates)) { + disposition = NSURLSessionAuthChallengePerformDefaultHandling; + } else { + credential = [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]; + disposition = NSURLSessionAuthChallengeUseCredential; + } + } else { + if (challenge.previousFailureCount == 0) { + if (self.credential) { + credential = self.credential; + disposition = NSURLSessionAuthChallengeUseCredential; + } else { + disposition = NSURLSessionAuthChallengeCancelAuthenticationChallenge; + } + } else { + disposition = NSURLSessionAuthChallengeCancelAuthenticationChallenge; + } + } + + if (completionHandler) { + completionHandler(disposition, credential); + } +} + +#pragma mark Helper methods + +#if SD_UIKIT || SD_WATCH + (UIImageOrientation)orientationFromPropertyValue:(NSInteger)value { switch (value) { case 1: @@ -356,111 +511,30 @@ + (UIImageOrientation)orientationFromPropertyValue:(NSInteger)value { return UIImageOrientationUp; } } +#endif -- (UIImage *)scaledImageForKey:(NSString *)key image:(UIImage *)image { +- (nullable UIImage *)scaledImageForKey:(nullable NSString *)key image:(nullable UIImage *)image { return SDScaledImageForKey(key, image); } -- (void)connectionDidFinishLoading:(NSURLConnection *)aConnection { - SDWebImageDownloaderCompletedBlock completionBlock = self.completedBlock; - @synchronized(self) { - CFRunLoopStop(CFRunLoopGetCurrent()); - self.thread = nil; - self.connection = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [[NSNotificationCenter defaultCenter] postNotificationName:SDWebImageDownloadStopNotification object:self]; - [[NSNotificationCenter defaultCenter] postNotificationName:SDWebImageDownloadFinishNotification object:self]; - }); - } - - if (![[NSURLCache sharedURLCache] cachedResponseForRequest:_request]) { - responseFromCached = NO; - } - - if (completionBlock) { - if (self.options & SDWebImageDownloaderIgnoreCachedResponse && responseFromCached) { - completionBlock(nil, nil, nil, YES); - } else if (self.imageData) { - UIImage *image = [UIImage sd_imageWithData:self.imageData]; - NSString *key = [[SDWebImageManager sharedManager] cacheKeyForURL:self.request.URL]; - image = [self scaledImageForKey:key image:image]; - - // Do not force decoding animated GIFs - if (!image.images) { - if (self.shouldDecompressImages) { - image = [UIImage decodedImageWithImage:image]; - } - } - if (CGSizeEqualToSize(image.size, CGSizeZero)) { - completionBlock(nil, nil, [NSError errorWithDomain:SDWebImageErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey : @"Downloaded image has 0 pixels"}], YES); - } - else { - completionBlock(image, self.imageData, nil, YES); - } - } else { - completionBlock(nil, nil, [NSError errorWithDomain:SDWebImageErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey : @"Image data is nil"}], YES); - } - } - self.completionBlock = nil; - [self done]; -} - -- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error { - @synchronized(self) { - CFRunLoopStop(CFRunLoopGetCurrent()); - self.thread = nil; - self.connection = nil; - dispatch_async(dispatch_get_main_queue(), ^{ - [[NSNotificationCenter defaultCenter] postNotificationName:SDWebImageDownloadStopNotification object:self]; - }); - } - - if (self.completedBlock) { - self.completedBlock(nil, nil, error, YES); - } - self.completionBlock = nil; - [self done]; -} - -- (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse { - responseFromCached = NO; // If this method is called, it means the response wasn't read from cache - if (self.request.cachePolicy == NSURLRequestReloadIgnoringLocalCacheData) { - // Prevents caching of responses - return nil; - } - else { - return cachedResponse; - } -} - - (BOOL)shouldContinueWhenAppEntersBackground { return self.options & SDWebImageDownloaderContinueInBackground; } -- (BOOL)connectionShouldUseCredentialStorage:(NSURLConnection __unused *)connection { - return self.shouldUseCredentialStorage; +- (void)callCompletionBlocksWithError:(nullable NSError *)error { + [self callCompletionBlocksWithImage:nil imageData:nil error:error finished:YES]; } -- (void)connection:(NSURLConnection *)connection willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge{ - if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { - if (!(self.options & SDWebImageDownloaderAllowInvalidSSLCertificates) && - [challenge.sender respondsToSelector:@selector(performDefaultHandlingForAuthenticationChallenge:)]) { - [challenge.sender performDefaultHandlingForAuthenticationChallenge:challenge]; - } else { - NSURLCredential *credential = [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]; - [[challenge sender] useCredential:credential forAuthenticationChallenge:challenge]; +- (void)callCompletionBlocksWithImage:(nullable UIImage *)image + imageData:(nullable NSData *)imageData + error:(nullable NSError *)error + finished:(BOOL)finished { + NSArray *completionBlocks = [self callbacksForKey:kCompletedCallbackKey]; + dispatch_main_async_safe(^{ + for (SDWebImageDownloaderCompletedBlock completedBlock in completionBlocks) { + completedBlock(image, imageData, error, finished); } - } else { - if ([challenge previousFailureCount] == 0) { - if (self.credential) { - [[challenge sender] useCredential:self.credential forAuthenticationChallenge:challenge]; - } else { - [[challenge sender] continueWithoutCredentialForAuthenticationChallenge:challenge]; - } - } else { - [[challenge sender] continueWithoutCredentialForAuthenticationChallenge:challenge]; - } - } + }); } @end diff --git a/Example/Pods/SDWebImage/SDWebImage/SDWebImageManager.h b/Example/Pods/SDWebImage/SDWebImage/SDWebImageManager.h index 18e578a3a..ba8b75556 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDWebImageManager.h +++ b/Example/Pods/SDWebImage/SDWebImage/SDWebImageManager.h @@ -64,9 +64,8 @@ typedef NS_OPTIONS(NSUInteger, SDWebImageOptions) { SDWebImageAllowInvalidSSLCertificates = 1 << 7, /** - * By default, image are loaded in the order they were queued. This flag move them to - * the front of the queue and is loaded immediately instead of waiting for the current queue to be loaded (which - * could take a while). + * By default, images are loaded in the order in which they were queued. This flag moves them to + * the front of the queue. */ SDWebImageHighPriority = 1 << 8, @@ -88,14 +87,21 @@ typedef NS_OPTIONS(NSUInteger, SDWebImageOptions) { * have the hand before setting the image (apply a filter or add it with cross-fade animation for instance) * Use this flag if you want to manually set the image in the completion when success */ - SDWebImageAvoidAutoSetImage = 1 << 11 + SDWebImageAvoidAutoSetImage = 1 << 11, + + /** + * By default, images are decoded respecting their original size. On iOS, this flag will scale down the + * images to a size compatible with the constrained memory of devices. + * If `SDWebImageProgressiveDownload` flag is set the scale down is deactivated. + */ + SDWebImageScaleDownLargeImages = 1 << 12 }; -typedef void(^SDWebImageCompletionBlock)(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL); +typedef void(^SDExternalCompletionBlock)(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL); -typedef void(^SDWebImageCompletionWithFinishedBlock)(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL); +typedef void(^SDInternalCompletionBlock)(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL); -typedef NSString *(^SDWebImageCacheKeyFilterBlock)(NSURL *url); +typedef NSString * _Nullable (^SDWebImageCacheKeyFilterBlock)(NSURL * _Nullable url); @class SDWebImageManager; @@ -112,7 +118,7 @@ typedef NSString *(^SDWebImageCacheKeyFilterBlock)(NSURL *url); * * @return Return NO to prevent the downloading of the image on cache misses. If not implemented, YES is implied. */ -- (BOOL)imageManager:(SDWebImageManager *)imageManager shouldDownloadImageForURL:(NSURL *)imageURL; +- (BOOL)imageManager:(nonnull SDWebImageManager *)imageManager shouldDownloadImageForURL:(nullable NSURL *)imageURL; /** * Allows to transform the image immediately after it has been downloaded and just before to cache it on disk and memory. @@ -124,7 +130,7 @@ typedef NSString *(^SDWebImageCacheKeyFilterBlock)(NSURL *url); * * @return The transformed image object. */ -- (UIImage *)imageManager:(SDWebImageManager *)imageManager transformDownloadedImage:(UIImage *)image withURL:(NSURL *)imageURL; +- (nullable UIImage *)imageManager:(nonnull SDWebImageManager *)imageManager transformDownloadedImage:(nullable UIImage *)image withURL:(nullable NSURL *)imageURL; @end @@ -139,23 +145,23 @@ typedef NSString *(^SDWebImageCacheKeyFilterBlock)(NSURL *url); * @code SDWebImageManager *manager = [SDWebImageManager sharedManager]; -[manager downloadImageWithURL:imageURL - options:0 - progress:nil - completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { - if (image) { - // do something with image - } - }]; +[manager loadImageWithURL:imageURL + options:0 + progress:nil + completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { + if (image) { + // do something with image + } + }]; * @endcode */ @interface SDWebImageManager : NSObject -@property (weak, nonatomic) id delegate; +@property (weak, nonatomic, nullable) id delegate; -@property (strong, nonatomic, readonly) SDImageCache *imageCache; -@property (strong, nonatomic, readonly) SDWebImageDownloader *imageDownloader; +@property (strong, nonatomic, readonly, nullable) SDImageCache *imageCache; +@property (strong, nonatomic, readonly, nullable) SDWebImageDownloader *imageDownloader; /** * The cache filter is a block used each time SDWebImageManager need to convert an URL into a cache key. This can @@ -173,14 +179,20 @@ SDWebImageManager *manager = [SDWebImageManager sharedManager]; * @endcode */ -@property (nonatomic, copy) SDWebImageCacheKeyFilterBlock cacheKeyFilter; +@property (nonatomic, copy, nullable) SDWebImageCacheKeyFilterBlock cacheKeyFilter; /** * Returns global SDWebImageManager instance. * * @return SDWebImageManager shared instance */ -+ (SDWebImageManager *)sharedManager; ++ (nonnull instancetype)sharedManager; + +/** + * Allows to specify instance of cache and image downloader used with image manager. + * @return new instance of `SDWebImageManager` with specified cache and downloader. + */ +- (nonnull instancetype)initWithCache:(nonnull SDImageCache *)cache downloader:(nonnull SDWebImageDownloader *)downloader NS_DESIGNATED_INITIALIZER; /** * Downloads the image at the given URL if not present in cache or return the cached version otherwise. @@ -188,26 +200,29 @@ SDWebImageManager *manager = [SDWebImageManager sharedManager]; * @param url The URL to the image * @param options A mask to specify options to use for this request * @param progressBlock A block called while image is downloading + * @note the progress block is executed on a background queue * @param completedBlock A block called when operation has been completed. * * This parameter is required. * - * This block has no return value and takes the requested UIImage as first parameter. - * In case of error the image parameter is nil and the second parameter may contain an NSError. + * This block has no return value and takes the requested UIImage as first parameter and the NSData representation as second parameter. + * In case of error the image parameter is nil and the third parameter may contain an NSError. * - * The third parameter is an `SDImageCacheType` enum indicating if the image was retrieved from the local cache + * The forth parameter is an `SDImageCacheType` enum indicating if the image was retrieved from the local cache * or from the memory cache or from the network. * - * The last parameter is set to NO when the SDWebImageProgressiveDownload option is used and the image is + * The fith parameter is set to NO when the SDWebImageProgressiveDownload option is used and the image is * downloading. This block is thus called repeatedly with a partial image. When image is fully downloaded, the * block is called a last time with the full image and the last parameter set to YES. * + * The last parameter is the original image URL + * * @return Returns an NSObject conforming to SDWebImageOperation. Should be an instance of SDWebImageDownloaderOperation */ -- (id )downloadImageWithURL:(NSURL *)url - options:(SDWebImageOptions)options - progress:(SDWebImageDownloaderProgressBlock)progressBlock - completed:(SDWebImageCompletionWithFinishedBlock)completedBlock; +- (nullable id )loadImageWithURL:(nullable NSURL *)url + options:(SDWebImageOptions)options + progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDInternalCompletionBlock)completedBlock; /** * Saves image to cache for given URL @@ -217,7 +232,7 @@ SDWebImageManager *manager = [SDWebImageManager sharedManager]; * */ -- (void)saveImageToCache:(UIImage *)image forURL:(NSURL *)url; +- (void)saveImageToCache:(nullable UIImage *)image forURL:(nullable NSURL *)url; /** * Cancel all current operations @@ -229,24 +244,6 @@ SDWebImageManager *manager = [SDWebImageManager sharedManager]; */ - (BOOL)isRunning; -/** - * Check if image has already been cached - * - * @param url image url - * - * @return if the image was already cached - */ -- (BOOL)cachedImageExistsForURL:(NSURL *)url; - -/** - * Check if image has already been cached on disk only - * - * @param url image url - * - * @return if the image was already cached (disk only) - */ -- (BOOL)diskImageExistsForURL:(NSURL *)url; - /** * Async check if image has already been cached * @@ -255,8 +252,8 @@ SDWebImageManager *manager = [SDWebImageManager sharedManager]; * * @note the completion block is always executed on the main queue */ -- (void)cachedImageExistsForURL:(NSURL *)url - completion:(SDWebImageCheckCacheCompletionBlock)completionBlock; +- (void)cachedImageExistsForURL:(nullable NSURL *)url + completion:(nullable SDWebImageCheckCacheCompletionBlock)completionBlock; /** * Async check if image has already been cached on disk only @@ -266,34 +263,13 @@ SDWebImageManager *manager = [SDWebImageManager sharedManager]; * * @note the completion block is always executed on the main queue */ -- (void)diskImageExistsForURL:(NSURL *)url - completion:(SDWebImageCheckCacheCompletionBlock)completionBlock; +- (void)diskImageExistsForURL:(nullable NSURL *)url + completion:(nullable SDWebImageCheckCacheCompletionBlock)completionBlock; /** *Return the cache key for a given URL */ -- (NSString *)cacheKeyForURL:(NSURL *)url; - -@end - - -#pragma mark - Deprecated - -typedef void(^SDWebImageCompletedBlock)(UIImage *image, NSError *error, SDImageCacheType cacheType) __deprecated_msg("Block type deprecated. Use `SDWebImageCompletionBlock`"); -typedef void(^SDWebImageCompletedWithFinishedBlock)(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished) __deprecated_msg("Block type deprecated. Use `SDWebImageCompletionWithFinishedBlock`"); - - -@interface SDWebImageManager (Deprecated) - -/** - * Downloads the image at the given URL if not present in cache or return the cached version otherwise. - * - * @deprecated This method has been deprecated. Use `downloadImageWithURL:options:progress:completed:` - */ -- (id )downloadWithURL:(NSURL *)url - options:(SDWebImageOptions)options - progress:(SDWebImageDownloaderProgressBlock)progressBlock - completed:(SDWebImageCompletedWithFinishedBlock)completedBlock __deprecated_msg("Method deprecated. Use `downloadImageWithURL:options:progress:completed:`"); +- (nullable NSString *)cacheKeyForURL:(nullable NSURL *)url; @end diff --git a/Example/Pods/SDWebImage/SDWebImage/SDWebImageManager.m b/Example/Pods/SDWebImage/SDWebImage/SDWebImageManager.m index c804ee9af..d7d6865de 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDWebImageManager.m +++ b/Example/Pods/SDWebImage/SDWebImage/SDWebImageManager.m @@ -8,27 +8,28 @@ #import "SDWebImageManager.h" #import +#import "NSImage+WebCache.h" @interface SDWebImageCombinedOperation : NSObject @property (assign, nonatomic, getter = isCancelled) BOOL cancelled; -@property (copy, nonatomic) SDWebImageNoParamsBlock cancelBlock; -@property (strong, nonatomic) NSOperation *cacheOperation; +@property (copy, nonatomic, nullable) SDWebImageNoParamsBlock cancelBlock; +@property (strong, nonatomic, nullable) NSOperation *cacheOperation; @end @interface SDWebImageManager () -@property (strong, nonatomic, readwrite) SDImageCache *imageCache; -@property (strong, nonatomic, readwrite) SDWebImageDownloader *imageDownloader; -@property (strong, nonatomic) NSMutableSet *failedURLs; -@property (strong, nonatomic) NSMutableArray *runningOperations; +@property (strong, nonatomic, readwrite, nonnull) SDImageCache *imageCache; +@property (strong, nonatomic, readwrite, nonnull) SDWebImageDownloader *imageDownloader; +@property (strong, nonatomic, nonnull) NSMutableSet *failedURLs; +@property (strong, nonatomic, nonnull) NSMutableArray *runningOperations; @end @implementation SDWebImageManager -+ (id)sharedManager { ++ (nonnull instancetype)sharedManager { static dispatch_once_t once; static id instance; dispatch_once(&once, ^{ @@ -37,42 +38,36 @@ + (id)sharedManager { return instance; } -- (id)init { +- (nonnull instancetype)init { + SDImageCache *cache = [SDImageCache sharedImageCache]; + SDWebImageDownloader *downloader = [SDWebImageDownloader sharedDownloader]; + return [self initWithCache:cache downloader:downloader]; +} + +- (nonnull instancetype)initWithCache:(nonnull SDImageCache *)cache downloader:(nonnull SDWebImageDownloader *)downloader { if ((self = [super init])) { - _imageCache = [self createCache]; - _imageDownloader = [SDWebImageDownloader sharedDownloader]; + _imageCache = cache; + _imageDownloader = downloader; _failedURLs = [NSMutableSet new]; _runningOperations = [NSMutableArray new]; } return self; } -- (SDImageCache *)createCache { - return [SDImageCache sharedImageCache]; -} +- (nullable NSString *)cacheKeyForURL:(nullable NSURL *)url { + if (!url) { + return @""; + } -- (NSString *)cacheKeyForURL:(NSURL *)url { if (self.cacheKeyFilter) { return self.cacheKeyFilter(url); + } else { + return url.absoluteString; } - else { - return [url absoluteString]; - } -} - -- (BOOL)cachedImageExistsForURL:(NSURL *)url { - NSString *key = [self cacheKeyForURL:url]; - if ([self.imageCache imageFromMemoryCacheForKey:key] != nil) return YES; - return [self.imageCache diskImageExistsWithKey:key]; } -- (BOOL)diskImageExistsForURL:(NSURL *)url { - NSString *key = [self cacheKeyForURL:url]; - return [self.imageCache diskImageExistsWithKey:key]; -} - -- (void)cachedImageExistsForURL:(NSURL *)url - completion:(SDWebImageCheckCacheCompletionBlock)completionBlock { +- (void)cachedImageExistsForURL:(nullable NSURL *)url + completion:(nullable SDWebImageCheckCacheCompletionBlock)completionBlock { NSString *key = [self cacheKeyForURL:url]; BOOL isInMemoryCache = ([self.imageCache imageFromMemoryCacheForKey:key] != nil); @@ -95,8 +90,8 @@ - (void)cachedImageExistsForURL:(NSURL *)url }]; } -- (void)diskImageExistsForURL:(NSURL *)url - completion:(SDWebImageCheckCacheCompletionBlock)completionBlock { +- (void)diskImageExistsForURL:(nullable NSURL *)url + completion:(nullable SDWebImageCheckCacheCompletionBlock)completionBlock { NSString *key = [self cacheKeyForURL:url]; [self.imageCache diskImageExistsWithKey:key completion:^(BOOL isInDiskCache) { @@ -107,14 +102,14 @@ - (void)diskImageExistsForURL:(NSURL *)url }]; } -- (id )downloadImageWithURL:(NSURL *)url - options:(SDWebImageOptions)options - progress:(SDWebImageDownloaderProgressBlock)progressBlock - completed:(SDWebImageCompletionWithFinishedBlock)completedBlock { +- (id )loadImageWithURL:(nullable NSURL *)url + options:(SDWebImageOptions)options + progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDInternalCompletionBlock)completedBlock { // Invoking this method without a completedBlock is pointless NSAssert(completedBlock != nil, @"If you mean to prefetch the image, use -[SDWebImagePrefetcher prefetchURLs] instead"); - // Very common mistake is to send the URL using NSString object instead of NSURL. For some strange reason, XCode won't + // Very common mistake is to send the URL using NSString object instead of NSURL. For some strange reason, Xcode won't // throw any warning for this type mismatch. Here we failsafe this error by allowing URLs to be passed as NSString. if ([url isKindOfClass:NSString.class]) { url = [NSURL URLWithString:(NSString *)url]; @@ -129,15 +124,14 @@ - (void)diskImageExistsForURL:(NSURL *)url __weak SDWebImageCombinedOperation *weakOperation = operation; BOOL isFailedUrl = NO; - @synchronized (self.failedURLs) { - isFailedUrl = [self.failedURLs containsObject:url]; + if (url) { + @synchronized (self.failedURLs) { + isFailedUrl = [self.failedURLs containsObject:url]; + } } if (url.absoluteString.length == 0 || (!(options & SDWebImageRetryFailed) && isFailedUrl)) { - dispatch_main_sync_safe(^{ - NSError *error = [NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorFileDoesNotExist userInfo:nil]; - completedBlock(nil, error, SDImageCacheTypeNone, YES, url); - }); + [self callCompletionBlockForOperation:operation completion:completedBlock error:[NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorFileDoesNotExist userInfo:nil] url:url]; return operation; } @@ -146,22 +140,17 @@ - (void)diskImageExistsForURL:(NSURL *)url } NSString *key = [self cacheKeyForURL:url]; - operation.cacheOperation = [self.imageCache queryDiskCacheForKey:key done:^(UIImage *image, SDImageCacheType cacheType) { + operation.cacheOperation = [self.imageCache queryCacheOperationForKey:key done:^(UIImage *cachedImage, NSData *cachedData, SDImageCacheType cacheType) { if (operation.isCancelled) { - @synchronized (self.runningOperations) { - [self.runningOperations removeObject:operation]; - } - + [self safelyRemoveOperationFromRunning:operation]; return; } - if ((!image || options & SDWebImageRefreshCached) && (![self.delegate respondsToSelector:@selector(imageManager:shouldDownloadImageForURL:)] || [self.delegate imageManager:self shouldDownloadImageForURL:url])) { - if (image && options & SDWebImageRefreshCached) { - dispatch_main_sync_safe(^{ - // If image was found in the cache but SDWebImageRefreshCached is provided, notify about the cached image - // AND try to re-download it in order to let a chance to NSURLCache to refresh it from server. - completedBlock(image, nil, cacheType, YES, url); - }); + if ((!cachedImage || options & SDWebImageRefreshCached) && (![self.delegate respondsToSelector:@selector(imageManager:shouldDownloadImageForURL:)] || [self.delegate imageManager:self shouldDownloadImageForURL:url])) { + if (cachedImage && options & SDWebImageRefreshCached) { + // If image was found in the cache but SDWebImageRefreshCached is provided, notify about the cached image + // AND try to re-download it in order to let a chance to NSURLCache to refresh it from server. + [self callCompletionBlockForOperation:weakOperation completion:completedBlock image:cachedImage data:cachedData error:nil cacheType:cacheType finished:YES url:url]; } // download if no image or requested to refresh anyway, and download allowed by delegate @@ -173,25 +162,23 @@ - (void)diskImageExistsForURL:(NSURL *)url if (options & SDWebImageHandleCookies) downloaderOptions |= SDWebImageDownloaderHandleCookies; if (options & SDWebImageAllowInvalidSSLCertificates) downloaderOptions |= SDWebImageDownloaderAllowInvalidSSLCertificates; if (options & SDWebImageHighPriority) downloaderOptions |= SDWebImageDownloaderHighPriority; - if (image && options & SDWebImageRefreshCached) { + if (options & SDWebImageScaleDownLargeImages) downloaderOptions |= SDWebImageDownloaderScaleDownLargeImages; + + if (cachedImage && options & SDWebImageRefreshCached) { // force progressive off if image already cached but forced refreshing downloaderOptions &= ~SDWebImageDownloaderProgressiveDownload; // ignore image read from NSURLCache if image if cached but force refreshing downloaderOptions |= SDWebImageDownloaderIgnoreCachedResponse; } - id subOperation = [self.imageDownloader downloadImageWithURL:url options:downloaderOptions progress:progressBlock completed:^(UIImage *downloadedImage, NSData *data, NSError *error, BOOL finished) { + + SDWebImageDownloadToken *subOperationToken = [self.imageDownloader downloadImageWithURL:url options:downloaderOptions progress:progressBlock completed:^(UIImage *downloadedImage, NSData *downloadedData, NSError *error, BOOL finished) { __strong __typeof(weakOperation) strongOperation = weakOperation; if (!strongOperation || strongOperation.isCancelled) { // Do nothing if the operation was cancelled // See #699 for more details // if we would call the completedBlock, there could be a race condition between this block and another completedBlock for the same object, so if this one is called second, we will overwrite the new data - } - else if (error) { - dispatch_main_sync_safe(^{ - if (strongOperation && !strongOperation.isCancelled) { - completedBlock(nil, error, SDImageCacheTypeNone, finished, url); - } - }); + } else if (error) { + [self callCompletionBlockForOperation:strongOperation completion:completedBlock error:error url:url]; if ( error.code != NSURLErrorNotConnectedToInternet && error.code != NSURLErrorCancelled @@ -214,95 +201,62 @@ - (void)diskImageExistsForURL:(NSURL *)url BOOL cacheOnDisk = !(options & SDWebImageCacheMemoryOnly); - if (options & SDWebImageRefreshCached && image && !downloadedImage) { + if (options & SDWebImageRefreshCached && cachedImage && !downloadedImage) { // Image refresh hit the NSURLCache cache, do not call the completion block - } - else if (downloadedImage && (!downloadedImage.images || (options & SDWebImageTransformAnimatedImage)) && [self.delegate respondsToSelector:@selector(imageManager:transformDownloadedImage:withURL:)]) { + } else if (downloadedImage && (!downloadedImage.images || (options & SDWebImageTransformAnimatedImage)) && [self.delegate respondsToSelector:@selector(imageManager:transformDownloadedImage:withURL:)]) { dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ UIImage *transformedImage = [self.delegate imageManager:self transformDownloadedImage:downloadedImage withURL:url]; if (transformedImage && finished) { BOOL imageWasTransformed = ![transformedImage isEqual:downloadedImage]; - [self.imageCache storeImage:transformedImage recalculateFromImage:imageWasTransformed imageData:(imageWasTransformed ? nil : data) forKey:key toDisk:cacheOnDisk]; + // pass nil if the image was transformed, so we can recalculate the data from the image + [self.imageCache storeImage:transformedImage imageData:(imageWasTransformed ? nil : downloadedData) forKey:key toDisk:cacheOnDisk completion:nil]; } - - dispatch_main_sync_safe(^{ - if (strongOperation && !strongOperation.isCancelled) { - completedBlock(transformedImage, nil, SDImageCacheTypeNone, finished, url); - } - }); + + [self callCompletionBlockForOperation:strongOperation completion:completedBlock image:transformedImage data:downloadedData error:nil cacheType:SDImageCacheTypeNone finished:finished url:url]; }); - } - else { + } else { if (downloadedImage && finished) { - [self.imageCache storeImage:downloadedImage recalculateFromImage:NO imageData:data forKey:key toDisk:cacheOnDisk]; + [self.imageCache storeImage:downloadedImage imageData:downloadedData forKey:key toDisk:cacheOnDisk completion:nil]; } - - dispatch_main_sync_safe(^{ - if (strongOperation && !strongOperation.isCancelled) { - completedBlock(downloadedImage, nil, SDImageCacheTypeNone, finished, url); - } - }); + [self callCompletionBlockForOperation:strongOperation completion:completedBlock image:downloadedImage data:downloadedData error:nil cacheType:SDImageCacheTypeNone finished:finished url:url]; } } if (finished) { - @synchronized (self.runningOperations) { - if (strongOperation) { - [self.runningOperations removeObject:strongOperation]; - } - } + [self safelyRemoveOperationFromRunning:strongOperation]; } }]; operation.cancelBlock = ^{ - [subOperation cancel]; - - @synchronized (self.runningOperations) { - __strong __typeof(weakOperation) strongOperation = weakOperation; - if (strongOperation) { - [self.runningOperations removeObject:strongOperation]; - } - } - }; - } - else if (image) { - dispatch_main_sync_safe(^{ + [self.imageDownloader cancel:subOperationToken]; __strong __typeof(weakOperation) strongOperation = weakOperation; - if (strongOperation && !strongOperation.isCancelled) { - completedBlock(image, nil, cacheType, YES, url); - } - }); - @synchronized (self.runningOperations) { - [self.runningOperations removeObject:operation]; - } - } - else { + [self safelyRemoveOperationFromRunning:strongOperation]; + }; + } else if (cachedImage) { + __strong __typeof(weakOperation) strongOperation = weakOperation; + [self callCompletionBlockForOperation:strongOperation completion:completedBlock image:cachedImage data:cachedData error:nil cacheType:cacheType finished:YES url:url]; + [self safelyRemoveOperationFromRunning:operation]; + } else { // Image not in cache and download disallowed by delegate - dispatch_main_sync_safe(^{ - __strong __typeof(weakOperation) strongOperation = weakOperation; - if (strongOperation && !weakOperation.isCancelled) { - completedBlock(nil, nil, SDImageCacheTypeNone, YES, url); - } - }); - @synchronized (self.runningOperations) { - [self.runningOperations removeObject:operation]; - } + __strong __typeof(weakOperation) strongOperation = weakOperation; + [self callCompletionBlockForOperation:strongOperation completion:completedBlock image:nil data:nil error:nil cacheType:SDImageCacheTypeNone finished:YES url:url]; + [self safelyRemoveOperationFromRunning:operation]; } }]; return operation; } -- (void)saveImageToCache:(UIImage *)image forURL:(NSURL *)url { +- (void)saveImageToCache:(nullable UIImage *)image forURL:(nullable NSURL *)url { if (image && url) { NSString *key = [self cacheKeyForURL:url]; - [self.imageCache storeImage:image forKey:key toDisk:YES]; + [self.imageCache storeImage:image forKey:key toDisk:YES completion:nil]; } } - (void)cancelAll { @synchronized (self.runningOperations) { - NSArray *copiedOperations = [self.runningOperations copy]; + NSArray *copiedOperations = [self.runningOperations copy]; [copiedOperations makeObjectsPerformSelector:@selector(cancel)]; [self.runningOperations removeObjectsInArray:copiedOperations]; } @@ -310,18 +264,48 @@ - (void)cancelAll { - (BOOL)isRunning { BOOL isRunning = NO; - @synchronized(self.runningOperations) { + @synchronized (self.runningOperations) { isRunning = (self.runningOperations.count > 0); } return isRunning; } +- (void)safelyRemoveOperationFromRunning:(nullable SDWebImageCombinedOperation*)operation { + @synchronized (self.runningOperations) { + if (operation) { + [self.runningOperations removeObject:operation]; + } + } +} + +- (void)callCompletionBlockForOperation:(nullable SDWebImageCombinedOperation*)operation + completion:(nullable SDInternalCompletionBlock)completionBlock + error:(nullable NSError *)error + url:(nullable NSURL *)url { + [self callCompletionBlockForOperation:operation completion:completionBlock image:nil data:nil error:error cacheType:SDImageCacheTypeNone finished:YES url:url]; +} + +- (void)callCompletionBlockForOperation:(nullable SDWebImageCombinedOperation*)operation + completion:(nullable SDInternalCompletionBlock)completionBlock + image:(nullable UIImage *)image + data:(nullable NSData *)data + error:(nullable NSError *)error + cacheType:(SDImageCacheType)cacheType + finished:(BOOL)finished + url:(nullable NSURL *)url { + dispatch_main_async_safe(^{ + if (operation && !operation.isCancelled && completionBlock) { + completionBlock(image, data, error, cacheType, finished, url); + } + }); +} + @end @implementation SDWebImageCombinedOperation -- (void)setCancelBlock:(SDWebImageNoParamsBlock)cancelBlock { +- (void)setCancelBlock:(nullable SDWebImageNoParamsBlock)cancelBlock { // check if the operation is already cancelled, then we just call the cancelBlock if (self.isCancelled) { if (cancelBlock) { @@ -350,21 +334,3 @@ - (void)cancel { } @end - - -@implementation SDWebImageManager (Deprecated) - -// deprecated method, uses the non deprecated method -// adapter for the completion block -- (id )downloadWithURL:(NSURL *)url options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletedWithFinishedBlock)completedBlock { - return [self downloadImageWithURL:url - options:options - progress:progressBlock - completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType, finished); - } - }]; -} - -@end diff --git a/Example/Pods/SDWebImage/SDWebImage/SDWebImagePrefetcher.h b/Example/Pods/SDWebImage/SDWebImage/SDWebImagePrefetcher.h index 6c31b15ff..d0a91ed74 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDWebImagePrefetcher.h +++ b/Example/Pods/SDWebImage/SDWebImage/SDWebImagePrefetcher.h @@ -23,7 +23,7 @@ * @param finishedCount The total number of images that were prefetched (successful or not) * @param totalCount The total number of images that were to be prefetched */ -- (void)imagePrefetcher:(SDWebImagePrefetcher *)imagePrefetcher didPrefetchURL:(NSURL *)imageURL finishedCount:(NSUInteger)finishedCount totalCount:(NSUInteger)totalCount; +- (void)imagePrefetcher:(nonnull SDWebImagePrefetcher *)imagePrefetcher didPrefetchURL:(nullable NSURL *)imageURL finishedCount:(NSUInteger)finishedCount totalCount:(NSUInteger)totalCount; /** * Called when all images are prefetched. @@ -31,7 +31,7 @@ * @param totalCount The total number of images that were prefetched (whether successful or not) * @param skippedCount The total number of images that were skipped */ -- (void)imagePrefetcher:(SDWebImagePrefetcher *)imagePrefetcher didFinishWithTotalCount:(NSUInteger)totalCount skippedCount:(NSUInteger)skippedCount; +- (void)imagePrefetcher:(nonnull SDWebImagePrefetcher *)imagePrefetcher didFinishWithTotalCount:(NSUInteger)totalCount skippedCount:(NSUInteger)skippedCount; @end @@ -46,7 +46,7 @@ typedef void(^SDWebImagePrefetcherCompletionBlock)(NSUInteger noOfFinishedUrls, /** * The web image manager */ -@property (strong, nonatomic, readonly) SDWebImageManager *manager; +@property (strong, nonatomic, readonly, nonnull) SDWebImageManager *manager; /** * Maximum number of URLs to prefetch at the same time. Defaults to 3. @@ -61,33 +61,35 @@ typedef void(^SDWebImagePrefetcherCompletionBlock)(NSUInteger noOfFinishedUrls, /** * Queue options for Prefetcher. Defaults to Main Queue. */ -@property (nonatomic, assign) dispatch_queue_t prefetcherQueue; +@property (nonatomic, assign, nonnull) dispatch_queue_t prefetcherQueue; -@property (weak, nonatomic) id delegate; +@property (weak, nonatomic, nullable) id delegate; /** * Return the global image prefetcher instance. */ -+ (SDWebImagePrefetcher *)sharedImagePrefetcher; ++ (nonnull instancetype)sharedImagePrefetcher; /** * Allows you to instantiate a prefetcher with any arbitrary image manager. */ -- (id)initWithImageManager:(SDWebImageManager *)manager; +- (nonnull instancetype)initWithImageManager:(nonnull SDWebImageManager *)manager NS_DESIGNATED_INITIALIZER; /** * Assign list of URLs to let SDWebImagePrefetcher to queue the prefetching, * currently one image is downloaded at a time, - * and skips images for failed downloads and proceed to the next image in the list + * and skips images for failed downloads and proceed to the next image in the list. + * Any previously-running prefetch operations are canceled. * * @param urls list of URLs to prefetch */ -- (void)prefetchURLs:(NSArray *)urls; +- (void)prefetchURLs:(nullable NSArray *)urls; /** * Assign list of URLs to let SDWebImagePrefetcher to queue the prefetching, * currently one image is downloaded at a time, - * and skips images for failed downloads and proceed to the next image in the list + * and skips images for failed downloads and proceed to the next image in the list. + * Any previously-running prefetch operations are canceled. * * @param urls list of URLs to prefetch * @param progressBlock block to be called when progress updates; @@ -97,7 +99,9 @@ typedef void(^SDWebImagePrefetcherCompletionBlock)(NSUInteger noOfFinishedUrls, * first param is the number of completed (successful or not) requests, * second parameter is the number of skipped requests */ -- (void)prefetchURLs:(NSArray *)urls progress:(SDWebImagePrefetcherProgressBlock)progressBlock completed:(SDWebImagePrefetcherCompletionBlock)completionBlock; +- (void)prefetchURLs:(nullable NSArray *)urls + progress:(nullable SDWebImagePrefetcherProgressBlock)progressBlock + completed:(nullable SDWebImagePrefetcherCompletionBlock)completionBlock; /** * Remove and cancel queued list diff --git a/Example/Pods/SDWebImage/SDWebImage/SDWebImagePrefetcher.m b/Example/Pods/SDWebImage/SDWebImage/SDWebImagePrefetcher.m index f518d4413..b66357f1d 100644 --- a/Example/Pods/SDWebImage/SDWebImage/SDWebImagePrefetcher.m +++ b/Example/Pods/SDWebImage/SDWebImage/SDWebImagePrefetcher.m @@ -10,20 +10,20 @@ @interface SDWebImagePrefetcher () -@property (strong, nonatomic) SDWebImageManager *manager; -@property (strong, nonatomic) NSArray *prefetchURLs; +@property (strong, nonatomic, nonnull) SDWebImageManager *manager; +@property (strong, nonatomic, nullable) NSArray *prefetchURLs; @property (assign, nonatomic) NSUInteger requestedCount; @property (assign, nonatomic) NSUInteger skippedCount; @property (assign, nonatomic) NSUInteger finishedCount; @property (assign, nonatomic) NSTimeInterval startedTime; -@property (copy, nonatomic) SDWebImagePrefetcherCompletionBlock completionBlock; -@property (copy, nonatomic) SDWebImagePrefetcherProgressBlock progressBlock; +@property (copy, nonatomic, nullable) SDWebImagePrefetcherCompletionBlock completionBlock; +@property (copy, nonatomic, nullable) SDWebImagePrefetcherProgressBlock progressBlock; @end @implementation SDWebImagePrefetcher -+ (SDWebImagePrefetcher *)sharedImagePrefetcher { ++ (nonnull instancetype)sharedImagePrefetcher { static dispatch_once_t once; static id instance; dispatch_once(&once, ^{ @@ -32,11 +32,11 @@ + (SDWebImagePrefetcher *)sharedImagePrefetcher { return instance; } -- (id)init { +- (nonnull instancetype)init { return [self initWithImageManager:[SDWebImageManager new]]; } -- (id)initWithImageManager:(SDWebImageManager *)manager { +- (nonnull instancetype)initWithImageManager:(SDWebImageManager *)manager { if ((self = [super init])) { _manager = manager; _options = SDWebImageLowPriority; @@ -57,18 +57,18 @@ - (NSUInteger)maxConcurrentDownloads { - (void)startPrefetchingAtIndex:(NSUInteger)index { if (index >= self.prefetchURLs.count) return; self.requestedCount++; - [self.manager downloadImageWithURL:self.prefetchURLs[index] options:self.options progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { + [self.manager loadImageWithURL:self.prefetchURLs[index] options:self.options progress:nil completed:^(UIImage *image, NSData *data, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { if (!finished) return; self.finishedCount++; if (image) { if (self.progressBlock) { - self.progressBlock(self.finishedCount,[self.prefetchURLs count]); + self.progressBlock(self.finishedCount,(self.prefetchURLs).count); } } else { if (self.progressBlock) { - self.progressBlock(self.finishedCount,[self.prefetchURLs count]); + self.progressBlock(self.finishedCount,(self.prefetchURLs).count); } // Add last failed self.skippedCount++; @@ -96,7 +96,7 @@ - (void)startPrefetchingAtIndex:(NSUInteger)index { } - (void)reportStatus { - NSUInteger total = [self.prefetchURLs count]; + NSUInteger total = (self.prefetchURLs).count; if ([self.delegate respondsToSelector:@selector(imagePrefetcher:didFinishWithTotalCount:skippedCount:)]) { [self.delegate imagePrefetcher:self didFinishWithTotalCount:(total - self.skippedCount) @@ -105,11 +105,13 @@ - (void)reportStatus { } } -- (void)prefetchURLs:(NSArray *)urls { +- (void)prefetchURLs:(nullable NSArray *)urls { [self prefetchURLs:urls progress:nil completed:nil]; } -- (void)prefetchURLs:(NSArray *)urls progress:(SDWebImagePrefetcherProgressBlock)progressBlock completed:(SDWebImagePrefetcherCompletionBlock)completionBlock { +- (void)prefetchURLs:(nullable NSArray *)urls + progress:(nullable SDWebImagePrefetcherProgressBlock)progressBlock + completed:(nullable SDWebImagePrefetcherCompletionBlock)completionBlock { [self cancelPrefetching]; // Prevent duplicate prefetch request self.startedTime = CFAbsoluteTimeGetCurrent(); self.prefetchURLs = urls; diff --git a/Example/Pods/SDWebImage/SDWebImage/UIButton+WebCache.h b/Example/Pods/SDWebImage/SDWebImage/UIButton+WebCache.h index ecf5ced38..c43b7491e 100644 --- a/Example/Pods/SDWebImage/SDWebImage/UIButton+WebCache.h +++ b/Example/Pods/SDWebImage/SDWebImage/UIButton+WebCache.h @@ -7,6 +7,9 @@ */ #import "SDWebImageCompat.h" + +#if SD_UIKIT + #import "SDWebImageManager.h" /** @@ -17,14 +20,16 @@ /** * Get the current image URL. */ -- (NSURL *)sd_currentImageURL; +- (nullable NSURL *)sd_currentImageURL; + +#pragma mark - Image /** * Get the image URL for a control state. * * @param state Which state you want to know the URL for. The values are described in UIControlState. */ -- (NSURL *)sd_imageURLForState:(UIControlState)state; +- (nullable NSURL *)sd_imageURLForState:(UIControlState)state; /** * Set the imageView `image` with an `url`. @@ -34,7 +39,8 @@ * @param url The url for the image. * @param state The state that uses the specified title. The values are described in UIControlState. */ -- (void)sd_setImageWithURL:(NSURL *)url forState:(UIControlState)state; +- (void)sd_setImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state; /** * Set the imageView `image` with an `url` and a placeholder. @@ -46,7 +52,9 @@ * @param placeholder The image to be set initially, until the image request finishes. * @see sd_setImageWithURL:placeholderImage:options: */ -- (void)sd_setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder; +- (void)sd_setImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state + placeholderImage:(nullable UIImage *)placeholder; /** * Set the imageView `image` with an `url`, placeholder and custom options. @@ -58,7 +66,10 @@ * @param placeholder The image to be set initially, until the image request finishes. * @param options The options to use when downloading the image. @see SDWebImageOptions for the possible values. */ -- (void)sd_setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options; +- (void)sd_setImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options; /** * Set the imageView `image` with an `url`. @@ -73,7 +84,9 @@ * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setImageWithURL:(NSURL *)url forState:(UIControlState)state completed:(SDWebImageCompletionBlock)completedBlock; +- (void)sd_setImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state + completed:(nullable SDExternalCompletionBlock)completedBlock; /** * Set the imageView `image` with an `url`, placeholder. @@ -89,7 +102,10 @@ * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder completed:(SDWebImageCompletionBlock)completedBlock; +- (void)sd_setImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state + placeholderImage:(nullable UIImage *)placeholder + completed:(nullable SDExternalCompletionBlock)completedBlock; /** * Set the imageView `image` with an `url`, placeholder and custom options. @@ -106,7 +122,13 @@ * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletionBlock)completedBlock; +- (void)sd_setImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options + completed:(nullable SDExternalCompletionBlock)completedBlock; + +#pragma mark - Background image /** * Set the backgroundImageView `image` with an `url`. @@ -116,7 +138,8 @@ * @param url The url for the image. * @param state The state that uses the specified title. The values are described in UIControlState. */ -- (void)sd_setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state; +- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state; /** * Set the backgroundImageView `image` with an `url` and a placeholder. @@ -128,7 +151,9 @@ * @param placeholder The image to be set initially, until the image request finishes. * @see sd_setImageWithURL:placeholderImage:options: */ -- (void)sd_setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder; +- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state + placeholderImage:(nullable UIImage *)placeholder; /** * Set the backgroundImageView `image` with an `url`, placeholder and custom options. @@ -140,7 +165,10 @@ * @param placeholder The image to be set initially, until the image request finishes. * @param options The options to use when downloading the image. @see SDWebImageOptions for the possible values. */ -- (void)sd_setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options; +- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options; /** * Set the backgroundImageView `image` with an `url`. @@ -155,7 +183,9 @@ * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state completed:(SDWebImageCompletionBlock)completedBlock; +- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state + completed:(nullable SDExternalCompletionBlock)completedBlock; /** * Set the backgroundImageView `image` with an `url`, placeholder. @@ -171,7 +201,10 @@ * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder completed:(SDWebImageCompletionBlock)completedBlock; +- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state + placeholderImage:(nullable UIImage *)placeholder + completed:(nullable SDExternalCompletionBlock)completedBlock; /** * Set the backgroundImageView `image` with an `url`, placeholder and custom options. @@ -187,7 +220,13 @@ * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletionBlock)completedBlock; +- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options + completed:(nullable SDExternalCompletionBlock)completedBlock; + +#pragma mark - Cancel /** * Cancel the current image download @@ -201,29 +240,4 @@ @end - -@interface UIButton (WebCacheDeprecated) - -- (NSURL *)currentImageURL __deprecated_msg("Use `sd_currentImageURL`"); -- (NSURL *)imageURLForState:(UIControlState)state __deprecated_msg("Use `sd_imageURLForState:`"); - -- (void)setImageWithURL:(NSURL *)url forState:(UIControlState)state __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:forState:`"); -- (void)setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:forState:placeholderImage:`"); -- (void)setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:forState:placeholderImage:options:`"); - -- (void)setImageWithURL:(NSURL *)url forState:(UIControlState)state completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:forState:completed:`"); -- (void)setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:forState:placeholderImage:completed:`"); -- (void)setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:forState:placeholderImage:options:completed:`"); - -- (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state __deprecated_msg("Method deprecated. Use `sd_setBackgroundImageWithURL:forState:`"); -- (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder __deprecated_msg("Method deprecated. Use `sd_setBackgroundImageWithURL:forState:placeholderImage:`"); -- (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options __deprecated_msg("Method deprecated. Use `sd_setBackgroundImageWithURL:forState:placeholderImage:options:`"); - -- (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setBackgroundImageWithURL:forState:completed:`"); -- (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setBackgroundImageWithURL:forState:placeholderImage:completed:`"); -- (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setBackgroundImageWithURL:forState:placeholderImage:options:completed:`"); - -- (void)cancelCurrentImageLoad __deprecated_msg("Use `sd_cancelImageLoadForState:`"); -- (void)cancelBackgroundImageLoadForState:(UIControlState)state __deprecated_msg("Use `sd_cancelBackgroundImageLoadForState:`"); - -@end +#endif diff --git a/Example/Pods/SDWebImage/SDWebImage/UIButton+WebCache.m b/Example/Pods/SDWebImage/SDWebImage/UIButton+WebCache.m index ce2175d2e..63f75e400 100644 --- a/Example/Pods/SDWebImage/SDWebImage/UIButton+WebCache.m +++ b/Example/Pods/SDWebImage/SDWebImage/UIButton+WebCache.m @@ -7,14 +7,20 @@ */ #import "UIButton+WebCache.h" + +#if SD_UIKIT + #import "objc/runtime.h" #import "UIView+WebCacheOperation.h" +#import "UIView+WebCache.h" static char imageURLStorageKey; +typedef NSMutableDictionary SDStateImageURLDictionary; + @implementation UIButton (WebCache) -- (NSURL *)sd_currentImageURL { +- (nullable NSURL *)sd_currentImageURL { NSURL *url = self.imageURLStorage[@(self.state)]; if (!url) { @@ -24,126 +30,100 @@ - (NSURL *)sd_currentImageURL { return url; } -- (NSURL *)sd_imageURLForState:(UIControlState)state { +- (nullable NSURL *)sd_imageURLForState:(UIControlState)state { return self.imageURLStorage[@(state)]; } -- (void)sd_setImageWithURL:(NSURL *)url forState:(UIControlState)state { +#pragma mark - Image + +- (void)sd_setImageWithURL:(nullable NSURL *)url forState:(UIControlState)state { [self sd_setImageWithURL:url forState:state placeholderImage:nil options:0 completed:nil]; } -- (void)sd_setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder { +- (void)sd_setImageWithURL:(nullable NSURL *)url forState:(UIControlState)state placeholderImage:(nullable UIImage *)placeholder { [self sd_setImageWithURL:url forState:state placeholderImage:placeholder options:0 completed:nil]; } -- (void)sd_setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options { +- (void)sd_setImageWithURL:(nullable NSURL *)url forState:(UIControlState)state placeholderImage:(nullable UIImage *)placeholder options:(SDWebImageOptions)options { [self sd_setImageWithURL:url forState:state placeholderImage:placeholder options:options completed:nil]; } -- (void)sd_setImageWithURL:(NSURL *)url forState:(UIControlState)state completed:(SDWebImageCompletionBlock)completedBlock { +- (void)sd_setImageWithURL:(nullable NSURL *)url forState:(UIControlState)state completed:(nullable SDExternalCompletionBlock)completedBlock { [self sd_setImageWithURL:url forState:state placeholderImage:nil options:0 completed:completedBlock]; } -- (void)sd_setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder completed:(SDWebImageCompletionBlock)completedBlock { +- (void)sd_setImageWithURL:(nullable NSURL *)url forState:(UIControlState)state placeholderImage:(nullable UIImage *)placeholder completed:(nullable SDExternalCompletionBlock)completedBlock { [self sd_setImageWithURL:url forState:state placeholderImage:placeholder options:0 completed:completedBlock]; } -- (void)sd_setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletionBlock)completedBlock { - - [self setImage:placeholder forState:state]; - [self sd_cancelImageLoadForState:state]; - +- (void)sd_setImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options + completed:(nullable SDExternalCompletionBlock)completedBlock { if (!url) { [self.imageURLStorage removeObjectForKey:@(state)]; - - dispatch_main_async_safe(^{ - if (completedBlock) { - NSError *error = [NSError errorWithDomain:SDWebImageErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}]; - completedBlock(nil, error, SDImageCacheTypeNone, url); - } - }); - return; } self.imageURLStorage[@(state)] = url; - - __weak __typeof(self)wself = self; - id operation = [SDWebImageManager.sharedManager downloadImageWithURL:url options:options progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { - if (!wself) return; - dispatch_main_sync_safe(^{ - __strong UIButton *sself = wself; - if (!sself) return; - if (image && (options & SDWebImageAvoidAutoSetImage) && completedBlock) - { - completedBlock(image, error, cacheType, url); - return; - } - else if (image) { - [sself setImage:image forState:state]; - } - if (completedBlock && finished) { - completedBlock(image, error, cacheType, url); - } - }); - }]; - [self sd_setImageLoadOperation:operation forState:state]; + + __weak typeof(self)weakSelf = self; + [self sd_internalSetImageWithURL:url + placeholderImage:placeholder + options:options + operationKey:[NSString stringWithFormat:@"UIButtonImageOperation%@", @(state)] + setImageBlock:^(UIImage *image, NSData *imageData) { + [weakSelf setImage:image forState:state]; + } + progress:nil + completed:completedBlock]; } -- (void)sd_setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state { +#pragma mark - Background image + +- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url forState:(UIControlState)state { [self sd_setBackgroundImageWithURL:url forState:state placeholderImage:nil options:0 completed:nil]; } -- (void)sd_setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder { +- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url forState:(UIControlState)state placeholderImage:(nullable UIImage *)placeholder { [self sd_setBackgroundImageWithURL:url forState:state placeholderImage:placeholder options:0 completed:nil]; } -- (void)sd_setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options { +- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url forState:(UIControlState)state placeholderImage:(nullable UIImage *)placeholder options:(SDWebImageOptions)options { [self sd_setBackgroundImageWithURL:url forState:state placeholderImage:placeholder options:options completed:nil]; } -- (void)sd_setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state completed:(SDWebImageCompletionBlock)completedBlock { +- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url forState:(UIControlState)state completed:(nullable SDExternalCompletionBlock)completedBlock { [self sd_setBackgroundImageWithURL:url forState:state placeholderImage:nil options:0 completed:completedBlock]; } -- (void)sd_setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder completed:(SDWebImageCompletionBlock)completedBlock { +- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url forState:(UIControlState)state placeholderImage:(nullable UIImage *)placeholder completed:(nullable SDExternalCompletionBlock)completedBlock { [self sd_setBackgroundImageWithURL:url forState:state placeholderImage:placeholder options:0 completed:completedBlock]; } -- (void)sd_setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletionBlock)completedBlock { - [self sd_cancelBackgroundImageLoadForState:state]; - - [self setBackgroundImage:placeholder forState:state]; - - if (url) { - __weak __typeof(self)wself = self; - id operation = [SDWebImageManager.sharedManager downloadImageWithURL:url options:options progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { - if (!wself) return; - dispatch_main_sync_safe(^{ - __strong UIButton *sself = wself; - if (!sself) return; - if (image && (options & SDWebImageAvoidAutoSetImage) && completedBlock) - { - completedBlock(image, error, cacheType, url); - return; - } - else if (image) { - [sself setBackgroundImage:image forState:state]; - } - if (completedBlock && finished) { - completedBlock(image, error, cacheType, url); - } - }); - }]; - [self sd_setBackgroundImageLoadOperation:operation forState:state]; - } else { - dispatch_main_async_safe(^{ - NSError *error = [NSError errorWithDomain:SDWebImageErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}]; - if (completedBlock) { - completedBlock(nil, error, SDImageCacheTypeNone, url); - } - }); +- (void)sd_setBackgroundImageWithURL:(nullable NSURL *)url + forState:(UIControlState)state + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options + completed:(nullable SDExternalCompletionBlock)completedBlock { + if (!url) { + [self.imageURLStorage removeObjectForKey:@(state)]; + return; } + + self.imageURLStorage[@(state)] = url; + + __weak typeof(self)weakSelf = self; + [self sd_internalSetImageWithURL:url + placeholderImage:placeholder + options:options + operationKey:[NSString stringWithFormat:@"UIButtonBackgroundImageOperation%@", @(state)] + setImageBlock:^(UIImage *image, NSData *imageData) { + [weakSelf setBackgroundImage:image forState:state]; + } + progress:nil + completed:completedBlock]; } - (void)sd_setImageLoadOperation:(id)operation forState:(UIControlState)state { @@ -162,10 +142,9 @@ - (void)sd_cancelBackgroundImageLoadForState:(UIControlState)state { [self sd_cancelImageLoadOperationWithKey:[NSString stringWithFormat:@"UIButtonBackgroundImageOperation%@", @(state)]]; } -- (NSMutableDictionary *)imageURLStorage { - NSMutableDictionary *storage = objc_getAssociatedObject(self, &imageURLStorageKey); - if (!storage) - { +- (SDStateImageURLDictionary *)imageURLStorage { + SDStateImageURLDictionary *storage = objc_getAssociatedObject(self, &imageURLStorageKey); + if (!storage) { storage = [NSMutableDictionary dictionary]; objc_setAssociatedObject(self, &imageURLStorageKey, storage, OBJC_ASSOCIATION_RETAIN_NONATOMIC); } @@ -175,96 +154,4 @@ - (NSMutableDictionary *)imageURLStorage { @end - -@implementation UIButton (WebCacheDeprecated) - -- (NSURL *)currentImageURL { - return [self sd_currentImageURL]; -} - -- (NSURL *)imageURLForState:(UIControlState)state { - return [self sd_imageURLForState:state]; -} - -- (void)setImageWithURL:(NSURL *)url forState:(UIControlState)state { - [self sd_setImageWithURL:url forState:state placeholderImage:nil options:0 completed:nil]; -} - -- (void)setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder { - [self sd_setImageWithURL:url forState:state placeholderImage:placeholder options:0 completed:nil]; -} - -- (void)setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options { - [self sd_setImageWithURL:url forState:state placeholderImage:placeholder options:options completed:nil]; -} - -- (void)setImageWithURL:(NSURL *)url forState:(UIControlState)state completed:(SDWebImageCompletedBlock)completedBlock { - [self sd_setImageWithURL:url forState:state placeholderImage:nil options:0 completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType); - } - }]; -} - -- (void)setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder completed:(SDWebImageCompletedBlock)completedBlock { - [self sd_setImageWithURL:url forState:state placeholderImage:placeholder options:0 completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType); - } - }]; -} - -- (void)setImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletedBlock)completedBlock { - [self sd_setImageWithURL:url forState:state placeholderImage:placeholder options:options completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType); - } - }]; -} - -- (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state { - [self sd_setBackgroundImageWithURL:url forState:state placeholderImage:nil options:0 completed:nil]; -} - -- (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder { - [self sd_setBackgroundImageWithURL:url forState:state placeholderImage:placeholder options:0 completed:nil]; -} - -- (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options { - [self sd_setBackgroundImageWithURL:url forState:state placeholderImage:placeholder options:options completed:nil]; -} - -- (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state completed:(SDWebImageCompletedBlock)completedBlock { - [self sd_setBackgroundImageWithURL:url forState:state placeholderImage:nil options:0 completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType); - } - }]; -} - -- (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder completed:(SDWebImageCompletedBlock)completedBlock { - [self sd_setBackgroundImageWithURL:url forState:state placeholderImage:placeholder options:0 completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType); - } - }]; -} - -- (void)setBackgroundImageWithURL:(NSURL *)url forState:(UIControlState)state placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletedBlock)completedBlock { - [self sd_setBackgroundImageWithURL:url forState:state placeholderImage:placeholder options:options completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType); - } - }]; -} - -- (void)cancelCurrentImageLoad { - // in a backwards compatible manner, cancel for current state - [self sd_cancelImageLoadForState:self.state]; -} - -- (void)cancelBackgroundImageLoadForState:(UIControlState)state { - [self sd_cancelBackgroundImageLoadForState:state]; -} - -@end +#endif diff --git a/Example/Pods/SDWebImage/SDWebImage/UIImage+GIF.h b/Example/Pods/SDWebImage/SDWebImage/UIImage+GIF.h index 084f42415..479d57234 100755 --- a/Example/Pods/SDWebImage/SDWebImage/UIImage+GIF.h +++ b/Example/Pods/SDWebImage/SDWebImage/UIImage+GIF.h @@ -1,19 +1,24 @@ -// -// UIImage+GIF.h -// LBGIFImage -// -// Created by Laurin Brandner on 06.01.12. -// Copyright (c) 2012 __MyCompanyName__. All rights reserved. -// +/* + * This file is part of the SDWebImage package. + * (c) Olivier Poitrey + * (c) Laurin Brandner + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ -#import +#import "SDWebImageCompat.h" @interface UIImage (GIF) -+ (UIImage *)sd_animatedGIFNamed:(NSString *)name; - +/** + * Compatibility method - creates an animated UIImage from an NSData, it will only contain the 1st frame image + */ + (UIImage *)sd_animatedGIFWithData:(NSData *)data; -- (UIImage *)sd_animatedImageByScalingAndCroppingToSize:(CGSize)size; +/** + * Checks if an UIImage instance is a GIF. Will use the `images` array + */ +- (BOOL)isGIF; @end diff --git a/Example/Pods/SDWebImage/SDWebImage/UIImage+GIF.m b/Example/Pods/SDWebImage/SDWebImage/UIImage+GIF.m index e1ded2aa8..9301777f5 100755 --- a/Example/Pods/SDWebImage/SDWebImage/UIImage+GIF.m +++ b/Example/Pods/SDWebImage/SDWebImage/UIImage+GIF.m @@ -1,13 +1,16 @@ -// -// UIImage+GIF.m -// LBGIFImage -// -// Created by Laurin Brandner on 06.01.12. -// Copyright (c) 2012 __MyCompanyName__. All rights reserved. -// +/* + * This file is part of the SDWebImage package. + * (c) Olivier Poitrey + * (c) Laurin Brandner + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ #import "UIImage+GIF.h" #import +#import "objc/runtime.h" +#import "NSImage+WebCache.h" @implementation UIImage (GIF) @@ -20,139 +23,38 @@ + (UIImage *)sd_animatedGIFWithData:(NSData *)data { size_t count = CGImageSourceGetCount(source); - UIImage *animatedImage; + UIImage *staticImage; if (count <= 1) { - animatedImage = [[UIImage alloc] initWithData:data]; - } - else { - NSMutableArray *images = [NSMutableArray array]; - - NSTimeInterval duration = 0.0f; - - for (size_t i = 0; i < count; i++) { - CGImageRef image = CGImageSourceCreateImageAtIndex(source, i, NULL); - - duration += [self sd_frameDurationAtIndex:i source:source]; - - [images addObject:[UIImage imageWithCGImage:image scale:[UIScreen mainScreen].scale orientation:UIImageOrientationUp]]; - - CGImageRelease(image); - } - - if (!duration) { - duration = (1.0f / 10.0f) * count; - } - - animatedImage = [UIImage animatedImageWithImages:images duration:duration]; + staticImage = [[UIImage alloc] initWithData:data]; + } else { + // we will only retrieve the 1st frame. the full GIF support is available via the FLAnimatedImageView category. + // this here is only code to allow drawing animated images as static ones +#if SD_WATCH + CGFloat scale = 1; + scale = [WKInterfaceDevice currentDevice].screenScale; +#elif SD_UIKIT + CGFloat scale = 1; + scale = [UIScreen mainScreen].scale; +#endif + + CGImageRef CGImage = CGImageSourceCreateImageAtIndex(source, 0, NULL); +#if SD_UIKIT || SD_WATCH + UIImage *frameImage = [UIImage imageWithCGImage:CGImage scale:scale orientation:UIImageOrientationUp]; + staticImage = [UIImage animatedImageWithImages:@[frameImage] duration:0.0f]; +#elif SD_MAC + staticImage = [[UIImage alloc] initWithCGImage:CGImage size:NSZeroSize]; +#endif + CGImageRelease(CGImage); } CFRelease(source); - return animatedImage; + return staticImage; } -+ (float)sd_frameDurationAtIndex:(NSUInteger)index source:(CGImageSourceRef)source { - float frameDuration = 0.1f; - CFDictionaryRef cfFrameProperties = CGImageSourceCopyPropertiesAtIndex(source, index, nil); - NSDictionary *frameProperties = (__bridge NSDictionary *)cfFrameProperties; - NSDictionary *gifProperties = frameProperties[(NSString *)kCGImagePropertyGIFDictionary]; - - NSNumber *delayTimeUnclampedProp = gifProperties[(NSString *)kCGImagePropertyGIFUnclampedDelayTime]; - if (delayTimeUnclampedProp) { - frameDuration = [delayTimeUnclampedProp floatValue]; - } - else { - - NSNumber *delayTimeProp = gifProperties[(NSString *)kCGImagePropertyGIFDelayTime]; - if (delayTimeProp) { - frameDuration = [delayTimeProp floatValue]; - } - } - - // Many annoying ads specify a 0 duration to make an image flash as quickly as possible. - // We follow Firefox's behavior and use a duration of 100 ms for any frames that specify - // a duration of <= 10 ms. See and - // for more information. - - if (frameDuration < 0.011f) { - frameDuration = 0.100f; - } - - CFRelease(cfFrameProperties); - return frameDuration; -} - -+ (UIImage *)sd_animatedGIFNamed:(NSString *)name { - CGFloat scale = [UIScreen mainScreen].scale; - - if (scale > 1.0f) { - NSString *retinaPath = [[NSBundle mainBundle] pathForResource:[name stringByAppendingString:@"@2x"] ofType:@"gif"]; - - NSData *data = [NSData dataWithContentsOfFile:retinaPath]; - - if (data) { - return [UIImage sd_animatedGIFWithData:data]; - } - - NSString *path = [[NSBundle mainBundle] pathForResource:name ofType:@"gif"]; - - data = [NSData dataWithContentsOfFile:path]; - - if (data) { - return [UIImage sd_animatedGIFWithData:data]; - } - - return [UIImage imageNamed:name]; - } - else { - NSString *path = [[NSBundle mainBundle] pathForResource:name ofType:@"gif"]; - - NSData *data = [NSData dataWithContentsOfFile:path]; - - if (data) { - return [UIImage sd_animatedGIFWithData:data]; - } - - return [UIImage imageNamed:name]; - } -} - -- (UIImage *)sd_animatedImageByScalingAndCroppingToSize:(CGSize)size { - if (CGSizeEqualToSize(self.size, size) || CGSizeEqualToSize(size, CGSizeZero)) { - return self; - } - - CGSize scaledSize = size; - CGPoint thumbnailPoint = CGPointZero; - - CGFloat widthFactor = size.width / self.size.width; - CGFloat heightFactor = size.height / self.size.height; - CGFloat scaleFactor = (widthFactor > heightFactor) ? widthFactor : heightFactor; - scaledSize.width = self.size.width * scaleFactor; - scaledSize.height = self.size.height * scaleFactor; - - if (widthFactor > heightFactor) { - thumbnailPoint.y = (size.height - scaledSize.height) * 0.5; - } - else if (widthFactor < heightFactor) { - thumbnailPoint.x = (size.width - scaledSize.width) * 0.5; - } - - NSMutableArray *scaledImages = [NSMutableArray array]; - - for (UIImage *image in self.images) { - UIGraphicsBeginImageContextWithOptions(size, NO, 0.0); - - [image drawInRect:CGRectMake(thumbnailPoint.x, thumbnailPoint.y, scaledSize.width, scaledSize.height)]; - UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext(); - - [scaledImages addObject:newImage]; - - UIGraphicsEndImageContext(); - } - - return [UIImage animatedImageWithImages:scaledImages duration:self.duration]; +- (BOOL)isGIF { + return (self.images != nil); } @end diff --git a/Example/Pods/SDWebImage/SDWebImage/UIImage+MultiFormat.h b/Example/Pods/SDWebImage/SDWebImage/UIImage+MultiFormat.h index 186ebc0a5..bec411e06 100644 --- a/Example/Pods/SDWebImage/SDWebImage/UIImage+MultiFormat.h +++ b/Example/Pods/SDWebImage/SDWebImage/UIImage+MultiFormat.h @@ -1,15 +1,18 @@ -// -// UIImage+MultiFormat.h -// SDWebImage -// -// Created by Olivier Poitrey on 07/06/13. -// Copyright (c) 2013 Dailymotion. All rights reserved. -// +/* + * This file is part of the SDWebImage package. + * (c) Olivier Poitrey + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ -#import +#import "SDWebImageCompat.h" +#import "NSData+ImageContentType.h" @interface UIImage (MultiFormat) -+ (UIImage *)sd_imageWithData:(NSData *)data; ++ (nullable UIImage *)sd_imageWithData:(nullable NSData *)data; +- (nullable NSData *)sd_imageData; +- (nullable NSData *)sd_imageDataAsFormat:(SDImageFormat)imageFormat; @end diff --git a/Example/Pods/SDWebImage/SDWebImage/UIImage+MultiFormat.m b/Example/Pods/SDWebImage/SDWebImage/UIImage+MultiFormat.m index a8307544d..378f38925 100644 --- a/Example/Pods/SDWebImage/SDWebImage/UIImage+MultiFormat.m +++ b/Example/Pods/SDWebImage/SDWebImage/UIImage+MultiFormat.m @@ -1,10 +1,10 @@ -// -// UIImage+MultiFormat.m -// SDWebImage -// -// Created by Olivier Poitrey on 07/06/13. -// Copyright (c) 2013 Dailymotion. All rights reserved. -// +/* + * This file is part of the SDWebImage package. + * (c) Olivier Poitrey + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ #import "UIImage+MultiFormat.h" #import "UIImage+GIF.h" @@ -17,38 +17,40 @@ @implementation UIImage (MultiFormat) -+ (UIImage *)sd_imageWithData:(NSData *)data { ++ (nullable UIImage *)sd_imageWithData:(nullable NSData *)data { if (!data) { return nil; } UIImage *image; - NSString *imageContentType = [NSData sd_contentTypeForImageData:data]; - if ([imageContentType isEqualToString:@"image/gif"]) { + SDImageFormat imageFormat = [NSData sd_imageFormatForImageData:data]; + if (imageFormat == SDImageFormatGIF) { image = [UIImage sd_animatedGIFWithData:data]; } #ifdef SD_WEBP - else if ([imageContentType isEqualToString:@"image/webp"]) + else if (imageFormat == SDImageFormatWebP) { image = [UIImage sd_imageWithWebPData:data]; } #endif else { image = [[UIImage alloc] initWithData:data]; +#if SD_UIKIT || SD_WATCH UIImageOrientation orientation = [self sd_imageOrientationFromImageData:data]; if (orientation != UIImageOrientationUp) { image = [UIImage imageWithCGImage:image.CGImage scale:image.scale orientation:orientation]; } +#endif } return image; } - -+(UIImageOrientation)sd_imageOrientationFromImageData:(NSData *)imageData { +#if SD_UIKIT || SD_WATCH ++(UIImageOrientation)sd_imageOrientationFromImageData:(nonnull NSData *)imageData { UIImageOrientation result = UIImageOrientationUp; CGImageSourceRef imageSource = CGImageSourceCreateWithData((__bridge CFDataRef)imageData, NULL); if (imageSource) { @@ -112,7 +114,48 @@ + (UIImageOrientation) sd_exifOrientationToiOSOrientation:(int)exifOrientation { } return orientation; } +#endif + +- (nullable NSData *)sd_imageData { + return [self sd_imageDataAsFormat:SDImageFormatUndefined]; +} +- (nullable NSData *)sd_imageDataAsFormat:(SDImageFormat)imageFormat { + NSData *imageData = nil; + if (self) { +#if SD_UIKIT || SD_WATCH + int alphaInfo = CGImageGetAlphaInfo(self.CGImage); + BOOL hasAlpha = !(alphaInfo == kCGImageAlphaNone || + alphaInfo == kCGImageAlphaNoneSkipFirst || + alphaInfo == kCGImageAlphaNoneSkipLast); + + BOOL usePNG = hasAlpha; + + // the imageFormat param has priority here. But if the format is undefined, we relly on the alpha channel + if (imageFormat != SDImageFormatUndefined) { + usePNG = (imageFormat == SDImageFormatPNG); + } + + if (usePNG) { + imageData = UIImagePNGRepresentation(self); + } else { + imageData = UIImageJPEGRepresentation(self, (CGFloat)1.0); + } +#else + NSBitmapImageFileType imageFileType = NSJPEGFileType; + if (imageFormat == SDImageFormatGIF) { + imageFileType = NSGIFFileType; + } else if (imageFormat == SDImageFormatPNG) { + imageFileType = NSPNGFileType; + } + + imageData = [NSBitmapImageRep representationOfImageRepsInArray:self.representations + usingType:imageFileType + properties:@{}]; +#endif + } + return imageData; +} @end diff --git a/Example/Pods/SDWebImage/SDWebImage/UIImageView+HighlightedWebCache.h b/Example/Pods/SDWebImage/SDWebImage/UIImageView+HighlightedWebCache.h index c1d8feaf4..ceb71c2ad 100644 --- a/Example/Pods/SDWebImage/SDWebImage/UIImageView+HighlightedWebCache.h +++ b/Example/Pods/SDWebImage/SDWebImage/UIImageView+HighlightedWebCache.h @@ -6,8 +6,10 @@ * file that was distributed with this source code. */ -#import #import "SDWebImageCompat.h" + +#if SD_UIKIT + #import "SDWebImageManager.h" /** @@ -22,7 +24,7 @@ * * @param url The url for the image. */ -- (void)sd_setHighlightedImageWithURL:(NSURL *)url; +- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url; /** * Set the imageView `highlightedImage` with an `url` and custom options. @@ -32,7 +34,8 @@ * @param url The url for the image. * @param options The options to use when downloading the image. @see SDWebImageOptions for the possible values. */ -- (void)sd_setHighlightedImageWithURL:(NSURL *)url options:(SDWebImageOptions)options; +- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url + options:(SDWebImageOptions)options; /** * Set the imageView `highlightedImage` with an `url`. @@ -46,7 +49,8 @@ * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setHighlightedImageWithURL:(NSURL *)url completed:(SDWebImageCompletionBlock)completedBlock; +- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url + completed:(nullable SDExternalCompletionBlock)completedBlock; /** * Set the imageView `highlightedImage` with an `url` and custom options. @@ -61,7 +65,9 @@ * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setHighlightedImageWithURL:(NSURL *)url options:(SDWebImageOptions)options completed:(SDWebImageCompletionBlock)completedBlock; +- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url + options:(SDWebImageOptions)options + completed:(nullable SDExternalCompletionBlock)completedBlock; /** * Set the imageView `highlightedImage` with an `url` and custom options. @@ -71,30 +77,18 @@ * @param url The url for the image. * @param options The options to use when downloading the image. @see SDWebImageOptions for the possible values. * @param progressBlock A block called while image is downloading + * @note the progress block is executed on a background queue * @param completedBlock A block called when operation has been completed. This block has no return value * and takes the requested UIImage as first parameter. In case of error the image parameter * is nil and the second parameter may contain an NSError. The third parameter is a Boolean * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setHighlightedImageWithURL:(NSURL *)url options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletionBlock)completedBlock; - -/** - * Cancel the current download - */ -- (void)sd_cancelCurrentHighlightedImageLoad; +- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url + options:(SDWebImageOptions)options + progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDExternalCompletionBlock)completedBlock; @end - -@interface UIImageView (HighlightedWebCacheDeprecated) - -- (void)setHighlightedImageWithURL:(NSURL *)url __deprecated_msg("Method deprecated. Use `sd_setHighlightedImageWithURL:`"); -- (void)setHighlightedImageWithURL:(NSURL *)url options:(SDWebImageOptions)options __deprecated_msg("Method deprecated. Use `sd_setHighlightedImageWithURL:options:`"); -- (void)setHighlightedImageWithURL:(NSURL *)url completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setHighlightedImageWithURL:completed:`"); -- (void)setHighlightedImageWithURL:(NSURL *)url options:(SDWebImageOptions)options completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setHighlightedImageWithURL:options:completed:`"); -- (void)setHighlightedImageWithURL:(NSURL *)url options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setHighlightedImageWithURL:options:progress:completed:`"); - -- (void)cancelCurrentHighlightedImageLoad __deprecated_msg("Use `sd_cancelCurrentHighlightedImageLoad`"); - -@end +#endif diff --git a/Example/Pods/SDWebImage/SDWebImage/UIImageView+HighlightedWebCache.m b/Example/Pods/SDWebImage/SDWebImage/UIImageView+HighlightedWebCache.m index 921134e5e..fb13bd8b1 100644 --- a/Example/Pods/SDWebImage/SDWebImage/UIImageView+HighlightedWebCache.m +++ b/Example/Pods/SDWebImage/SDWebImage/UIImageView+HighlightedWebCache.m @@ -7,106 +7,46 @@ */ #import "UIImageView+HighlightedWebCache.h" -#import "UIView+WebCacheOperation.h" -#define UIImageViewHighlightedWebCacheOperationKey @"highlightedImage" +#if SD_UIKIT + +#import "UIView+WebCacheOperation.h" +#import "UIView+WebCache.h" @implementation UIImageView (HighlightedWebCache) -- (void)sd_setHighlightedImageWithURL:(NSURL *)url { +- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url { [self sd_setHighlightedImageWithURL:url options:0 progress:nil completed:nil]; } -- (void)sd_setHighlightedImageWithURL:(NSURL *)url options:(SDWebImageOptions)options { +- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url options:(SDWebImageOptions)options { [self sd_setHighlightedImageWithURL:url options:options progress:nil completed:nil]; } -- (void)sd_setHighlightedImageWithURL:(NSURL *)url completed:(SDWebImageCompletionBlock)completedBlock { +- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url completed:(nullable SDExternalCompletionBlock)completedBlock { [self sd_setHighlightedImageWithURL:url options:0 progress:nil completed:completedBlock]; } -- (void)sd_setHighlightedImageWithURL:(NSURL *)url options:(SDWebImageOptions)options completed:(SDWebImageCompletionBlock)completedBlock { +- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url options:(SDWebImageOptions)options completed:(nullable SDExternalCompletionBlock)completedBlock { [self sd_setHighlightedImageWithURL:url options:options progress:nil completed:completedBlock]; } -- (void)sd_setHighlightedImageWithURL:(NSURL *)url options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletionBlock)completedBlock { - [self sd_cancelCurrentHighlightedImageLoad]; - - if (url) { - __weak __typeof(self)wself = self; - id operation = [SDWebImageManager.sharedManager downloadImageWithURL:url options:options progress:progressBlock completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { - if (!wself) return; - dispatch_main_sync_safe (^ - { - if (!wself) return; - if (image && (options & SDWebImageAvoidAutoSetImage) && completedBlock) - { - completedBlock(image, error, cacheType, url); - return; - } - else if (image) { - wself.highlightedImage = image; - [wself setNeedsLayout]; - } - if (completedBlock && finished) { - completedBlock(image, error, cacheType, url); - } - }); - }]; - [self sd_setImageLoadOperation:operation forKey:UIImageViewHighlightedWebCacheOperationKey]; - } else { - dispatch_main_async_safe(^{ - NSError *error = [NSError errorWithDomain:SDWebImageErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}]; - if (completedBlock) { - completedBlock(nil, error, SDImageCacheTypeNone, url); - } - }); - } -} - -- (void)sd_cancelCurrentHighlightedImageLoad { - [self sd_cancelImageLoadOperationWithKey:UIImageViewHighlightedWebCacheOperationKey]; +- (void)sd_setHighlightedImageWithURL:(nullable NSURL *)url + options:(SDWebImageOptions)options + progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDExternalCompletionBlock)completedBlock { + __weak typeof(self)weakSelf = self; + [self sd_internalSetImageWithURL:url + placeholderImage:nil + options:options + operationKey:@"UIImageViewImageOperationHighlighted" + setImageBlock:^(UIImage *image, NSData *imageData) { + weakSelf.highlightedImage = image; + } + progress:progressBlock + completed:completedBlock]; } @end - -@implementation UIImageView (HighlightedWebCacheDeprecated) - -- (void)setHighlightedImageWithURL:(NSURL *)url { - [self sd_setHighlightedImageWithURL:url options:0 progress:nil completed:nil]; -} - -- (void)setHighlightedImageWithURL:(NSURL *)url options:(SDWebImageOptions)options { - [self sd_setHighlightedImageWithURL:url options:options progress:nil completed:nil]; -} - -- (void)setHighlightedImageWithURL:(NSURL *)url completed:(SDWebImageCompletedBlock)completedBlock { - [self sd_setHighlightedImageWithURL:url options:0 progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType); - } - }]; -} - -- (void)setHighlightedImageWithURL:(NSURL *)url options:(SDWebImageOptions)options completed:(SDWebImageCompletedBlock)completedBlock { - [self sd_setHighlightedImageWithURL:url options:options progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType); - } - }]; -} - -- (void)setHighlightedImageWithURL:(NSURL *)url options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletedBlock)completedBlock { - [self sd_setHighlightedImageWithURL:url options:0 progress:progressBlock completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType); - } - }]; -} - -- (void)cancelCurrentHighlightedImageLoad { - [self sd_cancelCurrentHighlightedImageLoad]; -} - -@end +#endif diff --git a/Example/Pods/SDWebImage/SDWebImage/UIImageView+WebCache.h b/Example/Pods/SDWebImage/SDWebImage/UIImageView+WebCache.h index eeb7460d5..b1d954f97 100644 --- a/Example/Pods/SDWebImage/SDWebImage/UIImageView+WebCache.h +++ b/Example/Pods/SDWebImage/SDWebImage/UIImageView+WebCache.h @@ -7,6 +7,9 @@ */ #import "SDWebImageCompat.h" + +#if SD_UIKIT || SD_MAC + #import "SDWebImageManager.h" /** @@ -44,14 +47,6 @@ */ @interface UIImageView (WebCache) -/** - * Get the current image URL. - * - * Note that because of the limitations of categories this property can get out of sync - * if you use sd_setImage: directly. - */ -- (NSURL *)sd_imageURL; - /** * Set the imageView `image` with an `url`. * @@ -59,7 +54,7 @@ * * @param url The url for the image. */ -- (void)sd_setImageWithURL:(NSURL *)url; +- (void)sd_setImageWithURL:(nullable NSURL *)url; /** * Set the imageView `image` with an `url` and a placeholder. @@ -70,7 +65,8 @@ * @param placeholder The image to be set initially, until the image request finishes. * @see sd_setImageWithURL:placeholderImage:options: */ -- (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder; +- (void)sd_setImageWithURL:(nullable NSURL *)url + placeholderImage:(nullable UIImage *)placeholder; /** * Set the imageView `image` with an `url`, placeholder and custom options. @@ -81,7 +77,9 @@ * @param placeholder The image to be set initially, until the image request finishes. * @param options The options to use when downloading the image. @see SDWebImageOptions for the possible values. */ -- (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options; +- (void)sd_setImageWithURL:(nullable NSURL *)url + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options; /** * Set the imageView `image` with an `url`. @@ -95,7 +93,8 @@ * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setImageWithURL:(NSURL *)url completed:(SDWebImageCompletionBlock)completedBlock; +- (void)sd_setImageWithURL:(nullable NSURL *)url + completed:(nullable SDExternalCompletionBlock)completedBlock; /** * Set the imageView `image` with an `url`, placeholder. @@ -110,7 +109,9 @@ * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder completed:(SDWebImageCompletionBlock)completedBlock; +- (void)sd_setImageWithURL:(nullable NSURL *)url + placeholderImage:(nullable UIImage *)placeholder + completed:(nullable SDExternalCompletionBlock)completedBlock; /** * Set the imageView `image` with an `url`, placeholder and custom options. @@ -126,7 +127,10 @@ * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletionBlock)completedBlock; +- (void)sd_setImageWithURL:(nullable NSURL *)url + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options + completed:(nullable SDExternalCompletionBlock)completedBlock; /** * Set the imageView `image` with an `url`, placeholder and custom options. @@ -137,13 +141,18 @@ * @param placeholder The image to be set initially, until the image request finishes. * @param options The options to use when downloading the image. @see SDWebImageOptions for the possible values. * @param progressBlock A block called while image is downloading + * @note the progress block is executed on a background queue * @param completedBlock A block called when operation has been completed. This block has no return value * and takes the requested UIImage as first parameter. In case of error the image parameter * is nil and the second parameter may contain an NSError. The third parameter is a Boolean * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletionBlock)completedBlock; +- (void)sd_setImageWithURL:(nullable NSURL *)url + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options + progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDExternalCompletionBlock)completedBlock; /** * Set the imageView `image` with an `url` and optionally a placeholder image. @@ -154,60 +163,34 @@ * @param placeholder The image to be set initially, until the image request finishes. * @param options The options to use when downloading the image. @see SDWebImageOptions for the possible values. * @param progressBlock A block called while image is downloading + * @note the progress block is executed on a background queue * @param completedBlock A block called when operation has been completed. This block has no return value * and takes the requested UIImage as first parameter. In case of error the image parameter * is nil and the second parameter may contain an NSError. The third parameter is a Boolean * indicating if the image was retrieved from the local cache or from the network. * The fourth parameter is the original image url. */ -- (void)sd_setImageWithPreviousCachedImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletionBlock)completedBlock; +- (void)sd_setImageWithPreviousCachedImageWithURL:(nullable NSURL *)url + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options + progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDExternalCompletionBlock)completedBlock; + +#if SD_UIKIT + +#pragma mark - Animation of multiple images /** * Download an array of images and starts them in an animation loop * * @param arrayOfURLs An array of NSURL */ -- (void)sd_setAnimationImagesWithURLs:(NSArray *)arrayOfURLs; - -/** - * Cancel the current download - */ -- (void)sd_cancelCurrentImageLoad; +- (void)sd_setAnimationImagesWithURLs:(nonnull NSArray *)arrayOfURLs; - (void)sd_cancelCurrentAnimationImagesLoad; -/** - * Show activity UIActivityIndicatorView - */ -- (void)setShowActivityIndicatorView:(BOOL)show; - -/** - * set desired UIActivityIndicatorViewStyle - * - * @param style The style of the UIActivityIndicatorView - */ -- (void)setIndicatorStyle:(UIActivityIndicatorViewStyle)style; +#endif @end - -@interface UIImageView (WebCacheDeprecated) - -- (NSURL *)imageURL __deprecated_msg("Use `sd_imageURL`"); - -- (void)setImageWithURL:(NSURL *)url __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:`"); -- (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:placeholderImage:`"); -- (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:placeholderImage:options`"); - -- (void)setImageWithURL:(NSURL *)url completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:completed:`"); -- (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:placeholderImage:completed:`"); -- (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:placeholderImage:options:completed:`"); -- (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletedBlock)completedBlock __deprecated_msg("Method deprecated. Use `sd_setImageWithURL:placeholderImage:options:progress:completed:`"); - -- (void)setAnimationImagesWithURLs:(NSArray *)arrayOfURLs __deprecated_msg("Use `sd_setAnimationImagesWithURLs:`"); - -- (void)cancelCurrentArrayLoad __deprecated_msg("Use `sd_cancelCurrentAnimationImagesLoad`"); - -- (void)cancelCurrentImageLoad __deprecated_msg("Use `sd_cancelCurrentImageLoad`"); - -@end +#endif diff --git a/Example/Pods/SDWebImage/SDWebImage/UIImageView+WebCache.m b/Example/Pods/SDWebImage/SDWebImage/UIImageView+WebCache.m index 14f425cc2..81f687ef4 100644 --- a/Example/Pods/SDWebImage/SDWebImage/UIImageView+WebCache.m +++ b/Example/Pods/SDWebImage/SDWebImage/UIImageView+WebCache.m @@ -7,119 +7,82 @@ */ #import "UIImageView+WebCache.h" + +#if SD_UIKIT || SD_MAC + #import "objc/runtime.h" #import "UIView+WebCacheOperation.h" - -static char imageURLKey; -static char TAG_ACTIVITY_INDICATOR; -static char TAG_ACTIVITY_STYLE; -static char TAG_ACTIVITY_SHOW; +#import "UIView+WebCache.h" @implementation UIImageView (WebCache) -- (void)sd_setImageWithURL:(NSURL *)url { +- (void)sd_setImageWithURL:(nullable NSURL *)url { [self sd_setImageWithURL:url placeholderImage:nil options:0 progress:nil completed:nil]; } -- (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder { +- (void)sd_setImageWithURL:(nullable NSURL *)url placeholderImage:(nullable UIImage *)placeholder { [self sd_setImageWithURL:url placeholderImage:placeholder options:0 progress:nil completed:nil]; } -- (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options { +- (void)sd_setImageWithURL:(nullable NSURL *)url placeholderImage:(nullable UIImage *)placeholder options:(SDWebImageOptions)options { [self sd_setImageWithURL:url placeholderImage:placeholder options:options progress:nil completed:nil]; } -- (void)sd_setImageWithURL:(NSURL *)url completed:(SDWebImageCompletionBlock)completedBlock { +- (void)sd_setImageWithURL:(nullable NSURL *)url completed:(nullable SDExternalCompletionBlock)completedBlock { [self sd_setImageWithURL:url placeholderImage:nil options:0 progress:nil completed:completedBlock]; } -- (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder completed:(SDWebImageCompletionBlock)completedBlock { +- (void)sd_setImageWithURL:(nullable NSURL *)url placeholderImage:(nullable UIImage *)placeholder completed:(nullable SDExternalCompletionBlock)completedBlock { [self sd_setImageWithURL:url placeholderImage:placeholder options:0 progress:nil completed:completedBlock]; } -- (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletionBlock)completedBlock { +- (void)sd_setImageWithURL:(nullable NSURL *)url placeholderImage:(nullable UIImage *)placeholder options:(SDWebImageOptions)options completed:(nullable SDExternalCompletionBlock)completedBlock { [self sd_setImageWithURL:url placeholderImage:placeholder options:options progress:nil completed:completedBlock]; } -- (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletionBlock)completedBlock { - [self sd_cancelCurrentImageLoad]; - objc_setAssociatedObject(self, &imageURLKey, url, OBJC_ASSOCIATION_RETAIN_NONATOMIC); - - if (!(options & SDWebImageDelayPlaceholder)) { - dispatch_main_async_safe(^{ - self.image = placeholder; - }); - } - - if (url) { - - // check if activityView is enabled or not - if ([self showActivityIndicatorView]) { - [self addActivityIndicator]; - } - - __weak __typeof(self)wself = self; - id operation = [SDWebImageManager.sharedManager downloadImageWithURL:url options:options progress:progressBlock completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { - [wself removeActivityIndicator]; - if (!wself) return; - dispatch_main_sync_safe(^{ - if (!wself) return; - if (image && (options & SDWebImageAvoidAutoSetImage) && completedBlock) - { - completedBlock(image, error, cacheType, url); - return; - } - else if (image) { - wself.image = image; - [wself setNeedsLayout]; - } else { - if ((options & SDWebImageDelayPlaceholder)) { - wself.image = placeholder; - [wself setNeedsLayout]; - } - } - if (completedBlock && finished) { - completedBlock(image, error, cacheType, url); - } - }); - }]; - [self sd_setImageLoadOperation:operation forKey:@"UIImageViewImageLoad"]; - } else { - dispatch_main_async_safe(^{ - [self removeActivityIndicator]; - if (completedBlock) { - NSError *error = [NSError errorWithDomain:SDWebImageErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}]; - completedBlock(nil, error, SDImageCacheTypeNone, url); - } - }); - } -} - -- (void)sd_setImageWithPreviousCachedImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletionBlock)completedBlock { +- (void)sd_setImageWithURL:(nullable NSURL *)url + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options + progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDExternalCompletionBlock)completedBlock { + [self sd_internalSetImageWithURL:url + placeholderImage:placeholder + options:options + operationKey:nil + setImageBlock:nil + progress:progressBlock + completed:completedBlock]; +} + +- (void)sd_setImageWithPreviousCachedImageWithURL:(nullable NSURL *)url + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options + progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDExternalCompletionBlock)completedBlock { NSString *key = [[SDWebImageManager sharedManager] cacheKeyForURL:url]; - UIImage *lastPreviousCachedImage = [[SDImageCache sharedImageCache] imageFromDiskCacheForKey:key]; + UIImage *lastPreviousCachedImage = [[SDImageCache sharedImageCache] imageFromCacheForKey:key]; [self sd_setImageWithURL:url placeholderImage:lastPreviousCachedImage ?: placeholder options:options progress:progressBlock completed:completedBlock]; } -- (NSURL *)sd_imageURL { - return objc_getAssociatedObject(self, &imageURLKey); -} +#if SD_UIKIT -- (void)sd_setAnimationImagesWithURLs:(NSArray *)arrayOfURLs { +#pragma mark - Animation of multiple images + +- (void)sd_setAnimationImagesWithURLs:(nonnull NSArray *)arrayOfURLs { [self sd_cancelCurrentAnimationImagesLoad]; __weak __typeof(self)wself = self; - NSMutableArray *operationsArray = [[NSMutableArray alloc] init]; + NSMutableArray> *operationsArray = [[NSMutableArray alloc] init]; for (NSURL *logoImageURL in arrayOfURLs) { - id operation = [SDWebImageManager.sharedManager downloadImageWithURL:logoImageURL options:0 progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { + id operation = [SDWebImageManager.sharedManager loadImageWithURL:logoImageURL options:0 progress:nil completed:^(UIImage *image, NSData *data, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { if (!wself) return; - dispatch_main_sync_safe(^{ + dispatch_main_async_safe(^{ __strong UIImageView *sself = wself; [sself stopAnimating]; if (sself && image) { - NSMutableArray *currentImages = [[sself animationImages] mutableCopy]; + NSMutableArray *currentImages = [[sself animationImages] mutableCopy]; if (!currentImages) { currentImages = [[NSMutableArray alloc] init]; } @@ -134,144 +97,14 @@ - (void)sd_setAnimationImagesWithURLs:(NSArray *)arrayOfURLs { [operationsArray addObject:operation]; } - [self sd_setImageLoadOperation:[NSArray arrayWithArray:operationsArray] forKey:@"UIImageViewAnimationImages"]; -} - -- (void)sd_cancelCurrentImageLoad { - [self sd_cancelImageLoadOperationWithKey:@"UIImageViewImageLoad"]; + [self sd_setImageLoadOperation:[operationsArray copy] forKey:@"UIImageViewAnimationImages"]; } - (void)sd_cancelCurrentAnimationImagesLoad { [self sd_cancelImageLoadOperationWithKey:@"UIImageViewAnimationImages"]; } - - -#pragma mark - -- (UIActivityIndicatorView *)activityIndicator { - return (UIActivityIndicatorView *)objc_getAssociatedObject(self, &TAG_ACTIVITY_INDICATOR); -} - -- (void)setActivityIndicator:(UIActivityIndicatorView *)activityIndicator { - objc_setAssociatedObject(self, &TAG_ACTIVITY_INDICATOR, activityIndicator, OBJC_ASSOCIATION_RETAIN); -} - -- (void)setShowActivityIndicatorView:(BOOL)show{ - objc_setAssociatedObject(self, &TAG_ACTIVITY_SHOW, [NSNumber numberWithBool:show], OBJC_ASSOCIATION_RETAIN); -} - -- (BOOL)showActivityIndicatorView{ - return [objc_getAssociatedObject(self, &TAG_ACTIVITY_SHOW) boolValue]; -} - -- (void)setIndicatorStyle:(UIActivityIndicatorViewStyle)style{ - objc_setAssociatedObject(self, &TAG_ACTIVITY_STYLE, [NSNumber numberWithInt:style], OBJC_ASSOCIATION_RETAIN); -} - -- (int)getIndicatorStyle{ - return [objc_getAssociatedObject(self, &TAG_ACTIVITY_STYLE) intValue]; -} - -- (void)addActivityIndicator { - if (!self.activityIndicator) { - self.activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:[self getIndicatorStyle]]; - self.activityIndicator.translatesAutoresizingMaskIntoConstraints = NO; - - dispatch_main_async_safe(^{ - [self addSubview:self.activityIndicator]; - - [self addConstraint:[NSLayoutConstraint constraintWithItem:self.activityIndicator - attribute:NSLayoutAttributeCenterX - relatedBy:NSLayoutRelationEqual - toItem:self - attribute:NSLayoutAttributeCenterX - multiplier:1.0 - constant:0.0]]; - [self addConstraint:[NSLayoutConstraint constraintWithItem:self.activityIndicator - attribute:NSLayoutAttributeCenterY - relatedBy:NSLayoutRelationEqual - toItem:self - attribute:NSLayoutAttributeCenterY - multiplier:1.0 - constant:0.0]]; - }); - } - - dispatch_main_async_safe(^{ - [self.activityIndicator startAnimating]; - }); - -} - -- (void)removeActivityIndicator { - if (self.activityIndicator) { - [self.activityIndicator removeFromSuperview]; - self.activityIndicator = nil; - } -} +#endif @end - -@implementation UIImageView (WebCacheDeprecated) - -- (NSURL *)imageURL { - return [self sd_imageURL]; -} - -- (void)setImageWithURL:(NSURL *)url { - [self sd_setImageWithURL:url placeholderImage:nil options:0 progress:nil completed:nil]; -} - -- (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder { - [self sd_setImageWithURL:url placeholderImage:placeholder options:0 progress:nil completed:nil]; -} - -- (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options { - [self sd_setImageWithURL:url placeholderImage:placeholder options:options progress:nil completed:nil]; -} - -- (void)setImageWithURL:(NSURL *)url completed:(SDWebImageCompletedBlock)completedBlock { - [self sd_setImageWithURL:url placeholderImage:nil options:0 progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType); - } - }]; -} - -- (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder completed:(SDWebImageCompletedBlock)completedBlock { - [self sd_setImageWithURL:url placeholderImage:placeholder options:0 progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType); - } - }]; -} - -- (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options completed:(SDWebImageCompletedBlock)completedBlock { - [self sd_setImageWithURL:url placeholderImage:placeholder options:options progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType); - } - }]; -} - -- (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder options:(SDWebImageOptions)options progress:(SDWebImageDownloaderProgressBlock)progressBlock completed:(SDWebImageCompletedBlock)completedBlock { - [self sd_setImageWithURL:url placeholderImage:placeholder options:options progress:progressBlock completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL) { - if (completedBlock) { - completedBlock(image, error, cacheType); - } - }]; -} - -- (void)cancelCurrentArrayLoad { - [self sd_cancelCurrentAnimationImagesLoad]; -} - -- (void)cancelCurrentImageLoad { - [self sd_cancelCurrentImageLoad]; -} - -- (void)setAnimationImagesWithURLs:(NSArray *)arrayOfURLs { - [self sd_setAnimationImagesWithURLs:arrayOfURLs]; -} - -@end +#endif diff --git a/Example/Pods/SDWebImage/SDWebImage/UIView+WebCache.h b/Example/Pods/SDWebImage/SDWebImage/UIView+WebCache.h new file mode 100644 index 000000000..4c5751945 --- /dev/null +++ b/Example/Pods/SDWebImage/SDWebImage/UIView+WebCache.h @@ -0,0 +1,82 @@ +/* + * This file is part of the SDWebImage package. + * (c) Olivier Poitrey + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +#import "SDWebImageCompat.h" + +#if SD_UIKIT || SD_MAC + +#import "SDWebImageManager.h" + +typedef void(^SDSetImageBlock)(UIImage * _Nullable image, NSData * _Nullable imageData); + +@interface UIView (WebCache) + +/** + * Get the current image URL. + * + * Note that because of the limitations of categories this property can get out of sync + * if you use setImage: directly. + */ +- (nullable NSURL *)sd_imageURL; + +/** + * Set the imageView `image` with an `url` and optionally a placeholder image. + * + * The download is asynchronous and cached. + * + * @param url The url for the image. + * @param placeholder The image to be set initially, until the image request finishes. + * @param options The options to use when downloading the image. @see SDWebImageOptions for the possible values. + * @param operationKey A string to be used as the operation key. If nil, will use the class name + * @param setImageBlock Block used for custom set image code + * @param progressBlock A block called while image is downloading + * @note the progress block is executed on a background queue + * @param completedBlock A block called when operation has been completed. This block has no return value + * and takes the requested UIImage as first parameter. In case of error the image parameter + * is nil and the second parameter may contain an NSError. The third parameter is a Boolean + * indicating if the image was retrieved from the local cache or from the network. + * The fourth parameter is the original image url. + */ +- (void)sd_internalSetImageWithURL:(nullable NSURL *)url + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options + operationKey:(nullable NSString *)operationKey + setImageBlock:(nullable SDSetImageBlock)setImageBlock + progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDExternalCompletionBlock)completedBlock; + +/** + * Cancel the current download + */ +- (void)sd_cancelCurrentImageLoad; + +#if SD_UIKIT + +#pragma mark - Activity indicator + +/** + * Show activity UIActivityIndicatorView + */ +- (void)sd_setShowActivityIndicatorView:(BOOL)show; + +/** + * set desired UIActivityIndicatorViewStyle + * + * @param style The style of the UIActivityIndicatorView + */ +- (void)sd_setIndicatorStyle:(UIActivityIndicatorViewStyle)style; + +- (BOOL)sd_showActivityIndicatorView; +- (void)sd_addActivityIndicator; +- (void)sd_removeActivityIndicator; + +#endif + +@end + +#endif diff --git a/Example/Pods/SDWebImage/SDWebImage/UIView+WebCache.m b/Example/Pods/SDWebImage/SDWebImage/UIView+WebCache.m new file mode 100644 index 000000000..ad2b54c49 --- /dev/null +++ b/Example/Pods/SDWebImage/SDWebImage/UIView+WebCache.m @@ -0,0 +1,200 @@ +/* + * This file is part of the SDWebImage package. + * (c) Olivier Poitrey + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +#import "UIView+WebCache.h" + +#if SD_UIKIT || SD_MAC + +#import "objc/runtime.h" +#import "UIView+WebCacheOperation.h" + +static char imageURLKey; + +#if SD_UIKIT +static char TAG_ACTIVITY_INDICATOR; +static char TAG_ACTIVITY_STYLE; +#endif +static char TAG_ACTIVITY_SHOW; + +@implementation UIView (WebCache) + +- (nullable NSURL *)sd_imageURL { + return objc_getAssociatedObject(self, &imageURLKey); +} + +- (void)sd_internalSetImageWithURL:(nullable NSURL *)url + placeholderImage:(nullable UIImage *)placeholder + options:(SDWebImageOptions)options + operationKey:(nullable NSString *)operationKey + setImageBlock:(nullable SDSetImageBlock)setImageBlock + progress:(nullable SDWebImageDownloaderProgressBlock)progressBlock + completed:(nullable SDExternalCompletionBlock)completedBlock { + NSString *validOperationKey = operationKey ?: NSStringFromClass([self class]); + [self sd_cancelImageLoadOperationWithKey:validOperationKey]; + objc_setAssociatedObject(self, &imageURLKey, url, OBJC_ASSOCIATION_RETAIN_NONATOMIC); + + if (!(options & SDWebImageDelayPlaceholder)) { + dispatch_main_async_safe(^{ + [self sd_setImage:placeholder imageData:nil basedOnClassOrViaCustomSetImageBlock:setImageBlock]; + }); + } + + if (url) { + // check if activityView is enabled or not + if ([self sd_showActivityIndicatorView]) { + [self sd_addActivityIndicator]; + } + + __weak __typeof(self)wself = self; + id operation = [SDWebImageManager.sharedManager loadImageWithURL:url options:options progress:progressBlock completed:^(UIImage *image, NSData *data, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { + __strong __typeof (wself) sself = wself; + [sself sd_removeActivityIndicator]; + if (!sself) { + return; + } + dispatch_main_async_safe(^{ + if (!sself) { + return; + } + if (image && (options & SDWebImageAvoidAutoSetImage) && completedBlock) { + completedBlock(image, error, cacheType, url); + return; + } else if (image) { + [sself sd_setImage:image imageData:data basedOnClassOrViaCustomSetImageBlock:setImageBlock]; + [sself sd_setNeedsLayout]; + } else { + if ((options & SDWebImageDelayPlaceholder)) { + [sself sd_setImage:placeholder imageData:nil basedOnClassOrViaCustomSetImageBlock:setImageBlock]; + [sself sd_setNeedsLayout]; + } + } + if (completedBlock && finished) { + completedBlock(image, error, cacheType, url); + } + }); + }]; + [self sd_setImageLoadOperation:operation forKey:validOperationKey]; + } else { + dispatch_main_async_safe(^{ + [self sd_removeActivityIndicator]; + if (completedBlock) { + NSError *error = [NSError errorWithDomain:SDWebImageErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}]; + completedBlock(nil, error, SDImageCacheTypeNone, url); + } + }); + } +} + +- (void)sd_cancelCurrentImageLoad { + [self sd_cancelImageLoadOperationWithKey:NSStringFromClass([self class])]; +} + +- (void)sd_setImage:(UIImage *)image imageData:(NSData *)imageData basedOnClassOrViaCustomSetImageBlock:(SDSetImageBlock)setImageBlock { + if (setImageBlock) { + setImageBlock(image, imageData); + return; + } + +#if SD_UIKIT || SD_MAC + if ([self isKindOfClass:[UIImageView class]]) { + UIImageView *imageView = (UIImageView *)self; + imageView.image = image; + } +#endif + +#if SD_UIKIT + if ([self isKindOfClass:[UIButton class]]) { + UIButton *button = (UIButton *)self; + [button setImage:image forState:UIControlStateNormal]; + } +#endif +} + +- (void)sd_setNeedsLayout { +#if SD_UIKIT + [self setNeedsLayout]; +#elif SD_MAC + [self setNeedsLayout:YES]; +#endif +} + +#pragma mark - Activity indicator + +#pragma mark - +#if SD_UIKIT +- (UIActivityIndicatorView *)activityIndicator { + return (UIActivityIndicatorView *)objc_getAssociatedObject(self, &TAG_ACTIVITY_INDICATOR); +} + +- (void)setActivityIndicator:(UIActivityIndicatorView *)activityIndicator { + objc_setAssociatedObject(self, &TAG_ACTIVITY_INDICATOR, activityIndicator, OBJC_ASSOCIATION_RETAIN); +} +#endif + +- (void)sd_setShowActivityIndicatorView:(BOOL)show { + objc_setAssociatedObject(self, &TAG_ACTIVITY_SHOW, @(show), OBJC_ASSOCIATION_RETAIN); +} + +- (BOOL)sd_showActivityIndicatorView { + return [objc_getAssociatedObject(self, &TAG_ACTIVITY_SHOW) boolValue]; +} + +#if SD_UIKIT +- (void)sd_setIndicatorStyle:(UIActivityIndicatorViewStyle)style{ + objc_setAssociatedObject(self, &TAG_ACTIVITY_STYLE, [NSNumber numberWithInt:style], OBJC_ASSOCIATION_RETAIN); +} + +- (int)sd_getIndicatorStyle{ + return [objc_getAssociatedObject(self, &TAG_ACTIVITY_STYLE) intValue]; +} +#endif + +- (void)sd_addActivityIndicator { +#if SD_UIKIT + if (!self.activityIndicator) { + self.activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:[self sd_getIndicatorStyle]]; + self.activityIndicator.translatesAutoresizingMaskIntoConstraints = NO; + + dispatch_main_async_safe(^{ + [self addSubview:self.activityIndicator]; + + [self addConstraint:[NSLayoutConstraint constraintWithItem:self.activityIndicator + attribute:NSLayoutAttributeCenterX + relatedBy:NSLayoutRelationEqual + toItem:self + attribute:NSLayoutAttributeCenterX + multiplier:1.0 + constant:0.0]]; + [self addConstraint:[NSLayoutConstraint constraintWithItem:self.activityIndicator + attribute:NSLayoutAttributeCenterY + relatedBy:NSLayoutRelationEqual + toItem:self + attribute:NSLayoutAttributeCenterY + multiplier:1.0 + constant:0.0]]; + }); + } + + dispatch_main_async_safe(^{ + [self.activityIndicator startAnimating]; + }); +#endif +} + +- (void)sd_removeActivityIndicator { +#if SD_UIKIT + if (self.activityIndicator) { + [self.activityIndicator removeFromSuperview]; + self.activityIndicator = nil; + } +#endif +} + +@end + +#endif diff --git a/Example/Pods/SDWebImage/SDWebImage/UIView+WebCacheOperation.h b/Example/Pods/SDWebImage/SDWebImage/UIView+WebCacheOperation.h index 67190362d..f5e95fa68 100644 --- a/Example/Pods/SDWebImage/SDWebImage/UIView+WebCacheOperation.h +++ b/Example/Pods/SDWebImage/SDWebImage/UIView+WebCacheOperation.h @@ -6,7 +6,10 @@ * file that was distributed with this source code. */ -#import +#import "SDWebImageCompat.h" + +#if SD_UIKIT || SD_MAC + #import "SDWebImageManager.h" @interface UIView (WebCacheOperation) @@ -17,20 +20,22 @@ * @param operation the operation * @param key key for storing the operation */ -- (void)sd_setImageLoadOperation:(id)operation forKey:(NSString *)key; +- (void)sd_setImageLoadOperation:(nullable id)operation forKey:(nullable NSString *)key; /** * Cancel all operations for the current UIView and key * * @param key key for identifying the operations */ -- (void)sd_cancelImageLoadOperationWithKey:(NSString *)key; +- (void)sd_cancelImageLoadOperationWithKey:(nullable NSString *)key; /** * Just remove the operations corresponding to the current UIView and key without cancelling them * * @param key key for identifying the operations */ -- (void)sd_removeImageLoadOperationWithKey:(NSString *)key; +- (void)sd_removeImageLoadOperationWithKey:(nullable NSString *)key; @end + +#endif diff --git a/Example/Pods/SDWebImage/SDWebImage/UIView+WebCacheOperation.m b/Example/Pods/SDWebImage/SDWebImage/UIView+WebCacheOperation.m index 92194780d..a515a74f6 100644 --- a/Example/Pods/SDWebImage/SDWebImage/UIView+WebCacheOperation.m +++ b/Example/Pods/SDWebImage/SDWebImage/UIView+WebCacheOperation.m @@ -7,14 +7,19 @@ */ #import "UIView+WebCacheOperation.h" + +#if SD_UIKIT || SD_MAC + #import "objc/runtime.h" static char loadOperationKey; +typedef NSMutableDictionary SDOperationsDictionary; + @implementation UIView (WebCacheOperation) -- (NSMutableDictionary *)operationDictionary { - NSMutableDictionary *operations = objc_getAssociatedObject(self, &loadOperationKey); +- (SDOperationsDictionary *)operationDictionary { + SDOperationsDictionary *operations = objc_getAssociatedObject(self, &loadOperationKey); if (operations) { return operations; } @@ -23,16 +28,20 @@ - (NSMutableDictionary *)operationDictionary { return operations; } -- (void)sd_setImageLoadOperation:(id)operation forKey:(NSString *)key { - [self sd_cancelImageLoadOperationWithKey:key]; - NSMutableDictionary *operationDictionary = [self operationDictionary]; - [operationDictionary setObject:operation forKey:key]; +- (void)sd_setImageLoadOperation:(nullable id)operation forKey:(nullable NSString *)key { + if (key) { + [self sd_cancelImageLoadOperationWithKey:key]; + if (operation) { + SDOperationsDictionary *operationDictionary = [self operationDictionary]; + operationDictionary[key] = operation; + } + } } -- (void)sd_cancelImageLoadOperationWithKey:(NSString *)key { +- (void)sd_cancelImageLoadOperationWithKey:(nullable NSString *)key { // Cancel in progress downloader from queue - NSMutableDictionary *operationDictionary = [self operationDictionary]; - id operations = [operationDictionary objectForKey:key]; + SDOperationsDictionary *operationDictionary = [self operationDictionary]; + id operations = operationDictionary[key]; if (operations) { if ([operations isKindOfClass:[NSArray class]]) { for (id operation in operations) { @@ -47,9 +56,13 @@ - (void)sd_cancelImageLoadOperationWithKey:(NSString *)key { } } -- (void)sd_removeImageLoadOperationWithKey:(NSString *)key { - NSMutableDictionary *operationDictionary = [self operationDictionary]; - [operationDictionary removeObjectForKey:key]; +- (void)sd_removeImageLoadOperationWithKey:(nullable NSString *)key { + if (key) { + SDOperationsDictionary *operationDictionary = [self operationDictionary]; + [operationDictionary removeObjectForKey:key]; + } } @end + +#endif diff --git a/Example/Pods/Specta/README.md b/Example/Pods/Specta/README.md index f453a2eb6..d9b59e277 100644 --- a/Example/Pods/Specta/README.md +++ b/Example/Pods/Specta/README.md @@ -1,11 +1,7 @@ -# Specta +# Specta [![Build Status](https://travis-ci.org/specta/specta.svg)](https://travis-ci.org/specta/specta) [![Coverage Status](https://coveralls.io/repos/specta/specta/badge.svg)](https://coveralls.io/r/specta/specta) A light-weight TDD / BDD framework for Objective-C. -### Status -[![Build Status](https://travis-ci.org/specta/specta.png)](https://travis-ci.org/specta/specta) -[![Coverage Status](https://coveralls.io/repos/specta/specta/badge.svg)](https://coveralls.io/r/specta/specta) - ## FEATURES * An Objective-C RSpec-like BDD DSL @@ -15,56 +11,7 @@ A light-weight TDD / BDD framework for Objective-C. ## SCREENSHOT -![Specta Screenshot](https://raw.githubusercontent.com/specta/specta/master/misc/specta_screenshot.jpg) - -## SETUP - -Use [CocoaPods](http://github.com/CocoaPods/CocoaPods), [Carthage](https://github.com/carthage/carthage) or [Set up manually](#setting-up-manually) - -### CocoaPods - -1. Add Specta to your project's `Podfile`: - - ```ruby - target :MyApp do - # your app dependencies - end - - target :MyAppTests do - pod 'Specta', '~> 0.5' - # pod 'Expecta', '~> 0.3' # expecta matchers - # pod 'OCMock', '~> 2.2' # OCMock - # pod 'OCHamcrest', '~> 3.0' # hamcrest matchers - # pod 'OCMockito', '~> 1.0' # OCMock - # pod 'LRMocky', '~> 0.9' # LRMocky - end - ``` - -2. Run `pod update` or `pod install` in your project directory. - -### Carthage - -1. Add Specta to your project's `Cartfile.private` - - ``` - github "specta/specta" ~> 0.5 - ``` - -2. Run `carthage update` in your project directory -3. Drag the appropriate `Specta.framework` for your platform (located in Carthage/Build/) into your application’s Xcode project, and add it to your test target(s). -4. If you are building for iOS, a new `Run Script Phase` must be added to copy the framework. The instructions can be found on [Carthage's getting started instructions](https://github.com/carthage/carthage#getting-started) - -### SETTING UP MANUALLY - -1. Clone from Github. -2. Run `rake` in project root to build. -3. Add a "Cocoa/Cocoa Touch Unit Testing Bundle" target if you don't already have one. -4. Copy and add all header files in `Products` folder to the Test target in your Xcode project. -5. For **OS X projects**, copy and add `Specta.framework` in `Products/osx` folder to the test target in your Xcode project. - For **iOS projects**, copy and add `Specta.framework` in `Products/ios` folder to the test target in your Xcode project. - You can alternatively use `libSpecta.a`, if you prefer to add it as a static library for your project. (iOS 7 and below require this) -6. Add `-ObjC` and `-all_load` to the "Other Linker Flags" build setting for the test target in your Xcode project. -7. If you encounter linking issues with `_llvm_*` symbols, ensure your target's "Generate Test Coverage Files" and "Instrument Program Flow" build settings are set to `Yes`. + ## EXAMPLE @@ -156,12 +103,17 @@ SpecEnd * Do `#define SPT_CEDAR_SYNTAX` before importing Specta if you prefer to write `SPEC_BEGIN` and `SPEC_END` instead of `SpecBegin` and `SpecEnd`. * Prepend `f` to your `describe`, `context`, `example`, `it`, and `specify` to set focus on examples or groups. When specs are focused, all unfocused specs are skipped. * To use original XCTest reporter, set an environment variable named `SPECTA_REPORTER_CLASS` to `SPTXCTestReporter` in your test scheme. -* Set an environment variable `SPECTA_NO_SHUFFLE` with value `1` to disable test shuffling. +* Set an environment variable `SPECTA_SHUFFLE` with value `1` to enable test shuffling. * Set an environment variable `SPECTA_SEED` to specify the random seed for test shuffling. -Standard XCTest matchers such as `XCTAssertEqualObjects` and `XCTAssertNil` work, but you probably want to add a nicer matcher framework - [Expecta](http://github.com/specta/expecta/) to your setup. Or if you really prefer, [OCHamcrest](https://github.com/jonreid/OCHamcrest) works fine too. Also, add a mocking framework: [OCMock](http://ocmock.org/). +Standard XCTest matchers such as `XCTAssertEqualObjects` and `XCTAssertNil` work, but you probably want to add a nicer matcher framework - [Expecta](https://github.com/specta/expecta/) to your setup. Or if you really prefer, [OCHamcrest](https://github.com/hamcrest/OCHamcrest) works fine too. Also, add a mocking framework: [OCMock](http://ocmock.org/). + +## STATUS -## RUNNING TESTS IN COMMAND LINE +Specta is considered a done project, there are no plans for _active_ development on the project at the moment aside from ensuring future Xcode compatability. +Therefore it is a stable dependency, but will not be moving into the Swift world. If you are looking for that, we recommend you consider [Quick](https://github.com/quick/quick). + +## RUNNING SPECTA'S TESTS IN COMMAND LINE * Run `rake test` in the cloned folder. @@ -171,6 +123,57 @@ Standard XCTest matchers such as `XCTAssertEqualObjects` and `XCTAssertNil` work * Please prefix instance variable names with a single underscore (`_`). * Please prefix custom classes and functions defined in the global scope with `SPT`. +## Installation + +Use [CocoaPods](https://github.com/CocoaPods/CocoaPods), [Carthage](https://github.com/carthage/carthage) or [Set up manually](#setting-up-manually) + +### CocoaPods + +1. Add Specta to your project's `Podfile`: + +```ruby +target :MyApp do +# your app dependencies + + target :MyAppTests do + inherit! :search_paths + + pod 'Specta', '~> 1.0' + # pod 'Expecta', '~> 1.0' # expecta matchers + # pod 'OCMock', '~> 2.2' # OCMock + # pod 'OCHamcrest', '~> 3.0' # hamcrest matchers + # pod 'OCMockito', '~> 1.0' # OCMock + # pod 'LRMocky', '~> 0.9' # LRMocky + end +end +``` + +2. Run `pod install` in your project directory. + +### Carthage + +1. Add Specta to your project's `Cartfile.private` + + ``` + github "specta/specta" ~> 1.0 + ``` + +2. Run `carthage update` in your project directory +3. Drag the appropriate `Specta.framework` for your platform (located in Carthage/Build/) into your application’s Xcode project, and add it to your test target(s). +4. If you are building for iOS, a new `Run Script Phase` must be added to copy the framework. The instructions can be found on [Carthage's getting started instructions](https://github.com/carthage/carthage#getting-started) + +### SETTING UP MANUALLY + +1. Clone from Github. +2. Run `rake` in project root to build. +3. Add a "Cocoa/Cocoa Touch Unit Testing Bundle" target if you don't already have one. +4. Copy and add all header files in `Products` folder to the Test target in your Xcode project. +5. For **OS X projects**, copy and add `Specta.framework` in `Products/osx` folder to the test target in your Xcode project. + For **iOS projects**, copy and add `Specta.framework` in `Products/ios` folder to the test target in your Xcode project. + You can alternatively use `libSpecta.a`, if you prefer to add it as a static library for your project. (iOS 7 and below require this) +6. Add `-ObjC` and `-all_load` to the "Other Linker Flags" build setting for the test target in your Xcode project. +7. If you encounter linking issues with `_llvm_*` symbols, ensure your target's "Generate Test Coverage Files" and "Instrument Program Flow" build settings are set to `Yes`. + ## LICENSE -Copyright (c) 2012-2015 [Specta Team](https://github.com/specta?tab=members). This software is licensed under the [MIT License](http://github.com/specta/specta/raw/master/LICENSE). +Copyright (c) 2012-2016 [Specta Team](https://github.com/orgs/specta/people). This software is licensed under the [MIT License](http://github.com/specta/specta/raw/master/LICENSE). diff --git a/Example/Pods/Specta/Specta/Specta/SPTExampleGroup.h b/Example/Pods/Specta/Specta/Specta/SPTExampleGroup.h index f3d0060b5..dce3db62a 100644 --- a/Example/Pods/Specta/Specta/Specta/SPTExampleGroup.h +++ b/Example/Pods/Specta/Specta/Specta/SPTExampleGroup.h @@ -8,8 +8,8 @@ @interface SPTExampleGroup : NSObject @property (nonatomic, copy) NSString *name; -@property (nonatomic, strong) SPTExampleGroup *root; -@property (nonatomic, strong) SPTExampleGroup *parent; +@property (nonatomic, weak) SPTExampleGroup *root; +@property (nonatomic, weak) SPTExampleGroup *parent; @property (nonatomic, strong) NSMutableArray *children; @property (nonatomic, strong) NSMutableArray *beforeAllArray; @property (nonatomic, strong) NSMutableArray *afterAllArray; diff --git a/Example/Pods/Specta/Specta/Specta/SPTSpec.m b/Example/Pods/Specta/Specta/Specta/SPTSpec.m index 767178303..bda0d3f53 100644 --- a/Example/Pods/Specta/Specta/Specta/SPTSpec.m +++ b/Example/Pods/Specta/Specta/Specta/SPTSpec.m @@ -19,7 +19,7 @@ + (void)initialize { [spec spec]; } @catch (NSException *exception) { - fprintf(stderr, "%s: An exception has occured outside of tests, aborting.\n\n%s (%s) \n", [specName UTF8String], [[exception name] UTF8String], [[exception reason] UTF8String]); + fprintf(stderr, "%s: An exception has occurred outside of tests, aborting.\n\n%s (%s) \n", [specName UTF8String], [[exception name] UTF8String], [[exception reason] UTF8String]); if ([exception respondsToSelector:@selector(callStackSymbols)]) { NSArray *callStackSymbols = [exception callStackSymbols]; if (callStackSymbols) { @@ -33,6 +33,7 @@ + (void)initialize { [self spt_unsetCurrentTestSuite]; } [testSuite compile]; + [[self class] testInvocations]; [super initialize]; } @@ -144,6 +145,7 @@ - (void)spt_runExample:(SPTCompiledExample *)example { example.block(self); } else if (!example.pending) { self.spt_skipped = YES; + NSLog(@"Skipping '%@'", example.name); } [[[NSThread currentThread] threadDictionary] removeObjectForKey:spt_kCurrentSpecKey]; diff --git a/Example/Pods/Specta/Specta/Specta/SpectaDSL.h b/Example/Pods/Specta/Specta/Specta/SpectaDSL.h index 284d4f540..350586207 100644 --- a/Example/Pods/Specta/Specta/Specta/SpectaDSL.h +++ b/Example/Pods/Specta/Specta/Specta/SpectaDSL.h @@ -54,7 +54,7 @@ OBJC_EXTERN void waitUntil(void (^block)(DoneCallback done)); * * @param timeout timeout for this @c block only; does not affect the global * timeout, as @c setAsyncSpecTimeout() does. - * @param ^block runs test code + * @param block runs test code */ OBJC_EXTERN void waitUntilTimeout(NSTimeInterval timeout, void (^block)(DoneCallback done)); diff --git a/Example/Pods/Specta/Specta/Specta/XCTest+Private.h b/Example/Pods/Specta/Specta/Specta/XCTest+Private.h index 0b83aeb21..c88fcc9ff 100644 --- a/Example/Pods/Specta/Specta/Specta/XCTest+Private.h +++ b/Example/Pods/Specta/Specta/Specta/XCTest+Private.h @@ -17,11 +17,12 @@ @end -#endif - @protocol XCTestObservation @end + +#endif + @interface _XCTestDriverTestObserver : NSObject - (void)stopObserving; diff --git a/Example/Pods/Specta/Specta/Specta/XCTestCase+Specta.m b/Example/Pods/Specta/Specta/Specta/XCTestCase+Specta.m index 4c503eec1..ff801a13c 100644 --- a/Example/Pods/Specta/Specta/Specta/XCTestCase+Specta.m +++ b/Example/Pods/Specta/Specta/Specta/XCTestCase+Specta.m @@ -42,7 +42,10 @@ - (void)spt_dequeueFailures { [self spt_dequeueFailures]; }; - if ([NSThread isMainThread]) { + BOOL isMainThread = [NSThread isMainThread]; + BOOL isSpectaTest = [self isKindOfClass:[SPTSpec class]]; + + if (!isSpectaTest || isMainThread) { dequeueFailures(); } else { dispatch_sync(dispatch_get_main_queue(), dequeueFailures); diff --git a/Example/Pods/Target Support Files/DACircularProgress-iOS7.0/DACircularProgress-iOS7.0-dummy.m b/Example/Pods/Target Support Files/DACircularProgress-iOS7.0/DACircularProgress-iOS7.0-dummy.m new file mode 100644 index 000000000..e51425fc8 --- /dev/null +++ b/Example/Pods/Target Support Files/DACircularProgress-iOS7.0/DACircularProgress-iOS7.0-dummy.m @@ -0,0 +1,5 @@ +#import +@interface PodsDummy_DACircularProgress_iOS7_0 : NSObject +@end +@implementation PodsDummy_DACircularProgress_iOS7_0 +@end diff --git a/Example/Pods/Target Support Files/DACircularProgress/DACircularProgress-prefix.pch b/Example/Pods/Target Support Files/DACircularProgress-iOS7.0/DACircularProgress-iOS7.0-prefix.pch similarity index 100% rename from Example/Pods/Target Support Files/DACircularProgress/DACircularProgress-prefix.pch rename to Example/Pods/Target Support Files/DACircularProgress-iOS7.0/DACircularProgress-iOS7.0-prefix.pch diff --git a/Example/Pods/Target Support Files/DACircularProgress/DACircularProgress.xcconfig b/Example/Pods/Target Support Files/DACircularProgress-iOS7.0/DACircularProgress-iOS7.0.xcconfig similarity index 67% rename from Example/Pods/Target Support Files/DACircularProgress/DACircularProgress.xcconfig rename to Example/Pods/Target Support Files/DACircularProgress-iOS7.0/DACircularProgress-iOS7.0.xcconfig index fb750eded..1146a68f8 100644 --- a/Example/Pods/Target Support Files/DACircularProgress/DACircularProgress.xcconfig +++ b/Example/Pods/Target Support Files/DACircularProgress-iOS7.0/DACircularProgress-iOS7.0.xcconfig @@ -1,5 +1,9 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/DACircularProgress-iOS7.0 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/DACircularProgress" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" OTHER_LDFLAGS = -framework "QuartzCore" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Example/Pods/Target Support Files/DACircularProgress-iOS7.1/DACircularProgress-iOS7.1-dummy.m b/Example/Pods/Target Support Files/DACircularProgress-iOS7.1/DACircularProgress-iOS7.1-dummy.m new file mode 100644 index 000000000..c991151f9 --- /dev/null +++ b/Example/Pods/Target Support Files/DACircularProgress-iOS7.1/DACircularProgress-iOS7.1-dummy.m @@ -0,0 +1,5 @@ +#import +@interface PodsDummy_DACircularProgress_iOS7_1 : NSObject +@end +@implementation PodsDummy_DACircularProgress_iOS7_1 +@end diff --git a/Example/Pods/Target Support Files/MBProgressHUD/MBProgressHUD-prefix.pch b/Example/Pods/Target Support Files/DACircularProgress-iOS7.1/DACircularProgress-iOS7.1-prefix.pch similarity index 100% rename from Example/Pods/Target Support Files/MBProgressHUD/MBProgressHUD-prefix.pch rename to Example/Pods/Target Support Files/DACircularProgress-iOS7.1/DACircularProgress-iOS7.1-prefix.pch diff --git a/Example/Pods/Target Support Files/DACircularProgress-iOS7.1/DACircularProgress-iOS7.1.xcconfig b/Example/Pods/Target Support Files/DACircularProgress-iOS7.1/DACircularProgress-iOS7.1.xcconfig new file mode 100644 index 000000000..abc037e73 --- /dev/null +++ b/Example/Pods/Target Support Files/DACircularProgress-iOS7.1/DACircularProgress-iOS7.1.xcconfig @@ -0,0 +1,9 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/DACircularProgress-iOS7.1 +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 +HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/DACircularProgress" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" +OTHER_LDFLAGS = -framework "QuartzCore" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT} +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Example/Pods/Target Support Files/DACircularProgress/DACircularProgress-dummy.m b/Example/Pods/Target Support Files/DACircularProgress/DACircularProgress-dummy.m deleted file mode 100644 index 76cdc7668..000000000 --- a/Example/Pods/Target Support Files/DACircularProgress/DACircularProgress-dummy.m +++ /dev/null @@ -1,5 +0,0 @@ -#import -@interface PodsDummy_DACircularProgress : NSObject -@end -@implementation PodsDummy_DACircularProgress -@end diff --git a/Example/Pods/Target Support Files/Expecta+Snapshots/Expecta+Snapshots.xcconfig b/Example/Pods/Target Support Files/Expecta+Snapshots/Expecta+Snapshots.xcconfig index a9e7d9865..a831cbf0e 100644 --- a/Example/Pods/Target Support Files/Expecta+Snapshots/Expecta+Snapshots.xcconfig +++ b/Example/Pods/Target Support Files/Expecta+Snapshots/Expecta+Snapshots.xcconfig @@ -1,6 +1,11 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Expecta+Snapshots FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Expecta" "$PODS_CONFIGURATION_BUILD_DIR/FBSnapshotTestCase" OTHER_LDFLAGS = -framework "Foundation" -framework "XCTest" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Example/Pods/Target Support Files/Expecta/Expecta.xcconfig b/Example/Pods/Target Support Files/Expecta/Expecta.xcconfig index ad180d955..4fe1217f9 100644 --- a/Example/Pods/Target Support Files/Expecta/Expecta.xcconfig +++ b/Example/Pods/Target Support Files/Expecta/Expecta.xcconfig @@ -1,6 +1,10 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Expecta FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" $(inherited) $(DEVELOPER_FRAMEWORKS_DIR) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/Expecta" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" OTHER_LDFLAGS = -framework "Foundation" -framework "XCTest" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Example/Pods/Target Support Files/FBSnapshotTestCase/FBSnapshotTestCase.xcconfig b/Example/Pods/Target Support Files/FBSnapshotTestCase/FBSnapshotTestCase.xcconfig index cabe1b74a..c7eba9d54 100644 --- a/Example/Pods/Target Support Files/FBSnapshotTestCase/FBSnapshotTestCase.xcconfig +++ b/Example/Pods/Target Support Files/FBSnapshotTestCase/FBSnapshotTestCase.xcconfig @@ -1,6 +1,10 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/FBSnapshotTestCase FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" OTHER_LDFLAGS = -framework "XCTest" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Example/Pods/Target Support Files/MBProgressHUD-iOS7.0/MBProgressHUD-iOS7.0-dummy.m b/Example/Pods/Target Support Files/MBProgressHUD-iOS7.0/MBProgressHUD-iOS7.0-dummy.m new file mode 100644 index 000000000..af46de3bd --- /dev/null +++ b/Example/Pods/Target Support Files/MBProgressHUD-iOS7.0/MBProgressHUD-iOS7.0-dummy.m @@ -0,0 +1,5 @@ +#import +@interface PodsDummy_MBProgressHUD_iOS7_0 : NSObject +@end +@implementation PodsDummy_MBProgressHUD_iOS7_0 +@end diff --git a/Example/Pods/Target Support Files/MWPhotoBrowser/MWPhotoBrowser-prefix.pch b/Example/Pods/Target Support Files/MBProgressHUD-iOS7.0/MBProgressHUD-iOS7.0-prefix.pch similarity index 100% rename from Example/Pods/Target Support Files/MWPhotoBrowser/MWPhotoBrowser-prefix.pch rename to Example/Pods/Target Support Files/MBProgressHUD-iOS7.0/MBProgressHUD-iOS7.0-prefix.pch diff --git a/Example/Pods/Target Support Files/MBProgressHUD/MBProgressHUD.xcconfig b/Example/Pods/Target Support Files/MBProgressHUD-iOS7.0/MBProgressHUD-iOS7.0.xcconfig similarity index 61% rename from Example/Pods/Target Support Files/MBProgressHUD/MBProgressHUD.xcconfig rename to Example/Pods/Target Support Files/MBProgressHUD-iOS7.0/MBProgressHUD-iOS7.0.xcconfig index a8e4ea6b6..d1224c4d8 100644 --- a/Example/Pods/Target Support Files/MBProgressHUD/MBProgressHUD.xcconfig +++ b/Example/Pods/Target Support Files/MBProgressHUD-iOS7.0/MBProgressHUD-iOS7.0.xcconfig @@ -1,5 +1,9 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/MBProgressHUD-iOS7.0 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/MBProgressHUD" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" -OTHER_LDFLAGS = -framework "CoreGraphics" +OTHER_LDFLAGS = -framework "CoreGraphics" -framework "QuartzCore" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Example/Pods/Target Support Files/MBProgressHUD-iOS7.1/MBProgressHUD-iOS7.1-dummy.m b/Example/Pods/Target Support Files/MBProgressHUD-iOS7.1/MBProgressHUD-iOS7.1-dummy.m new file mode 100644 index 000000000..4814abd74 --- /dev/null +++ b/Example/Pods/Target Support Files/MBProgressHUD-iOS7.1/MBProgressHUD-iOS7.1-dummy.m @@ -0,0 +1,5 @@ +#import +@interface PodsDummy_MBProgressHUD_iOS7_1 : NSObject +@end +@implementation PodsDummy_MBProgressHUD_iOS7_1 +@end diff --git a/Example/Pods/Target Support Files/SDWebImage/SDWebImage-prefix.pch b/Example/Pods/Target Support Files/MBProgressHUD-iOS7.1/MBProgressHUD-iOS7.1-prefix.pch similarity index 100% rename from Example/Pods/Target Support Files/SDWebImage/SDWebImage-prefix.pch rename to Example/Pods/Target Support Files/MBProgressHUD-iOS7.1/MBProgressHUD-iOS7.1-prefix.pch diff --git a/Example/Pods/Target Support Files/MBProgressHUD-iOS7.1/MBProgressHUD-iOS7.1.xcconfig b/Example/Pods/Target Support Files/MBProgressHUD-iOS7.1/MBProgressHUD-iOS7.1.xcconfig new file mode 100644 index 000000000..6d60e5f72 --- /dev/null +++ b/Example/Pods/Target Support Files/MBProgressHUD-iOS7.1/MBProgressHUD-iOS7.1.xcconfig @@ -0,0 +1,9 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/MBProgressHUD-iOS7.1 +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 +HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/MBProgressHUD" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" +OTHER_LDFLAGS = -framework "CoreGraphics" -framework "QuartzCore" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT} +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Example/Pods/Target Support Files/MBProgressHUD/MBProgressHUD-dummy.m b/Example/Pods/Target Support Files/MBProgressHUD/MBProgressHUD-dummy.m deleted file mode 100644 index 67a74df2a..000000000 --- a/Example/Pods/Target Support Files/MBProgressHUD/MBProgressHUD-dummy.m +++ /dev/null @@ -1,5 +0,0 @@ -#import -@interface PodsDummy_MBProgressHUD : NSObject -@end -@implementation PodsDummy_MBProgressHUD -@end diff --git a/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.0/MWPhotoBrowser-iOS7.0-dummy.m b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.0/MWPhotoBrowser-iOS7.0-dummy.m new file mode 100644 index 000000000..ad8bd677b --- /dev/null +++ b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.0/MWPhotoBrowser-iOS7.0-dummy.m @@ -0,0 +1,5 @@ +#import +@interface PodsDummy_MWPhotoBrowser_iOS7_0 : NSObject +@end +@implementation PodsDummy_MWPhotoBrowser_iOS7_0 +@end diff --git a/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.0/MWPhotoBrowser-iOS7.0-prefix.pch b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.0/MWPhotoBrowser-iOS7.0-prefix.pch new file mode 100644 index 000000000..aa992a4ad --- /dev/null +++ b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.0/MWPhotoBrowser-iOS7.0-prefix.pch @@ -0,0 +1,4 @@ +#ifdef __OBJC__ +#import +#endif + diff --git a/Example/Pods/Target Support Files/MWPhotoBrowser/MWPhotoBrowser.xcconfig b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.0/MWPhotoBrowser-iOS7.0.xcconfig similarity index 58% rename from Example/Pods/Target Support Files/MWPhotoBrowser/MWPhotoBrowser.xcconfig rename to Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.0/MWPhotoBrowser-iOS7.0.xcconfig index dcaea7206..76a2ae6f7 100644 --- a/Example/Pods/Target Support Files/MWPhotoBrowser/MWPhotoBrowser.xcconfig +++ b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.0/MWPhotoBrowser-iOS7.0.xcconfig @@ -1,5 +1,10 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser-iOS7.0 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/DACircularProgress-iOS7.0" "$PODS_CONFIGURATION_BUILD_DIR/MBProgressHUD-iOS7.0" "$PODS_CONFIGURATION_BUILD_DIR/SDWebImage-iOS7.0" OTHER_LDFLAGS = -framework "AssetsLibrary" -framework "ImageIO" -framework "MediaPlayer" -framework "QuartzCore" -weak_framework "Photos" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.0/ResourceBundle-MWPhotoBrowser-Info.plist b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.0/ResourceBundle-MWPhotoBrowser-Info.plist new file mode 100644 index 000000000..456eea975 --- /dev/null +++ b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.0/ResourceBundle-MWPhotoBrowser-Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + BNDL + CFBundleShortVersionString + 2.1.2 + CFBundleSignature + ???? + CFBundleVersion + 1 + NSPrincipalClass + + + diff --git a/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1-dummy.m b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1-dummy.m new file mode 100644 index 000000000..bc91bf591 --- /dev/null +++ b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1-dummy.m @@ -0,0 +1,5 @@ +#import +@interface PodsDummy_MWPhotoBrowser_iOS7_1 : NSObject +@end +@implementation PodsDummy_MWPhotoBrowser_iOS7_1 +@end diff --git a/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1-prefix.pch b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1-prefix.pch new file mode 100644 index 000000000..aa992a4ad --- /dev/null +++ b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1-prefix.pch @@ -0,0 +1,4 @@ +#ifdef __OBJC__ +#import +#endif + diff --git a/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1.xcconfig b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1.xcconfig new file mode 100644 index 000000000..0f6a6002f --- /dev/null +++ b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.1/MWPhotoBrowser-iOS7.1.xcconfig @@ -0,0 +1,10 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser-iOS7.1 +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 +HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/DACircularProgress-iOS7.0" "$PODS_CONFIGURATION_BUILD_DIR/MBProgressHUD-iOS7.0" "$PODS_CONFIGURATION_BUILD_DIR/SDWebImage-iOS7.0" +OTHER_LDFLAGS = -framework "AssetsLibrary" -framework "ImageIO" -framework "MediaPlayer" -framework "QuartzCore" -weak_framework "Photos" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT} +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.1/ResourceBundle-MWPhotoBrowser-Info.plist b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.1/ResourceBundle-MWPhotoBrowser-Info.plist new file mode 100644 index 000000000..456eea975 --- /dev/null +++ b/Example/Pods/Target Support Files/MWPhotoBrowser-iOS7.1/ResourceBundle-MWPhotoBrowser-Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + BNDL + CFBundleShortVersionString + 2.1.2 + CFBundleSignature + ???? + CFBundleVersion + 1 + NSPrincipalClass + + + diff --git a/Example/Pods/Target Support Files/MWPhotoBrowser/MWPhotoBrowser-dummy.m b/Example/Pods/Target Support Files/MWPhotoBrowser/MWPhotoBrowser-dummy.m deleted file mode 100644 index 2ce964380..000000000 --- a/Example/Pods/Target Support Files/MWPhotoBrowser/MWPhotoBrowser-dummy.m +++ /dev/null @@ -1,5 +0,0 @@ -#import -@interface PodsDummy_MWPhotoBrowser : NSObject -@end -@implementation PodsDummy_MWPhotoBrowser -@end diff --git a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-acknowledgements.markdown b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-acknowledgements.markdown index 0091f313d..d46457465 100644 --- a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-acknowledgements.markdown +++ b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-acknowledgements.markdown @@ -29,7 +29,7 @@ THE SOFTWARE. ## MBProgressHUD -Copyright (c) 2009-2015 Matej Bukovinski +Copyright © 2009-2016 Matej Bukovinski Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -74,7 +74,7 @@ THE SOFTWARE. ## SDWebImage -Copyright (c) 2009 Olivier Poitrey +Copyright (c) 2016 Olivier Poitrey rs@dailymotion.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -95,4 +95,4 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Generated by CocoaPods - http://cocoapods.org +Generated by CocoaPods - https://cocoapods.org diff --git a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-acknowledgements.plist b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-acknowledgements.plist index a3df3a933..de7cf0dfe 100644 --- a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-acknowledgements.plist +++ b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-acknowledgements.plist @@ -44,7 +44,7 @@ THE SOFTWARE. FooterText - Copyright (c) 2009-2015 Matej Bukovinski + Copyright © 2009-2016 Matej Bukovinski Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -97,7 +97,7 @@ THE SOFTWARE. FooterText - Copyright (c) 2009 Olivier Poitrey <rs@dailymotion.com> + Copyright (c) 2016 Olivier Poitrey rs@dailymotion.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -125,7 +125,7 @@ THE SOFTWARE. FooterText - Generated by CocoaPods - http://cocoapods.org + Generated by CocoaPods - https://cocoapods.org Title Type diff --git a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-frameworks.sh b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-frameworks.sh index 6f7634435..893c16a63 100755 --- a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-frameworks.sh +++ b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-frameworks.sh @@ -16,7 +16,7 @@ install_framework() local source="$1" fi - local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" if [ -L "${source}" ]; then echo "Symlinked..." @@ -59,8 +59,8 @@ code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1" + echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" + /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" fi } diff --git a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-resources.sh b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-resources.sh index 15c9b3eb0..5bda3d26f 100755 --- a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-resources.sh +++ b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example-resources.sh @@ -1,13 +1,28 @@ #!/bin/sh set -e -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt > "$RESOURCES_TO_COPY" XCASSET_FILES=() +case "${TARGETED_DEVICE_FAMILY}" in + 1,2) + TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" + ;; + 1) + TARGET_DEVICE_ARGS="--target-device iphone" + ;; + 2) + TARGET_DEVICE_ARGS="--target-device ipad" + ;; + *) + TARGET_DEVICE_ARGS="--target-device mac" + ;; +esac + realpath() { DIRECTORY="$(cd "${1%/*}" && pwd)" FILENAME="${1##*/}" @@ -16,56 +31,63 @@ realpath() { install_resource() { - case $1 in + if [[ "$1" = /* ]] ; then + RESOURCE_PATH="$1" + else + RESOURCE_PATH="${PODS_ROOT}/$1" + fi + if [[ ! -e "$RESOURCE_PATH" ]] ; then + cat << EOM +error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script. +EOM + exit 1 + fi + case $RESOURCE_PATH in *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" - xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" + xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) - ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1") + ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH") XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; - /*) - echo "$1" - echo "$1" >> "$RESOURCES_TO_COPY" - ;; *) - echo "${PODS_ROOT}/$1" - echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY" + echo "$RESOURCE_PATH" + echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac } if [[ "$CONFIGURATION" == "Debug" ]]; then - install_resource "${BUILT_PRODUCTS_DIR}/MWPhotoBrowser.bundle" + install_resource "$PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser-iOS7.0/MWPhotoBrowser.bundle" fi if [[ "$CONFIGURATION" == "Release" ]]; then - install_resource "${BUILT_PRODUCTS_DIR}/MWPhotoBrowser.bundle" + install_resource "$PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser-iOS7.0/MWPhotoBrowser.bundle" fi -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" @@ -74,21 +96,6 @@ rm -f "$RESOURCES_TO_COPY" if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] then - case "${TARGETED_DEVICE_FAMILY}" in - 1,2) - TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" - ;; - 1) - TARGET_DEVICE_ARGS="--target-device iphone" - ;; - 2) - TARGET_DEVICE_ARGS="--target-device ipad" - ;; - *) - TARGET_DEVICE_ARGS="--target-device mac" - ;; - esac - # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) while read line; do @@ -97,5 +104,5 @@ then fi done <<<"$OTHER_XCASSETS" - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" fi diff --git a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example.debug.xcconfig b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example.debug.xcconfig index 6472a0b4b..e286e2127 100644 --- a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example.debug.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example.debug.xcconfig @@ -1,5 +1,8 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/DACircularProgress-iOS7.0" "$PODS_CONFIGURATION_BUILD_DIR/MBProgressHUD-iOS7.0" "$PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser-iOS7.0" "$PODS_CONFIGURATION_BUILD_DIR/SDWebImage-iOS7.0" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/DACircularProgress" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" -isystem "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/Specta" -OTHER_LDFLAGS = $(inherited) -ObjC -l"DACircularProgress" -l"MBProgressHUD" -l"MWPhotoBrowser" -l"SDWebImage" -framework "AssetsLibrary" -framework "CoreGraphics" -framework "ImageIO" -framework "MediaPlayer" -framework "QuartzCore" -weak_framework "Photos" -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file +OTHER_LDFLAGS = $(inherited) -ObjC -l"DACircularProgress-iOS7.0" -l"MBProgressHUD-iOS7.0" -l"MWPhotoBrowser-iOS7.0" -l"SDWebImage-iOS7.0" -framework "AssetsLibrary" -framework "CoreGraphics" -framework "ImageIO" -framework "MediaPlayer" -framework "QuartzCore" -weak_framework "Photos" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT}/Pods diff --git a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example.release.xcconfig b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example.release.xcconfig index 6472a0b4b..e286e2127 100644 --- a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example.release.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Example/Pods-MWPhotoBrowser_Example.release.xcconfig @@ -1,5 +1,8 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/DACircularProgress-iOS7.0" "$PODS_CONFIGURATION_BUILD_DIR/MBProgressHUD-iOS7.0" "$PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser-iOS7.0" "$PODS_CONFIGURATION_BUILD_DIR/SDWebImage-iOS7.0" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/DACircularProgress" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" -isystem "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/Specta" -OTHER_LDFLAGS = $(inherited) -ObjC -l"DACircularProgress" -l"MBProgressHUD" -l"MWPhotoBrowser" -l"SDWebImage" -framework "AssetsLibrary" -framework "CoreGraphics" -framework "ImageIO" -framework "MediaPlayer" -framework "QuartzCore" -weak_framework "Photos" -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file +OTHER_LDFLAGS = $(inherited) -ObjC -l"DACircularProgress-iOS7.0" -l"MBProgressHUD-iOS7.0" -l"MWPhotoBrowser-iOS7.0" -l"SDWebImage-iOS7.0" -framework "AssetsLibrary" -framework "CoreGraphics" -framework "ImageIO" -framework "MediaPlayer" -framework "QuartzCore" -weak_framework "Photos" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT}/Pods diff --git a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-acknowledgements.markdown b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-acknowledgements.markdown index 722cd587a..0648f9639 100644 --- a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-acknowledgements.markdown +++ b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-acknowledgements.markdown @@ -29,7 +29,7 @@ THE SOFTWARE. ## MBProgressHUD -Copyright (c) 2009-2015 Matej Bukovinski +Copyright © 2009-2016 Matej Bukovinski Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -74,7 +74,7 @@ THE SOFTWARE. ## SDWebImage -Copyright (c) 2009 Olivier Poitrey +Copyright (c) 2016 Olivier Poitrey rs@dailymotion.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -201,4 +201,4 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Generated by CocoaPods - http://cocoapods.org +Generated by CocoaPods - https://cocoapods.org diff --git a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-acknowledgements.plist b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-acknowledgements.plist index 4063b607d..60c5fb8ea 100644 --- a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-acknowledgements.plist +++ b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-acknowledgements.plist @@ -44,7 +44,7 @@ THE SOFTWARE. FooterText - Copyright (c) 2009-2015 Matej Bukovinski + Copyright © 2009-2016 Matej Bukovinski Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -97,7 +97,7 @@ THE SOFTWARE. FooterText - Copyright (c) 2009 Olivier Poitrey <rs@dailymotion.com> + Copyright (c) 2016 Olivier Poitrey rs@dailymotion.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -247,7 +247,7 @@ THE SOFTWARE. FooterText - Generated by CocoaPods - http://cocoapods.org + Generated by CocoaPods - https://cocoapods.org Title Type diff --git a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-frameworks.sh b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-frameworks.sh index 6f7634435..893c16a63 100755 --- a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-frameworks.sh +++ b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-frameworks.sh @@ -16,7 +16,7 @@ install_framework() local source="$1" fi - local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" if [ -L "${source}" ]; then echo "Symlinked..." @@ -59,8 +59,8 @@ code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1" + echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" + /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" fi } diff --git a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-resources.sh b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-resources.sh index 15c9b3eb0..ce557d1fc 100755 --- a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-resources.sh +++ b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests-resources.sh @@ -1,13 +1,28 @@ #!/bin/sh set -e -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt > "$RESOURCES_TO_COPY" XCASSET_FILES=() +case "${TARGETED_DEVICE_FAMILY}" in + 1,2) + TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" + ;; + 1) + TARGET_DEVICE_ARGS="--target-device iphone" + ;; + 2) + TARGET_DEVICE_ARGS="--target-device ipad" + ;; + *) + TARGET_DEVICE_ARGS="--target-device mac" + ;; +esac + realpath() { DIRECTORY="$(cd "${1%/*}" && pwd)" FILENAME="${1##*/}" @@ -16,56 +31,63 @@ realpath() { install_resource() { - case $1 in + if [[ "$1" = /* ]] ; then + RESOURCE_PATH="$1" + else + RESOURCE_PATH="${PODS_ROOT}/$1" + fi + if [[ ! -e "$RESOURCE_PATH" ]] ; then + cat << EOM +error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script. +EOM + exit 1 + fi + case $RESOURCE_PATH in *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" - xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" + xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) - ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1") + ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH") XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; - /*) - echo "$1" - echo "$1" >> "$RESOURCES_TO_COPY" - ;; *) - echo "${PODS_ROOT}/$1" - echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY" + echo "$RESOURCE_PATH" + echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac } if [[ "$CONFIGURATION" == "Debug" ]]; then - install_resource "${BUILT_PRODUCTS_DIR}/MWPhotoBrowser.bundle" + install_resource "$PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser-iOS7.1/MWPhotoBrowser.bundle" fi if [[ "$CONFIGURATION" == "Release" ]]; then - install_resource "${BUILT_PRODUCTS_DIR}/MWPhotoBrowser.bundle" + install_resource "$PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser-iOS7.1/MWPhotoBrowser.bundle" fi -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" @@ -74,21 +96,6 @@ rm -f "$RESOURCES_TO_COPY" if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] then - case "${TARGETED_DEVICE_FAMILY}" in - 1,2) - TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" - ;; - 1) - TARGET_DEVICE_ARGS="--target-device iphone" - ;; - 2) - TARGET_DEVICE_ARGS="--target-device ipad" - ;; - *) - TARGET_DEVICE_ARGS="--target-device mac" - ;; - esac - # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) while read line; do @@ -97,5 +104,5 @@ then fi done <<<"$OTHER_XCASSETS" - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" fi diff --git a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests.debug.xcconfig b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests.debug.xcconfig index 61cb570bf..0ebf3b00c 100644 --- a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests.debug.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests.debug.xcconfig @@ -1,6 +1,9 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) $(inherited) $(DEVELOPER_FRAMEWORKS_DIR) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks" +FRAMEWORK_SEARCH_PATHS = $(inherited) $(DEVELOPER_FRAMEWORKS_DIR) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/DACircularProgress-iOS7.1" "$PODS_CONFIGURATION_BUILD_DIR/Expecta" "$PODS_CONFIGURATION_BUILD_DIR/Expecta+Snapshots" "$PODS_CONFIGURATION_BUILD_DIR/FBSnapshotTestCase" "$PODS_CONFIGURATION_BUILD_DIR/MBProgressHUD-iOS7.1" "$PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser-iOS7.1" "$PODS_CONFIGURATION_BUILD_DIR/SDWebImage-iOS7.1" "$PODS_CONFIGURATION_BUILD_DIR/Specta" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/DACircularProgress" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" -isystem "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/Specta" -OTHER_LDFLAGS = $(inherited) -ObjC -l"DACircularProgress" -l"Expecta" -l"Expecta+Snapshots" -l"FBSnapshotTestCase" -l"MBProgressHUD" -l"MWPhotoBrowser" -l"SDWebImage" -l"Specta" -framework "AssetsLibrary" -framework "CoreGraphics" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "QuartzCore" -framework "XCTest" -weak_framework "Photos" -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file +OTHER_LDFLAGS = $(inherited) -ObjC -l"DACircularProgress-iOS7.1" -l"Expecta" -l"Expecta+Snapshots" -l"FBSnapshotTestCase" -l"MBProgressHUD-iOS7.1" -l"MWPhotoBrowser-iOS7.1" -l"SDWebImage-iOS7.1" -l"Specta" -framework "AssetsLibrary" -framework "CoreGraphics" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "QuartzCore" -framework "XCTest" -weak_framework "Photos" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT}/Pods diff --git a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests.release.xcconfig b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests.release.xcconfig index 61cb570bf..0ebf3b00c 100644 --- a/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests.release.xcconfig +++ b/Example/Pods/Target Support Files/Pods-MWPhotoBrowser_Tests/Pods-MWPhotoBrowser_Tests.release.xcconfig @@ -1,6 +1,9 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) $(inherited) $(DEVELOPER_FRAMEWORKS_DIR) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks" +FRAMEWORK_SEARCH_PATHS = $(inherited) $(DEVELOPER_FRAMEWORKS_DIR) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/DACircularProgress-iOS7.1" "$PODS_CONFIGURATION_BUILD_DIR/Expecta" "$PODS_CONFIGURATION_BUILD_DIR/Expecta+Snapshots" "$PODS_CONFIGURATION_BUILD_DIR/FBSnapshotTestCase" "$PODS_CONFIGURATION_BUILD_DIR/MBProgressHUD-iOS7.1" "$PODS_CONFIGURATION_BUILD_DIR/MWPhotoBrowser-iOS7.1" "$PODS_CONFIGURATION_BUILD_DIR/SDWebImage-iOS7.1" "$PODS_CONFIGURATION_BUILD_DIR/Specta" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/DACircularProgress" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" -isystem "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/Specta" -OTHER_LDFLAGS = $(inherited) -ObjC -l"DACircularProgress" -l"Expecta" -l"Expecta+Snapshots" -l"FBSnapshotTestCase" -l"MBProgressHUD" -l"MWPhotoBrowser" -l"SDWebImage" -l"Specta" -framework "AssetsLibrary" -framework "CoreGraphics" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "QuartzCore" -framework "XCTest" -weak_framework "Photos" -PODS_ROOT = ${SRCROOT}/Pods \ No newline at end of file +OTHER_LDFLAGS = $(inherited) -ObjC -l"DACircularProgress-iOS7.1" -l"Expecta" -l"Expecta+Snapshots" -l"FBSnapshotTestCase" -l"MBProgressHUD-iOS7.1" -l"MWPhotoBrowser-iOS7.1" -l"SDWebImage-iOS7.1" -l"Specta" -framework "AssetsLibrary" -framework "CoreGraphics" -framework "Foundation" -framework "ImageIO" -framework "MediaPlayer" -framework "QuartzCore" -framework "XCTest" -weak_framework "Photos" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT}/Pods diff --git a/Example/Pods/Target Support Files/SDWebImage-iOS7.0/SDWebImage-iOS7.0-dummy.m b/Example/Pods/Target Support Files/SDWebImage-iOS7.0/SDWebImage-iOS7.0-dummy.m new file mode 100644 index 000000000..4e5d3a0f0 --- /dev/null +++ b/Example/Pods/Target Support Files/SDWebImage-iOS7.0/SDWebImage-iOS7.0-dummy.m @@ -0,0 +1,5 @@ +#import +@interface PodsDummy_SDWebImage_iOS7_0 : NSObject +@end +@implementation PodsDummy_SDWebImage_iOS7_0 +@end diff --git a/Example/Pods/Target Support Files/SDWebImage-iOS7.0/SDWebImage-iOS7.0-prefix.pch b/Example/Pods/Target Support Files/SDWebImage-iOS7.0/SDWebImage-iOS7.0-prefix.pch new file mode 100644 index 000000000..aa992a4ad --- /dev/null +++ b/Example/Pods/Target Support Files/SDWebImage-iOS7.0/SDWebImage-iOS7.0-prefix.pch @@ -0,0 +1,4 @@ +#ifdef __OBJC__ +#import +#endif + diff --git a/Example/Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig b/Example/Pods/Target Support Files/SDWebImage-iOS7.0/SDWebImage-iOS7.0.xcconfig similarity index 67% rename from Example/Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig rename to Example/Pods/Target Support Files/SDWebImage-iOS7.0/SDWebImage-iOS7.0.xcconfig index 99c5f03e0..9dadea1e3 100644 --- a/Example/Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig +++ b/Example/Pods/Target Support Files/SDWebImage-iOS7.0/SDWebImage-iOS7.0.xcconfig @@ -1,5 +1,9 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/SDWebImage-iOS7.0 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/SDWebImage" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" OTHER_LDFLAGS = -framework "ImageIO" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Example/Pods/Target Support Files/SDWebImage-iOS7.1/SDWebImage-iOS7.1-dummy.m b/Example/Pods/Target Support Files/SDWebImage-iOS7.1/SDWebImage-iOS7.1-dummy.m new file mode 100644 index 000000000..e352a298d --- /dev/null +++ b/Example/Pods/Target Support Files/SDWebImage-iOS7.1/SDWebImage-iOS7.1-dummy.m @@ -0,0 +1,5 @@ +#import +@interface PodsDummy_SDWebImage_iOS7_1 : NSObject +@end +@implementation PodsDummy_SDWebImage_iOS7_1 +@end diff --git a/Example/Pods/Target Support Files/SDWebImage-iOS7.1/SDWebImage-iOS7.1-prefix.pch b/Example/Pods/Target Support Files/SDWebImage-iOS7.1/SDWebImage-iOS7.1-prefix.pch new file mode 100644 index 000000000..aa992a4ad --- /dev/null +++ b/Example/Pods/Target Support Files/SDWebImage-iOS7.1/SDWebImage-iOS7.1-prefix.pch @@ -0,0 +1,4 @@ +#ifdef __OBJC__ +#import +#endif + diff --git a/Example/Pods/Target Support Files/SDWebImage-iOS7.1/SDWebImage-iOS7.1.xcconfig b/Example/Pods/Target Support Files/SDWebImage-iOS7.1/SDWebImage-iOS7.1.xcconfig new file mode 100644 index 000000000..640e8db17 --- /dev/null +++ b/Example/Pods/Target Support Files/SDWebImage-iOS7.1/SDWebImage-iOS7.1.xcconfig @@ -0,0 +1,9 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/SDWebImage-iOS7.1 +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 +HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/SDWebImage" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" +OTHER_LDFLAGS = -framework "ImageIO" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT} +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Example/Pods/Target Support Files/SDWebImage/SDWebImage-dummy.m b/Example/Pods/Target Support Files/SDWebImage/SDWebImage-dummy.m deleted file mode 100644 index 86d2b5f68..000000000 --- a/Example/Pods/Target Support Files/SDWebImage/SDWebImage-dummy.m +++ /dev/null @@ -1,5 +0,0 @@ -#import -@interface PodsDummy_SDWebImage : NSObject -@end -@implementation PodsDummy_SDWebImage -@end diff --git a/Example/Pods/Target Support Files/Specta/Specta.xcconfig b/Example/Pods/Target Support Files/Specta/Specta.xcconfig index 9293e9c92..3001d3c8c 100644 --- a/Example/Pods/Target Support Files/Specta/Specta.xcconfig +++ b/Example/Pods/Target Support Files/Specta/Specta.xcconfig @@ -1,6 +1,10 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Specta FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" $(inherited) $(DEVELOPER_FRAMEWORKS_DIR) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/Specta" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/DACircularProgress" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Expecta+Snapshots" "${PODS_ROOT}/Headers/Public/FBSnapshotTestCase" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MWPhotoBrowser" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/Specta" OTHER_LDFLAGS = -framework "Foundation" -framework "XCTest" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/MWPhotoBrowser.podspec b/MWPhotoBrowser.podspec index 2b8d0e563..977a2723c 100644 --- a/MWPhotoBrowser.podspec +++ b/MWPhotoBrowser.podspec @@ -37,12 +37,12 @@ Pod::Spec.new do |s| s.frameworks = 'ImageIO', 'QuartzCore', 'AssetsLibrary', 'MediaPlayer' s.weak_frameworks = 'Photos' - s.dependency 'MBProgressHUD', '~> 0.9' - s.dependency 'DACircularProgress', '~> 2.3' + s.dependency 'MBProgressHUD', '~> 1.0.0' + s.dependency 'DACircularProgress', '~> 2.3.1' # SDWebImage # 3.7.2 contains bugs downloading local files # https://github.com/rs/SDWebImage/issues/1109 - s.dependency 'SDWebImage', '~> 3.7', '!= 3.7.2' + s.dependency 'SDWebImage', '~> 4.0.0' end diff --git a/Pod/Classes/MWPhoto.m b/Pod/Classes/MWPhoto.m index 6b1f697cc..3d4ca174c 100644 --- a/Pod/Classes/MWPhoto.m +++ b/Pod/Classes/MWPhoto.m @@ -212,27 +212,24 @@ - (void)performLoadUnderlyingImageAndNotify { - (void)_performLoadUnderlyingImageAndNotifyWithWebURL:(NSURL *)url { @try { SDWebImageManager *manager = [SDWebImageManager sharedManager]; - _webImageOperation = [manager downloadImageWithURL:url - options:0 - progress:^(NSInteger receivedSize, NSInteger expectedSize) { - if (expectedSize > 0) { - float progress = receivedSize / (float)expectedSize; - NSDictionary* dict = [NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithFloat:progress], @"progress", - self, @"photo", nil]; - [[NSNotificationCenter defaultCenter] postNotificationName:MWPHOTO_PROGRESS_NOTIFICATION object:dict]; - } - } - completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) { - if (error) { - MWLog(@"SDWebImage failed to download image: %@", error); - } - _webImageOperation = nil; - self.underlyingImage = image; - dispatch_async(dispatch_get_main_queue(), ^{ - [self imageLoadingComplete]; - }); - }]; + _webImageOperation = [manager loadImageWithURL:url options:0 progress:^(NSInteger receivedSize, NSInteger expectedSize, NSURL * _Nullable targetURL) { + if (expectedSize > 0) { + float progress = receivedSize / (float)expectedSize; + NSDictionary* dict = [NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithFloat:progress], @"progress", + self, @"photo", nil]; + [[NSNotificationCenter defaultCenter] postNotificationName:MWPHOTO_PROGRESS_NOTIFICATION object:dict]; + } + } completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL) { + if (error) { + MWLog(@"SDWebImage failed to download image: %@", error); + } + _webImageOperation = nil; + self.underlyingImage = image; + dispatch_async(dispatch_get_main_queue(), ^{ + [self imageLoadingComplete]; + }); + }]; } @catch (NSException *e) { MWLog(@"Photo from web: %@", e); _webImageOperation = nil;