- Fix present picker controller

2019-03-10 16:29:02 +01:00
1 parent 2aa49f6ad1
commit 5974642e25
@@ -21,9 +21,9 @@
 		6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
 		6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; };
 		681785911C69DCB50032DAAC /* PNImagePickerViewController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 681785901C69DCB50032DAAC /* PNImagePickerViewController.framework */; };
 		7D97D76088572AF45812187E /* Pods_PNImagePickerViewController_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4328521B225C017B57B0EA26 /* Pods_PNImagePickerViewController_Tests.framework */; };
 		873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
-		D6C71C75B8F5800EC9990F14 /* Pods_PNImagePickerViewController_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 685260EDF68D7C851442C12E /* Pods_PNImagePickerViewController_Example.framework */; };
+		AE78532B104C86CFD7E59E56 /* libPods-PNImagePickerViewController_Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C6AEC746978DFB326EAAA7FF /* libPods-PNImagePickerViewController_Tests.a */; };
 		DC5F4864BF4E2B1C54F620F6 /* libPods-PNImagePickerViewController_Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C80B5FA595CB4977C47CBE3 /* libPods-PNImagePickerViewController_Example.a */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -37,9 +37,9 @@
 /* End PBXContainerItemProxy section */
 /* Begin PBXFileReference section */
 		12535CEF396FF4D6369EA5C0 /* Pods-PNImagePickerViewController_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PNImagePickerViewController_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-PNImagePickerViewController_Tests/Pods-PNImagePickerViewController_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		2A510C8BD6FA22FF4BF841CC /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
-		4328521B225C017B57B0EA26 /* Pods_PNImagePickerViewController_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PNImagePickerViewController_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		43986E6CA155C636B098FB5C /* Pods-PNImagePickerViewController_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PNImagePickerViewController_Tests.debug.xcconfig"; path = "Target Support Files/Pods-PNImagePickerViewController_Tests/Pods-PNImagePickerViewController_Tests.debug.xcconfig"; sourceTree = "<group>"; };
 		5C80B5FA595CB4977C47CBE3 /* libPods-PNImagePickerViewController_Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PNImagePickerViewController_Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6003F58A195388D20070C39A /* PNImagePickerViewController_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PNImagePickerViewController_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; };
@@ -60,13 +60,13 @@
 		6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; };
 		606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; };
 		681785901C69DCB50032DAAC /* PNImagePickerViewController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PNImagePickerViewController.framework; path = "Pods/../build/Debug-iphoneos/PNImagePickerViewController.framework"; sourceTree = "<group>"; };
 		685260EDF68D7C851442C12E /* Pods_PNImagePickerViewController_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PNImagePickerViewController_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		86D18E23BB421419B8132D08 /* Pods-PNImagePickerViewController_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PNImagePickerViewController_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PNImagePickerViewController_Example/Pods-PNImagePickerViewController_Example.debug.xcconfig"; sourceTree = "<group>"; };
 		873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		930DB7C275684056258BA5EF /* PNImagePickerViewController.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = PNImagePickerViewController.podspec; path = ../PNImagePickerViewController.podspec; sourceTree = "<group>"; };
 		98D3978B62130F866F704B9C /* Pods-PNImagePickerViewController_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PNImagePickerViewController_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-PNImagePickerViewController_Example/Pods-PNImagePickerViewController_Example.release.xcconfig"; sourceTree = "<group>"; };
 		9DECFF91FBC10CAD6C7AEE1E /* Pods-PNImagePickerViewController_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PNImagePickerViewController_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PNImagePickerViewController_Tests/Pods-PNImagePickerViewController_Tests.debug.xcconfig"; sourceTree = "<group>"; };
 		AD447568A76DA895F7B37A24 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
 		ADC9C57C00FD4B2D4EF4A32E /* Pods-PNImagePickerViewController_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PNImagePickerViewController_Example.release.xcconfig"; path = "Target Support Files/Pods-PNImagePickerViewController_Example/Pods-PNImagePickerViewController_Example.release.xcconfig"; sourceTree = "<group>"; };
 		C6AEC746978DFB326EAAA7FF /* libPods-PNImagePickerViewController_Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PNImagePickerViewController_Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		CB8F44A02F3C2331783D2F8C /* Pods-PNImagePickerViewController_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PNImagePickerViewController_Tests.release.xcconfig"; path = "Target Support Files/Pods-PNImagePickerViewController_Tests/Pods-PNImagePickerViewController_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		EBA5C1654F9AF7E4A9AFC1DA /* Pods-PNImagePickerViewController_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PNImagePickerViewController_Example.debug.xcconfig"; path = "Target Support Files/Pods-PNImagePickerViewController_Example/Pods-PNImagePickerViewController_Example.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -78,7 +78,7 @@
 				6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */,
 				6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
 				6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
-				D6C71C75B8F5800EC9990F14 /* Pods_PNImagePickerViewController_Example.framework in Frameworks */,
+				DC5F4864BF4E2B1C54F620F6 /* libPods-PNImagePickerViewController_Example.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -89,7 +89,7 @@
 				6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */,
 				6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */,
 				6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */,
-				7D97D76088572AF45812187E /* Pods_PNImagePickerViewController_Tests.framework in Frameworks */,
+				AE78532B104C86CFD7E59E56 /* libPods-PNImagePickerViewController_Tests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -104,7 +104,7 @@
 				6003F5B5195388D20070C39A /* Tests */,
 				6003F58C195388D20070C39A /* Frameworks */,
 				6003F58B195388D20070C39A /* Products */,
-				9BA892B7D07729CC69D18118 /* Pods */,
+				61B7F4C46763F303A5BF4642 /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -125,8 +125,8 @@
 				6003F58F195388D20070C39A /* CoreGraphics.framework */,
 				6003F591195388D20070C39A /* UIKit.framework */,
 				6003F5AF195388D20070C39A /* XCTest.framework */,
-				685260EDF68D7C851442C12E /* Pods_PNImagePickerViewController_Example.framework */,
+				5C80B5FA595CB4977C47CBE3 /* libPods-PNImagePickerViewController_Example.a */,
-				4328521B225C017B57B0EA26 /* Pods_PNImagePickerViewController_Tests.framework */,
+				C6AEC746978DFB326EAAA7FF /* libPods-PNImagePickerViewController_Tests.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -186,15 +186,16 @@
 			name = "Podspec Metadata";
 			sourceTree = "<group>";
 		};
-		9BA892B7D07729CC69D18118 /* Pods */ = {
+		61B7F4C46763F303A5BF4642 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				86D18E23BB421419B8132D08 /* Pods-PNImagePickerViewController_Example.debug.xcconfig */,
+				EBA5C1654F9AF7E4A9AFC1DA /* Pods-PNImagePickerViewController_Example.debug.xcconfig */,
-				98D3978B62130F866F704B9C /* Pods-PNImagePickerViewController_Example.release.xcconfig */,
+				ADC9C57C00FD4B2D4EF4A32E /* Pods-PNImagePickerViewController_Example.release.xcconfig */,
-				9DECFF91FBC10CAD6C7AEE1E /* Pods-PNImagePickerViewController_Tests.debug.xcconfig */,
+				43986E6CA155C636B098FB5C /* Pods-PNImagePickerViewController_Tests.debug.xcconfig */,
-				12535CEF396FF4D6369EA5C0 /* Pods-PNImagePickerViewController_Tests.release.xcconfig */,
+				CB8F44A02F3C2331783D2F8C /* Pods-PNImagePickerViewController_Tests.release.xcconfig */,
 			);
 			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -204,12 +205,10 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "PNImagePickerViewController_Example" */;
 			buildPhases = (
-				F8D96CF8CF3D374B5AAE33C4 /* Check Pods Manifest.lock */,
+				2C6565F5C43756D0430E8CA7 /* [CP] Check Pods Manifest.lock */,
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
 				B94FCDE98F285449578D9F34 /* Embed Pods Frameworks */,
 				56476F9757949999164002B1 /* Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -224,12 +223,10 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "PNImagePickerViewController_Tests" */;
 			buildPhases = (
-				2FD43162D7B4455C62B23FFC /* Check Pods Manifest.lock */,
+				3C97CC20A31B0FA9B8E46167 /* [CP] Check Pods Manifest.lock */,
 				6003F5AA195388D20070C39A /* Sources */,
 				6003F5AB195388D20070C39A /* Frameworks */,
 				6003F5AC195388D20070C39A /* Resources */,
 				6C7D9A9333266674130B4B6D /* Embed Pods Frameworks */,
 				B6A2E7AB4CD0217BA75EC551 /* Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -251,6 +248,9 @@
 				LastUpgradeCheck = 0720;
 				ORGANIZATIONNAME = "Giuseppe Nucifora";
 				TargetAttributes = {
 					6003F589195388D20070C39A = {
 						DevelopmentTeam = 825G85A28E;
 					};
 					6003F5AD195388D20070C39A = {
 						TestTargetID = 6003F589195388D20070C39A;
 					};
@@ -297,94 +297,48 @@
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
-		2FD43162D7B4455C62B23FFC /* Check Pods Manifest.lock */ = {
+		2C6565F5C43756D0430E8CA7 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
+			inputFileListPaths = (
 			);
 			inputPaths = (
 				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
 				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
 			);
 			name = "Check Pods Manifest.lock";
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/Pods-PNImagePickerViewController_Example-checkManifestLockResult.txt",
 			);
 			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";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		56476F9757949999164002B1 /* Copy Pods Resources */ = {
+		3C97CC20A31B0FA9B8E46167 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
+			inputFileListPaths = (
 			);
 			inputPaths = (
 				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
 				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
 			);
 			name = "Copy Pods Resources";
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/Pods-PNImagePickerViewController_Tests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PNImagePickerViewController_Example/Pods-PNImagePickerViewController_Example-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		6C7D9A9333266674130B4B6D /* Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PNImagePickerViewController_Tests/Pods-PNImagePickerViewController_Tests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		B6A2E7AB4CD0217BA75EC551 /* Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PNImagePickerViewController_Tests/Pods-PNImagePickerViewController_Tests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		B94FCDE98F285449578D9F34 /* Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PNImagePickerViewController_Example/Pods-PNImagePickerViewController_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		F8D96CF8CF3D374B5AAE33C4 /* Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
 			name = "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;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -513,10 +467,11 @@
 		};
 		6003F5C0195388D20070C39A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 86D18E23BB421419B8132D08 /* Pods-PNImagePickerViewController_Example.debug.xcconfig */;
+			baseConfigurationReference = EBA5C1654F9AF7E4A9AFC1DA /* Pods-PNImagePickerViewController_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				DEVELOPMENT_TEAM = 825G85A28E;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/build/Debug-iphoneos",
@@ -533,10 +488,11 @@
 		};
 		6003F5C1195388D20070C39A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 98D3978B62130F866F704B9C /* Pods-PNImagePickerViewController_Example.release.xcconfig */;
+			baseConfigurationReference = ADC9C57C00FD4B2D4EF4A32E /* Pods-PNImagePickerViewController_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				DEVELOPMENT_TEAM = 825G85A28E;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/build/Debug-iphoneos",
@@ -553,7 +509,7 @@
 		};
 		6003F5C3195388D20070C39A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9DECFF91FBC10CAD6C7AEE1E /* Pods-PNImagePickerViewController_Tests.debug.xcconfig */;
+			baseConfigurationReference = 43986E6CA155C636B098FB5C /* Pods-PNImagePickerViewController_Tests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -577,7 +533,7 @@
 		};
 		6003F5C4195388D20070C39A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 12535CEF396FF4D6369EA5C0 /* Pods-PNImagePickerViewController_Tests.release.xcconfig */;
+			baseConfigurationReference = CB8F44A02F3C2331783D2F8C /* Pods-PNImagePickerViewController_Tests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>IDEDidComputeMac32BitWarning</key>
 	<true/>
 </dict>
 </plist>
@@ -43,5 +43,11 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
    <key>NSCameraUsageDescription</key>
    <string>L'app vorrebbe accedere alle foto</string>
    <key>NSPhotoLibraryUsageDescription</key>
    <string>L'app vorrebbe accedere alle foto</string>
    <key>NSMicrophoneUsageDescription</key>
    <string>L'app vorrebbe accedere al microfono</string>
 </dict>
 </plist>
@@ -1,5 +1,5 @@
 source 'https://github.com/CocoaPods/Specs.git'
-use_frameworks!
+platform :ios, '9.0'
 target 'PNImagePickerViewController_Example' do
  pod 'PNImagePickerViewController', :path => '../'
@@ -11,6 +11,5 @@ target 'PNImagePickerViewController_Tests' do
  pod 'Specta'
  pod 'Expecta'
  pod 'FBSnapshotTestCase'
  pod 'Expecta+Snapshots'
 end
@@ -1,40 +1,46 @@
 PODS:
-  - DGActivityIndicatorView (2.0)
+  - DGActivityIndicatorView (2.1.1)
-  - Expecta (1.0.5)
+  - Expecta (1.0.6)
-  - Expecta+Snapshots (3.0.0):
+  - "Expecta+Snapshots (3.1.1)":
    - Expecta (~> 1.0)
    - FBSnapshotTestCase/Core (~> 2.0)
    - Specta (~> 1.0)
-  - FBSnapshotTestCase (2.1.0):
+  - FBSnapshotTestCase/Core (2.1.4)
-    - FBSnapshotTestCase/SwiftSupport (= 2.1.0)
+  - PNImagePickerViewController (1.0):
  - FBSnapshotTestCase/Core (2.1.0)
  - FBSnapshotTestCase/SwiftSupport (2.1.0):
    - FBSnapshotTestCase/Core
  - PNImagePickerViewController (0.1.6):
    - DGActivityIndicatorView
    - PureLayout
-  - PureLayout (3.0.1)
+  - PureLayout (3.1.4)
-  - Specta (1.0.5)
+  - Specta (1.0.7)
 DEPENDENCIES:
  - Expecta
-  - Expecta+Snapshots
+  - "Expecta+Snapshots"
  - FBSnapshotTestCase
  - PNImagePickerViewController (from `../`)
  - PureLayout
  - Specta
 SPEC REPOS:
  https://github.com/cocoapods/specs.git:
    - DGActivityIndicatorView
    - Expecta
    - "Expecta+Snapshots"
    - FBSnapshotTestCase
    - PureLayout
    - Specta
 EXTERNAL SOURCES:
  PNImagePickerViewController:
-    :path: ../
+    :path: "../"
 SPEC CHECKSUMS:
-  DGActivityIndicatorView: 52875b025a6ccf6a431a905285c12e2bb95eb559
+  DGActivityIndicatorView: ff2c76073d79692f724863c8dd38685866a03cb6
-  Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
+  Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
-  Expecta+Snapshots: c343f410c7a6392f3e22e78f94c44b6c0749a516
+  "Expecta+Snapshots": dcff217eef506dabd6dfdc7864ea2da321fafbb8
-  FBSnapshotTestCase: 366ecd378511d7716c79991cd8067d1eed23578d
+  FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
-  PNImagePickerViewController: 0848e21228883cb9ed88d1acda011343874159bf
+  PNImagePickerViewController: ec5feb9bd69e25a02dd13423ba2f27aa07812dbf
-  PureLayout: f35f5384c9c4e4479df041dbe33ad7577b71ddfb
+  PureLayout: f08c01b8dec00bb14a1fefa3de4c7d9c265df85e
-  Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2
+  Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: d21e7aa1109583b38a752038983d180af70f28d4
 COCOAPODS: 1.6.0
@@ -0,0 +1,19 @@
 //
 //  DGActivityIndicatorAnimation.h
 //  DGActivityIndicatorExample
 //
 //  Created by Danil Gontovnik on 8/10/16.
 //  Copyright © 2016 Danil Gontovnik. All rights reserved.
 //
 #import <Foundation/Foundation.h>
 #import "DGActivityIndicatorAnimationProtocol.h"
@interface DGActivityIndicatorAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
 - (CABasicAnimation *)createBasicAnimationWithKeyPath:(NSString *)keyPath;
 - (CAKeyframeAnimation *)createKeyframeAnimationWithKeyPath:(NSString *)keyPath;
 - (CAAnimationGroup *)createAnimationGroup;
@end
@@ -0,0 +1,35 @@
 //
 //  DGActivityIndicatorAnimation.m
 //  DGActivityIndicatorExample
 //
 //  Created by Danil Gontovnik on 8/10/16.
 //  Copyright © 2016 Danil Gontovnik. All rights reserved.
 //
 #import "DGActivityIndicatorAnimation.h"
@implementation DGActivityIndicatorAnimation
 - (CABasicAnimation *)createBasicAnimationWithKeyPath:(NSString *)keyPath {
    CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:keyPath];
    animation.removedOnCompletion = NO;
    return animation;
 }
 - (CAKeyframeAnimation *)createKeyframeAnimationWithKeyPath:(NSString *)keyPath {
    CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:keyPath];
    animation.removedOnCompletion = NO;
    return animation;
 }
 - (CAAnimationGroup *)createAnimationGroup {
    CAAnimationGroup *animationGroup = [CAAnimationGroup animation];
    animationGroup.removedOnCompletion = NO;
    return animationGroup;
 }
 - (void)setupAnimationInLayer:(CALayer *)layer withSize:(CGSize)size tintColor:(UIColor *)tintColor {
 }
@end
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallBeatAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallBeatAnimation: DGActivityIndicatorAnimation
@end
@@ -19,21 +19,21 @@
    CGFloat y = (layer.bounds.size.height - circleSize) / 2;
    // Scale animation
-    CAKeyframeAnimation *scaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
+    CAKeyframeAnimation *scaleAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.scale"];
    scaleAnimation.duration = duration;
    scaleAnimation.keyTimes = @[@0.0f, @0.5f, @1.0f];
    scaleAnimation.values = @[@1.0f, @0.75f, @1.0f];
    // Opacity animation
-    CAKeyframeAnimation *opacityAnimation = [CAKeyframeAnimation animationWithKeyPath:@"opacity"];
+    CAKeyframeAnimation *opacityAnimation = [self createKeyframeAnimationWithKeyPath:@"opacity"];
    opacityAnimation.duration = duration;
    opacityAnimation.keyTimes = @[@0.0f, @0.5f, @1.0f];
    opacityAnimation.values = @[@1.0f, @0.2f, @1.0f];
    // Aniamtion
-    CAAnimationGroup *animation = [CAAnimationGroup animation];
+    CAAnimationGroup *animation = [self createAnimationGroup];;
    animation.duration = duration;
    animation.animations = @[scaleAnimation, opacityAnimation];
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallClipRotateAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallClipRotateAnimation: DGActivityIndicatorAnimation
@end
@@ -14,7 +14,7 @@
    CGFloat duration = 0.75f;
    //    Scale animation
-    CAKeyframeAnimation *scaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
+    CAKeyframeAnimation *scaleAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.scale"];
    scaleAnimation.values = @[[NSValue valueWithCATransform3D:CATransform3DMakeScale(1.0f, 1.0f, 1.0f)],
                              [NSValue valueWithCATransform3D:CATransform3DMakeScale(0.6f, 0.6f, 1.0f)],
@@ -22,13 +22,13 @@
    scaleAnimation.keyTimes = @[@0.0f, @0.5f, @1.0f];
    // Rotate animation
-    CAKeyframeAnimation *rotateAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.z"];
+    CAKeyframeAnimation *rotateAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.rotation.z"];
    rotateAnimation.values = @[@0, @M_PI, @(2 * M_PI)];
    rotateAnimation.keyTimes = scaleAnimation.keyTimes;
    // Animation
-    CAAnimationGroup *animation = [CAAnimationGroup animation];
+    CAAnimationGroup *animation = [self createAnimationGroup];;
    animation.animations = @[scaleAnimation, rotateAnimation];
    animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear];
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallClipRotateMultipleAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallClipRotateMultipleAnimation: DGActivityIndicatorAnimation
@end
@@ -56,7 +56,7 @@
 - (CAAnimation *)createAnimationInDuration:(CGFloat) duration withTimingFunction:(CAMediaTimingFunction *) timingFunction reverse:(BOOL) reverse {
    // Scale animation
-    CAKeyframeAnimation *scaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
+    CAKeyframeAnimation *scaleAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.scale"];
    scaleAnimation.keyTimes = @[@0.0f, @0.5f, @1.0f];
    scaleAnimation.values = @[[NSValue valueWithCATransform3D:CATransform3DMakeScale(1.0f, 1.0f, 1.0f)],
@@ -66,7 +66,7 @@
    scaleAnimation.timingFunctions = @[timingFunction, timingFunction];
    // Rotate animation
-    CAKeyframeAnimation *rotateAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.z"];
+    CAKeyframeAnimation *rotateAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.rotation.z"];
    if (!reverse) {
        rotateAnimation.values = @[@0, @M_PI, @(2 * M_PI)];
@@ -78,7 +78,7 @@
    rotateAnimation.timingFunctions = @[timingFunction, timingFunction];
    // Animation
-    CAAnimationGroup *animation = [CAAnimationGroup animation];
+    CAAnimationGroup *animation = [self createAnimationGroup];;
    animation.animations = @[scaleAnimation, rotateAnimation];
    animation.repeatCount = HUGE_VALF;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallClipRotatePulseAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallClipRotatePulseAnimation: DGActivityIndicatorAnimation
@end
@@ -16,7 +16,7 @@
    // Small circle
    {
-        CAKeyframeAnimation *scaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
+        CAKeyframeAnimation *scaleAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.scale"];
        scaleAnimation.keyTimes = @[@0.0f, @0.3f, @1.0f];
        scaleAnimation.values = @[[NSValue valueWithCATransform3D:CATransform3DMakeScale(1.0f, 1.0f, 1.0f)],
@@ -39,7 +39,7 @@
    // Big circle
    {
        // Scale animation
-        CAKeyframeAnimation *scaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
+        CAKeyframeAnimation *scaleAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.scale"];
        scaleAnimation.keyTimes = @[@0.0f, @0.5f, @1.0f];
        scaleAnimation.values = @[[NSValue valueWithCATransform3D:CATransform3DMakeScale(1.0f, 1.0f, 1.0f)],
@@ -49,7 +49,7 @@
        scaleAnimation.timingFunctions = @[timingFunction, timingFunction];
        // Rotate animation
-        CAKeyframeAnimation *rotateAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.z"];
+        CAKeyframeAnimation *rotateAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.rotation.z"];
        rotateAnimation.values = @[@0, @M_PI, @(2 * M_PI)];
        rotateAnimation.keyTimes = scaleAnimation.keyTimes;
@@ -57,7 +57,7 @@
        rotateAnimation.timingFunctions = @[timingFunction, timingFunction];
        // Animation
-        CAAnimationGroup *animation = [CAAnimationGroup animation];
+        CAAnimationGroup *animation = [self createAnimationGroup];;
        animation.animations = @[scaleAnimation, rotateAnimation];
        animation.duration = duration;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallGridBeatAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallGridBeatAnimation: DGActivityIndicatorAnimation
@end
@@ -20,7 +20,7 @@
    CGFloat y = (layer.bounds.size.height - size.height) / 2;
    // Animation
-    CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"opacity"];
+    CAKeyframeAnimation *animation = [self createKeyframeAnimationWithKeyPath:@"opacity"];
    animation.beginTime = CACurrentMediaTime();
    animation.keyTimes = @[@0.0f, @0.5f, @1.0f];
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallGridPulseAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallGridPulseAnimation: DGActivityIndicatorAnimation
@end
@@ -20,21 +20,21 @@
    CGFloat y = (layer.bounds.size.height - size.height) / 2;
    // Scale animation
-    CAKeyframeAnimation *scaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
+    CAKeyframeAnimation *scaleAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.scale"];
    scaleAnimation.keyTimes = @[@0.0f, @0.5f, @1.0f];
    scaleAnimation.values = @[@1.0f, @0.5f, @1.0f];
    scaleAnimation.timingFunctions = @[timingFunction, timingFunction];
    // Animation
-    CAKeyframeAnimation *opacityAnimation = [CAKeyframeAnimation animationWithKeyPath:@"opacity"];
+    CAKeyframeAnimation *opacityAnimation = [self createKeyframeAnimationWithKeyPath:@"opacity"];
    opacityAnimation.keyTimes = @[@0.0f, @0.5f, @1.0f];
    opacityAnimation.values = @[@1.0f, @0.7f, @1.0f];
    opacityAnimation.timingFunctions = @[timingFunction, timingFunction];
    // Animation
-    CAAnimationGroup *animation = [CAAnimationGroup animation];
+    CAAnimationGroup *animation = [self createAnimationGroup];;
    animation.animations = @[scaleAnimation, opacityAnimation];
    animation.beginTime = CACurrentMediaTime();
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallPulseAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallPulseAnimation: DGActivityIndicatorAnimation
@end
@@ -19,7 +19,7 @@
    NSArray *timeBegins = @[@0.12f, @0.24f, @0.36f];
    CAMediaTimingFunction *timingFunction = [CAMediaTimingFunction functionWithControlPoints:0.2f :0.68f :0.18f :1.08f];
-    CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
+    CAKeyframeAnimation *animation = [self createKeyframeAnimationWithKeyPath:@"transform"];
    animation.values = @[[NSValue valueWithCATransform3D:CATransform3DMakeScale(1.0f, 1.0f, 1.0f)],
                                [NSValue valueWithCATransform3D:CATransform3DMakeScale(0.3f, 0.3f, 1.0f)],
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallPulseSyncAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallPulseSyncAnimation: DGActivityIndicatorAnimation
@end
@@ -21,7 +21,7 @@
    CAMediaTimingFunction *timingFunciton = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
    // Animation
-    CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"transform.translation.y"];
+    CAKeyframeAnimation *animation = [self createKeyframeAnimationWithKeyPath:@"transform.translation.y"];
    animation.duration = duration;
    animation.keyTimes = @[@0.0f, @0.33f, @0.66f, @1.0f];
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallRotateAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallRotateAnimation: DGActivityIndicatorAnimation
@end
@@ -16,7 +16,7 @@
    CAMediaTimingFunction *timingFunction = [CAMediaTimingFunction functionWithControlPoints:0.7f :-0.13f :0.22f :0.86f];
    // Scale animation
-    CAKeyframeAnimation *scaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
+    CAKeyframeAnimation *scaleAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.scale"];
    scaleAnimation.keyTimes = @[@0.0f, @0.5f, @1.0f];
    scaleAnimation.values = @[[NSValue valueWithCATransform3D:CATransform3DMakeScale(1.0f, 1.0f, 1.0f)],
@@ -26,7 +26,7 @@
    scaleAnimation.timingFunctions = @[timingFunction, timingFunction];
    // Rotate animation
-    CAKeyframeAnimation *rotateAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.z"];
+    CAKeyframeAnimation *rotateAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.rotation.z"];
    rotateAnimation.keyTimes = @[@0.0f, @0.5f, @1.0f];
    rotateAnimation.values = @[@0, @-M_PI, @(-2 * M_PI)];
@@ -34,7 +34,7 @@
    rotateAnimation.timingFunctions = @[timingFunction, timingFunction];
    // Animation
-    CAAnimationGroup *animation = [CAAnimationGroup animation];
+    CAAnimationGroup *animation = [self createAnimationGroup];;
    animation.animations = @[scaleAnimation, rotateAnimation];
    animation.duration = duration;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallScaleAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallScaleAnimation: DGActivityIndicatorAnimation
@end
@@ -14,21 +14,21 @@
    CGFloat duration = 1.0f;
    // Scale animation
-    CABasicAnimation *scaleAnimation = [CABasicAnimation animationWithKeyPath:@"transform.scale"];
+    CABasicAnimation *scaleAnimation = [self createBasicAnimationWithKeyPath:@"transform.scale"];
    scaleAnimation.duration = duration;
    scaleAnimation.fromValue = @0.0f;
    scaleAnimation.toValue = @1.0f;
    // Opacity animation
-    CABasicAnimation *opacityAnimation = [CABasicAnimation animationWithKeyPath:@"opacity"];
+    CABasicAnimation *opacityAnimation = [self createBasicAnimationWithKeyPath:@"opacity"];
    opacityAnimation.duration = duration;
    opacityAnimation.fromValue = @1.0f;
    opacityAnimation.toValue = @0.0f;
    // Animation
-    CAAnimationGroup *animation = [CAAnimationGroup animation];
+    CAAnimationGroup *animation = [self createAnimationGroup];;
    animation.animations = @[scaleAnimation, opacityAnimation];
    animation.duration = duration;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallScaleMultipleAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallScaleMultipleAnimation: DGActivityIndicatorAnimation
@end
@@ -15,21 +15,21 @@
    NSArray *beginTimes = @[@0.0f, @0.2f, @0.4f];
    // Scale animation
-    CABasicAnimation *scaleAnimation = [CABasicAnimation animationWithKeyPath:@"transform.scale"];
+    CABasicAnimation *scaleAnimation = [self createBasicAnimationWithKeyPath:@"transform.scale"];
    scaleAnimation.duration = duration;
    scaleAnimation.fromValue = @0.0f;
    scaleAnimation.toValue = @1.0f;
    // Opacity animation
-    CAKeyframeAnimation *opacityAnimation = [CAKeyframeAnimation animationWithKeyPath:@"opacity"];
+    CAKeyframeAnimation *opacityAnimation = [self createKeyframeAnimationWithKeyPath:@"opacity"];
    opacityAnimation.duration = duration;
    opacityAnimation.keyTimes = @[@0.0f, @0.05f, @1.0f];
    opacityAnimation.values = @[@0.0f, @1.0f, @0.0f];
    // Animation
-    CAAnimationGroup *animation = [CAAnimationGroup animation];
+    CAAnimationGroup *animation = [self createAnimationGroup];;
    animation.animations = @[scaleAnimation, opacityAnimation];
    animation.duration = duration;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallScaleRippleAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallScaleRippleAnimation: DGActivityIndicatorAnimation
@end
@@ -15,7 +15,7 @@
    CAMediaTimingFunction *timingFunction = [CAMediaTimingFunction functionWithControlPoints:0.21f :0.53f :0.56f :0.8f];
    // Scale animation
-    CAKeyframeAnimation *scaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
+    CAKeyframeAnimation *scaleAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.scale"];
    scaleAnimation.duration = duration;
    scaleAnimation.keyTimes = @[@0.0f, @0.7f];
@@ -23,7 +23,7 @@
    scaleAnimation.timingFunction = timingFunction;
    // Opacity animation
-    CAKeyframeAnimation *opacityAnimation = [CAKeyframeAnimation animationWithKeyPath:@"opacity"];
+    CAKeyframeAnimation *opacityAnimation = [self createKeyframeAnimationWithKeyPath:@"opacity"];
    opacityAnimation.duration = duration;
    opacityAnimation.keyTimes = @[@0.0f, @0.7f, @1.0f];
@@ -31,7 +31,7 @@
    opacityAnimation.timingFunctions = @[timingFunction, timingFunction];
    // Animation
-    CAAnimationGroup *animation = [CAAnimationGroup animation];
+    CAAnimationGroup *animation = [self createAnimationGroup];;
    animation.animations = @[scaleAnimation, opacityAnimation];
    animation.duration = duration;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallScaleRippleMultipleAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallScaleRippleMultipleAnimation: DGActivityIndicatorAnimation
@end
@@ -16,7 +16,7 @@
    NSArray *timeOffsets = @[@0.0f, @0.2f, @0.4f];
    // Scale animation
-    CAKeyframeAnimation *scaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
+    CAKeyframeAnimation *scaleAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.scale"];
    scaleAnimation.duration = duration;
    scaleAnimation.keyTimes = @[@0.0f, @0.7f];
@@ -24,7 +24,7 @@
    scaleAnimation.timingFunction = timingFunction;
    // Opacity animation
-    CAKeyframeAnimation *opacityAnimation = [CAKeyframeAnimation animationWithKeyPath:@"opacity"];
+    CAKeyframeAnimation *opacityAnimation = [self createKeyframeAnimationWithKeyPath:@"opacity"];
    opacityAnimation.duration = duration;
    opacityAnimation.keyTimes = @[@0.0f, @0.7f, @1.0f];
@@ -32,7 +32,7 @@
    opacityAnimation.timingFunctions = @[timingFunction, timingFunction];
    // Animation
-    CAAnimationGroup *animation = [CAAnimationGroup animation];
+    CAAnimationGroup *animation = [self createAnimationGroup];;
    animation.animations = @[scaleAnimation, opacityAnimation];
    animation.duration = duration;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 mRocker. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallSpinFadeLoader : NSObject<DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallSpinFadeLoader : DGActivityIndicatorAnimation
@end
@@ -26,14 +26,14 @@
    NSArray *beginTimes = @[@0, @0.12, @0.24, @0.36, @0.48, @0.6, @0.72, @0.84];
-    CAKeyframeAnimation *scaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
+    CAKeyframeAnimation *scaleAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.scale"];
    scaleAnimation.keyTimes = @[@0, @0.5, @1];
    scaleAnimation.values = @[@1, @0.4, @1];
    scaleAnimation.duration = duration;
-    CAKeyframeAnimation *opacityAnimaton = [CAKeyframeAnimation animationWithKeyPath:@"opacity"];
+    CAKeyframeAnimation *opacityAnimaton = [self createKeyframeAnimationWithKeyPath:@"opacity"];
    opacityAnimaton.keyTimes = @[@0, @0.5, @1];
@@ -43,12 +43,11 @@
-    CAAnimationGroup *animationGroup = [CAAnimationGroup animation];
+    CAAnimationGroup *animationGroup = [self createAnimationGroup];;
    animationGroup.animations = @[scaleAnimation, opacityAnimaton];
    animationGroup.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear];
    animationGroup.duration = duration;
    animationGroup.repeatCount = HUGE;
    animationGroup.removedOnCompletion = NO;
    for (int i = 0; i < 8; i++) {
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallTrianglePathAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallTrianglePathAnimation: DGActivityIndicatorAnimation
@end
@@ -20,7 +20,7 @@
    CAMediaTimingFunction *timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
    // Animation
-    CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
+    CAKeyframeAnimation *animation = [self createKeyframeAnimationWithKeyPath:@"transform"];
    animation.keyTimes = @[@0.0f, @0.33f, @0.66f, @1.0f];
    animation.duration = duration;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallZigZagAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallZigZagAnimation: DGActivityIndicatorAnimation
@end
@@ -17,7 +17,7 @@
    CGFloat deltaY = size.height / 2 - circleSize / 2;
    // Circle 1 animation
-    CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
+    CAKeyframeAnimation *animation = [self createKeyframeAnimationWithKeyPath:@"transform"];
    animation.duration = duration;
    animation.keyTimes = @[@0.0f, @0.33f, @0.66f, @1.0f];
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorBallZigZagDeflectAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorBallZigZagDeflectAnimation: DGActivityIndicatorAnimation
@end
@@ -17,7 +17,7 @@
    CGFloat deltaY = size.height / 2 - circleSize / 2;
    // Circle 1 animation
-    CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
+    CAKeyframeAnimation *animation = [self createKeyframeAnimationWithKeyPath:@"transform"];
    animation.duration = duration;
    animation.keyTimes = @[@0.0f, @0.33f, @0.66f, @1.0f];
@@ -6,9 +6,9 @@
 //  Copyright (c) 2015年 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorCookieTerminatorAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorCookieTerminatorAnimation: DGActivityIndicatorAnimation
@end
@@ -42,8 +42,7 @@
        jawLayer.opacity = 1.0f;
        jawLayer.transform = CATransform3DMakeRotation((1.0f - 2.0f * i) * M_PI_4, 0.0f, 0.0f, 1.0f);
-        CABasicAnimation *transformAnimation = [CABasicAnimation animationWithKeyPath:@"transform"];
+        CABasicAnimation *transformAnimation = [self createBasicAnimationWithKeyPath:@"transform"];
        transformAnimation.removedOnCompletion = NO;
        transformAnimation.beginTime = beginTime;
        transformAnimation.duration = 0.3f;
        transformAnimation.fromValue = [NSValue valueWithCATransform3D:CATransform3DMakeRotation((1.0f - 2.0f * i) * M_PI_4, 0.0f, 0.0f, 1.0f)];
@@ -66,13 +65,12 @@
        cookieLayer.opacity = 1.0f;
        cookieLayer.cornerRadius = cookieSize / 2.0f;
-        CABasicAnimation *transformAnimation = [CABasicAnimation animationWithKeyPath:@"transform"];
+        CABasicAnimation *transformAnimation = [self createBasicAnimationWithKeyPath:@"transform"];
        transformAnimation.duration = 1.8f;
        transformAnimation.beginTime = beginTime - (i * transformAnimation.duration / 3.0f);
        transformAnimation.fromValue = [NSValue valueWithCATransform3D:CATransform3DMakeTranslation(0.0f, 0.0f, 0.0f)];
        transformAnimation.toValue = [NSValue valueWithCATransform3D:CATransform3DMakeTranslation(-3.0f * (cookieSize + cookiePadding), 0.0f, 0.0f)];
        transformAnimation.repeatCount = HUGE_VALF;
        transformAnimation.removedOnCompletion = NO;
        transformAnimation.timingFunction = [CAMediaTimingFunction functionWithName: kCAMediaTimingFunctionLinear];
        [layer addSublayer:cookieLayer];
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorDoubleBounceAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorDoubleBounceAnimation: DGActivityIndicatorAnimation
@end
@@ -27,8 +27,7 @@
        circle.transform = CATransform3DMakeScale(0.0f, 0.0f, 0.0f);
        circle.backgroundColor = tintColor.CGColor;
-        CAKeyframeAnimation *transformAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
+        CAKeyframeAnimation *transformAnimation = [self createKeyframeAnimationWithKeyPath:@"transform"];
        transformAnimation.removedOnCompletion = NO;
        transformAnimation.repeatCount = HUGE_VALF;
        transformAnimation.duration = 2.0f;
        transformAnimation.beginTime = beginTime - (1.0f * i);
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorFiveDotsAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorFiveDotsAnimation: DGActivityIndicatorAnimation
@end
@@ -43,13 +43,12 @@
        CATransform3D t5 = CATransform3DMakeTranslation(0.0f, 0.0f, 0.0f);
        t5 = CATransform3DScale(t5, 1.f, 1.0f, 0.0f);
-        CAKeyframeAnimation *transformAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
+        CAKeyframeAnimation *transformAnimation = [self createKeyframeAnimationWithKeyPath:@"transform"];
        transformAnimation.values = @[[NSValue valueWithCATransform3D:t1],
                                      [NSValue valueWithCATransform3D:t2],
                                      [NSValue valueWithCATransform3D:t3],
                                      [NSValue valueWithCATransform3D:t4],
                                      [NSValue valueWithCATransform3D:t5]];
        transformAnimation.removedOnCompletion = NO;
        transformAnimation.beginTime = beginTime;
        transformAnimation.repeatCount = HUGE_VALF;
        transformAnimation.duration = 1.0f;
@@ -79,13 +78,12 @@
        CATransform3D t4 = CATransform3DMakeTranslation(0.0f, 0.0f, 0.0f);
        t4 = CATransform3DScale(t4, 0.3f, 0.3f, 0.0f);
-        CAKeyframeAnimation *transformAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
+        CAKeyframeAnimation *transformAnimation = [self createKeyframeAnimationWithKeyPath:@"transform"];
        transformAnimation.values = @[[NSValue valueWithCATransform3D:t1],
                                      [NSValue valueWithCATransform3D:t2],
                                      [NSValue valueWithCATransform3D:t3],
                                      [NSValue valueWithCATransform3D:t4]];
        transformAnimation.keyTimes = @[@(0.0f), @(0.25f), @(0.75f), @(1.0f)];
        transformAnimation.removedOnCompletion = NO;
        transformAnimation.beginTime = beginTime;
        transformAnimation.repeatCount = HUGE_VALF;
        transformAnimation.duration = 1.0f;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorLineScaleAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorLineScaleAnimation: DGActivityIndicatorAnimation
@end
@@ -19,7 +19,7 @@
    CGFloat y = (layer.bounds.size.height - size.height) / 2;
    // Animation
-    CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale.y"];
+    CAKeyframeAnimation *animation = [self createKeyframeAnimationWithKeyPath:@"transform.scale.y"];
    animation.keyTimes = @[@0.0f, @0.5f, @1.0f];
    animation.values = @[@1.0f, @0.4f, @1.0f];
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorLineScalePartyAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorLineScalePartyAnimation: DGActivityIndicatorAnimation
@end
@@ -19,7 +19,7 @@
    CGFloat y = (layer.bounds.size.height - size.height) / 2;
    // Animation
-    CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
+    CAKeyframeAnimation *animation = [self createKeyframeAnimationWithKeyPath:@"transform.scale"];
    animation.keyTimes = @[@0.0f, @0.5f, @1.0f];
    animation.values = @[@1.0f, @0.5f, @1.0f];
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorLineScalePulseOutAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorLineScalePulseOutAnimation: DGActivityIndicatorAnimation
@end
@@ -19,7 +19,7 @@
    CGFloat y = (layer.bounds.size.height - size.height) / 2;
    // Animation
-    CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale.y"];
+    CAKeyframeAnimation *animation = [self createKeyframeAnimationWithKeyPath:@"transform.scale.y"];
    animation.keyTimes = @[@0.0f, @0.5f, @1.0f];
    animation.values = @[@1.0f, @0.4f, @1.0f];
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorLineScalePulseOutRapidAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorLineScalePulseOutRapidAnimation: DGActivityIndicatorAnimation
@end
@@ -19,7 +19,7 @@
    CGFloat y = (layer.bounds.size.height - size.height) / 2;
    // Animation
-    CAKeyframeAnimation *animation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale.y"];
+    CAKeyframeAnimation *animation = [self createKeyframeAnimationWithKeyPath:@"transform.scale.y"];
    animation.keyTimes = @[@0.0f, @0.8f, @0.9f];
    animation.values = @[@1.0f, @0.3f, @1.0f];
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorNineDotsAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorNineDotsAnimation: DGActivityIndicatorAnimation
@end
@@ -37,16 +37,15 @@
        circle.opacity = 1.0f;
        circle.cornerRadius = circle.bounds.size.height / 2.0f;
-        CAKeyframeAnimation *transformAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
+        CAKeyframeAnimation *transformAnimation = [self createKeyframeAnimationWithKeyPath:@"transform"];
        transformAnimation.values = @[[NSValue valueWithCATransform3D:CATransform3DMakeScale(0.5f, 0.5f, 0.0f)],
                                      [NSValue valueWithCATransform3D:CATransform3DMakeScale(1.0f, 1.0f, 0.0f)],
                                      [NSValue valueWithCATransform3D:CATransform3DMakeScale(0.5f, 0.5f, 0.0f)]];
-        CAKeyframeAnimation *opacityAnimation = [CAKeyframeAnimation animationWithKeyPath:@"opacity"];
+        CAKeyframeAnimation *opacityAnimation = [self createKeyframeAnimationWithKeyPath:@"opacity"];
        opacityAnimation.values = @[@(0.5f), @(1.0f), @(0.5f)];
-        CAAnimationGroup *animationGroup = [CAAnimationGroup animation];
+        CAAnimationGroup *animationGroup = [self createAnimationGroup];;
        animationGroup.removedOnCompletion = NO;
        animationGroup.beginTime = beginTime;
        animationGroup.repeatCount = HUGE_VALF;
        animationGroup.duration = [durations[i] doubleValue];
@@ -6,9 +6,9 @@
 //  Copyright (c) 2015年 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorRotatingSandglassAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorRotatingSandglassAnimation: DGActivityIndicatorAnimation
@end
@@ -31,8 +31,7 @@
        circle.shouldRasterize = YES;
        circle.rasterizationScale = [[UIScreen mainScreen] scale];
-        CAKeyframeAnimation *transformAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
+        CAKeyframeAnimation *transformAnimation = [self createKeyframeAnimationWithKeyPath:@"transform"];
        transformAnimation.removedOnCompletion = NO;
        transformAnimation.repeatCount = HUGE_VALF;
        transformAnimation.duration = 0.8f;
        transformAnimation.beginTime = beginTime;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorRotatingSquaresAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorRotatingSquaresAnimation: DGActivityIndicatorAnimation
@end
@@ -30,8 +30,7 @@ static CGFloat degreesToRadians(CGFloat degrees) { return (degrees) / 180.0 * M_
        square.shouldRasterize = YES;
        square.rasterizationScale = [[UIScreen mainScreen] scale];
-        CAKeyframeAnimation *transformAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
+        CAKeyframeAnimation *transformAnimation = [self createKeyframeAnimationWithKeyPath:@"transform"];
        transformAnimation.removedOnCompletion = NO;
        transformAnimation.duration = 1.6f;
        transformAnimation.beginTime = beginTime - (i * transformAnimation.duration / 2.0f);
        transformAnimation.repeatCount = HUGE_VALF;
@@ -6,9 +6,9 @@
 //  Copyright (c) 2015年 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorRotatingTrigonAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorRotatingTrigonAnimation: DGActivityIndicatorAnimation
@end
@@ -38,8 +38,7 @@
        circle.shouldRasterize = YES;
        circle.rasterizationScale = [[UIScreen mainScreen] scale];
-        CAKeyframeAnimation *transformAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
+        CAKeyframeAnimation *transformAnimation = [self createKeyframeAnimationWithKeyPath:@"transform"];
        transformAnimation.removedOnCompletion = NO;
        transformAnimation.repeatCount = HUGE_VALF;
        transformAnimation.duration = 2.0f;
        transformAnimation.beginTime = beginTime - (i * transformAnimation.duration / 3.0f);;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorThreeDotsAnimation : NSObject<DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorThreeDotsAnimation : DGActivityIndicatorAnimation
@end
@@ -32,18 +32,17 @@
        circle.opacity = 1.0f;
        circle.cornerRadius = circle.bounds.size.width / 2.0f;
-        CAKeyframeAnimation *tranformAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
+        CAKeyframeAnimation *tranformAnimation = [self createKeyframeAnimationWithKeyPath:@"transform"];
        tranformAnimation.values = @[[NSValue valueWithCATransform3D:CATransform3DMakeScale(0.5f, 0.5f, 0.0f)],
                                     [NSValue valueWithCATransform3D:CATransform3DMakeScale(1.0f, 1.0f, 0.0f)]];
-        CAKeyframeAnimation *opacityAnimation = [CAKeyframeAnimation animationWithKeyPath:@"opacity"];
+        CAKeyframeAnimation *opacityAnimation = [self createKeyframeAnimationWithKeyPath:@"opacity"];
        opacityAnimation.values = @[@(0.25f), @(1.0f)];
-        CAAnimationGroup *animationGroup = [CAAnimationGroup animation];
+        CAAnimationGroup *animationGroup = [self createAnimationGroup];;
        animationGroup.removedOnCompletion = NO;
        animationGroup.autoreverses = YES;
        animationGroup.beginTime = beginTime;
        animationGroup.repeatCount = HUGE_VALF;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorTriangleSkewSpinAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorTriangleSkewSpinAnimation: DGActivityIndicatorAnimation
@end
@@ -17,7 +17,7 @@
    CAMediaTimingFunction *timingFunction = [CAMediaTimingFunction functionWithControlPoints:0.09f :0.57f :0.49f :0.9f];
    // Rotation x animation
-    CAKeyframeAnimation *rotationXAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.x"];
+    CAKeyframeAnimation *rotationXAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.rotation.x"];
    rotationXAnimation.duration = duration;
    rotationXAnimation.keyTimes = @[@0.0f, @0.25f, @0.5f, @0.75f, @1.0f];
@@ -25,7 +25,7 @@
    rotationXAnimation.timingFunctions = @[timingFunction, timingFunction, timingFunction, timingFunction];
    // Rotation x animation
-    CAKeyframeAnimation *rotationYAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.y"];
+    CAKeyframeAnimation *rotationYAnimation = [self createKeyframeAnimationWithKeyPath:@"transform.rotation.y"];
    rotationYAnimation.duration = duration;
    rotationYAnimation.keyTimes = @[@0.0f, @0.25f, @0.5f, @0.75f, @1.0f];
@@ -33,7 +33,7 @@
    rotationYAnimation.timingFunctions = @[timingFunction, timingFunction, timingFunction, timingFunction];
    // Animation
-    CAAnimationGroup *animation = [CAAnimationGroup animation];
+    CAAnimationGroup *animation = [self createAnimationGroup];;
    animation.animations = @[rotationXAnimation, rotationYAnimation];
    animation.duration = duration;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorTriplePulseAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorTriplePulseAnimation: DGActivityIndicatorAnimation
@end
@@ -27,16 +27,15 @@
        circle.cornerRadius = circle.bounds.size.height / 2.0f;
        circle.transform = CATransform3DMakeScale(0.0f, 0.0f, 0.0f);
-        CABasicAnimation *transformAnimation = [CABasicAnimation animationWithKeyPath:@"transform"];
+        CABasicAnimation *transformAnimation = [self createBasicAnimationWithKeyPath:@"transform"];
        transformAnimation.fromValue = [NSValue valueWithCATransform3D:CATransform3DMakeScale(0.0f, 0.0f, 0.0f)];
        transformAnimation.toValue = [NSValue valueWithCATransform3D:CATransform3DMakeScale(1.0f, 1.0f, 0.0f)];
-        CABasicAnimation *opacityAnimation = [CABasicAnimation animationWithKeyPath:@"opacity"];
+        CABasicAnimation *opacityAnimation = [self createBasicAnimationWithKeyPath:@"opacity"];
        opacityAnimation.fromValue = @(0.8f);
        opacityAnimation.toValue = @(0.0f);
-        CAAnimationGroup *animationGroup = [CAAnimationGroup animation];
+        CAAnimationGroup *animationGroup = [self createAnimationGroup];;
        animationGroup.removedOnCompletion = NO;
        animationGroup.beginTime = beginTime + i * 0.2f;
        animationGroup.repeatCount = HUGE_VALF;
        animationGroup.duration = 1.2f;
@@ -5,8 +5,8 @@
 //  Created by tripleCC on 15/6/28.
 //  Copyright (c) 2015年 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorTripleRingsAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorTripleRingsAnimation: DGActivityIndicatorAnimation
@end
@@ -29,20 +29,19 @@
        circle.opacity = 1.0f;
        circle.transform = CATransform3DMakeScale(0.0f, 0.0f, 0.0f);
-        CABasicAnimation *transformAnimation = [CABasicAnimation animationWithKeyPath:@"transform"];
+        CABasicAnimation *transformAnimation = [self createBasicAnimationWithKeyPath:@"transform"];
        transformAnimation.duration = 2.0f - i * 0.4f;
        transformAnimation.fromValue = [NSValue valueWithCATransform3D:CATransform3DMakeScale(0.1f, 0.1f, 0.0f)];
        transformAnimation.toValue = [NSValue valueWithCATransform3D:CATransform3DMakeScale(1.0f, 1.0f, 0.0f)];
        transformAnimation.timingFunction = [CAMediaTimingFunction functionWithName: kCAMediaTimingFunctionEaseOut];
-        CABasicAnimation *opacityAnimation = [CABasicAnimation animationWithKeyPath:@"opacity"];
+        CABasicAnimation *opacityAnimation = [self createBasicAnimationWithKeyPath:@"opacity"];
        opacityAnimation.duration = transformAnimation.duration;
        opacityAnimation.fromValue = @(1.0f);
        opacityAnimation.toValue = @(0.8f);
        opacityAnimation.timingFunction = [CAMediaTimingFunction functionWithName: kCAMediaTimingFunctionEaseOut];
-        CAAnimationGroup *animationGroup = [CAAnimationGroup animation];
+        CAAnimationGroup *animationGroup = [self createAnimationGroup];;
        animationGroup.removedOnCompletion = NO;
        animationGroup.beginTime = beginTime + i * 0.4f;
        animationGroup.repeatCount = HUGE_VALF;
        animationGroup.duration = 2.0f;
@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Danil Gontovnik. All rights reserved.
 //
-#import "DGActivityIndicatorAnimationProtocol.h"
+#import "DGActivityIndicatorAnimation.h"
-@interface DGActivityIndicatorTwoDotsAnimation : NSObject <DGActivityIndicatorAnimationProtocol>
+@interface DGActivityIndicatorTwoDotsAnimation: DGActivityIndicatorAnimation
@end
@@ -25,8 +25,7 @@
        circle.transform = CATransform3DMakeScale(0.0f, 0.0f, 0.0f);
        circle.backgroundColor = tintColor.CGColor;
-        CAKeyframeAnimation *transformAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform"];
+        CAKeyframeAnimation *transformAnimation = [self createKeyframeAnimationWithKeyPath:@"transform"];
        transformAnimation.removedOnCompletion = NO;
        transformAnimation.repeatCount = HUGE_VALF;
        transformAnimation.duration = 1.8f;
        transformAnimation.beginTime = beginTime - (transformAnimation.duration / 2.0f * i);
@@ -44,11 +44,27 @@
 static const CGFloat kDGActivityIndicatorDefaultSize = 40.0f;
@interface DGActivityIndicatorView () {
    CALayer *_animationLayer;
 }
@end
@implementation DGActivityIndicatorView
 #pragma mark -
 #pragma mark Constructors
 - (instancetype)initWithCoder:(NSCoder *)aDecoder {
    self = [super initWithCoder:aDecoder];
    if (self) {
        _tintColor = [UIColor whiteColor];
        _size = kDGActivityIndicatorDefaultSize;
        [self commonInit];
    }
    return self;
 }
 - (id)initWithType:(DGActivityIndicatorAnimationType)type {
    return [self initWithType:type tintColor:[UIColor whiteColor] size:kDGActivityIndicatorDefaultSize];
 }
@@ -63,6 +79,7 @@ static const CGFloat kDGActivityIndicatorDefaultSize = 40.0f;
        _type = type;
        _size = size;
        _tintColor = tintColor;
        [self commonInit];
    }
    return self;
 }
@@ -70,28 +87,41 @@ static const CGFloat kDGActivityIndicatorDefaultSize = 40.0f;
 #pragma mark -
 #pragma mark Methods
 - (void)commonInit {
    self.userInteractionEnabled = NO;
    self.hidden = YES;
    _animationLayer = [[CALayer alloc] init];
    [self.layer addSublayer:_animationLayer];
    [self setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal];
    [self setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical];
 }
 - (void)setupAnimation {
-    self.layer.sublayers = nil;
+    _animationLayer.sublayers = nil;
    id<DGActivityIndicatorAnimationProtocol> animation = [DGActivityIndicatorView activityIndicatorAnimationForAnimationType:_type];
    if ([animation respondsToSelector:@selector(setupAnimationInLayer:withSize:tintColor:)]) {
-        [animation setupAnimationInLayer:self.layer withSize:CGSizeMake(_size, _size) tintColor:_tintColor];
+        [animation setupAnimationInLayer:_animationLayer withSize:CGSizeMake(_size, _size) tintColor:_tintColor];
-        self.layer.speed = 0.0f;
+        _animationLayer.speed = 0.0f;
    }
 }
 - (void)startAnimating {
-    if (!self.layer.sublayers) {
+    if (!_animationLayer.sublayers) {
        [self setupAnimation];
    }
-    self.layer.speed = 1.0f;
+    self.hidden = NO;
    _animationLayer.speed = 1.0f;
    _animating = YES;
 }
 - (void)stopAnimating {
-    self.layer.speed = 0.0f;
+    _animationLayer.speed = 0.0f;
    _animating = NO;
    self.hidden = YES;
 }
 #pragma mark -
@@ -110,6 +140,7 @@ static const CGFloat kDGActivityIndicatorDefaultSize = 40.0f;
        _size = size;
        [self setupAnimation];
        [self invalidateIntrinsicContentSize];
    }
 }
@@ -117,8 +148,15 @@ static const CGFloat kDGActivityIndicatorDefaultSize = 40.0f;
    if (![_tintColor isEqual:tintColor]) {
        _tintColor = tintColor;
-        for (CALayer *sublayer in self.layer.sublayers) {
+        CGColorRef tintColorRef = tintColor.CGColor;
-            sublayer.backgroundColor = tintColor.CGColor;
+        for (CALayer *sublayer in _animationLayer.sublayers) {
            sublayer.backgroundColor = tintColorRef;
            if ([sublayer isKindOfClass:[CAShapeLayer class]]) {
                CAShapeLayer *shapeLayer = [[CAShapeLayer alloc] init];
                shapeLayer.strokeColor = tintColorRef;
                shapeLayer.fillColor = tintColorRef;
            }
        }
    }
 }
@@ -198,4 +236,27 @@ static const CGFloat kDGActivityIndicatorDefaultSize = 40.0f;
    return nil;
 }
 #pragma mark -
 #pragma mark Layout
 - (void)layoutSubviews {
    [super layoutSubviews];
    _animationLayer.frame = self.bounds;
    BOOL animating = _animating;
    if (animating)
        [self stopAnimating];
    [self setupAnimation];
    if (animating)
        [self startAnimating];
 }
 - (CGSize)intrinsicContentSize {
    return CGSizeMake(_size, _size);
 }
@end
@@ -15,9 +15,9 @@ Open and run the DGActivityIndicatorExample project in Xcode to see DGActivityIn
 ## Installation
-### Cocoapods
+### CocoaPods
-Install Cocoapods if it is not installed yet:
+Install CocoaPods if it is not installed yet:
 ``` bash
 $ [sudo] gem install cocoapods
@@ -1,3 +1,4 @@
 #import <CoreGraphics/CoreGraphics.h>
 #import <Expecta/Expecta.h>
 #import "ExpectaObject+FBSnapshotTest.h"
@@ -12,3 +13,6 @@ EXPMatcherInterface(recordSnapshot, (void));
 EXPMatcherInterface(haveValidSnapshotNamed, (NSString *snapshot));
 EXPMatcherInterface(recordSnapshotNamed, (NSString *snapshot));
 EXPMatcherInterface(haveValidSnapshotNamedWithTolerance, (NSString *snapshot, CGFloat tolerance));
 EXPMatcherInterface(haveValidSnapshotWithTolerance, (CGFloat tolerance));
@@ -18,13 +18,14 @@
    return instance;
 }
-+ (BOOL)compareSnapshotOfViewOrLayer:(id)viewOrLayer snapshot:(NSString *)snapshot testCase:(id)testCase record:(BOOL)record referenceDirectory:(NSString *)referenceDirectory error:(NSError **)error
+ (BOOL)compareSnapshotOfViewOrLayer:(id)viewOrLayer snapshot:(NSString *)snapshot testCase:(id)testCase record:(BOOL)record referenceDirectory:(NSString *)referenceDirectory tolerance:(CGFloat)tolerance error:(NSError **)error
 {
    FBSnapshotTestController *snapshotController = [[FBSnapshotTestController alloc] initWithTestClass:[testCase class]];
    snapshotController.recordMode = record;
    snapshotController.referenceImagesDirectory = referenceDirectory;
    snapshotController.usesDrawViewHierarchyInRect = [Expecta usesDrawViewHierarchyInRect];
    snapshotController.deviceAgnostic = [Expecta isDeviceAgnostic];
    if (! snapshotController.referenceImagesDirectory) {
        [NSException raise:@"Missing value for referenceImagesDirectory" format:@"Call [[EXPExpectFBSnapshotTest instance] setReferenceImagesDirectory"];
@@ -33,7 +34,7 @@
    return [snapshotController compareSnapshotOfViewOrLayer:viewOrLayer
                                                   selector:NSSelectorFromString(snapshot)
                                                 identifier:nil
-                                                  tolerance:0
+                                                  tolerance:tolerance
                                                      error:error];
 }
@@ -79,18 +80,36 @@ void setGlobalReferenceImageDir(char *reference) {
    NSString *testFileName = [NSString stringWithCString:self.fileName encoding:NSUTF8StringEncoding];
    NSArray *pathComponents = [testFileName pathComponents];
-    for (NSString *folder in pathComponents) {
+    NSString *firstFolderFound = nil;
    for (NSString *folder in pathComponents.reverseObjectEnumerator) {
        if ([folder.lowercaseString rangeOfString:@"tests"].location != NSNotFound) {
            NSArray *folderPathComponents = [pathComponents subarrayWithRange:NSMakeRange(0, [pathComponents indexOfObject:folder] + 1)];
-            return [NSString stringWithFormat:@"%@/ReferenceImages", [folderPathComponents componentsJoinedByString:@"/"]];
+            NSString *referenceImagesPath = [NSString stringWithFormat:@"%@/ReferenceImages", [folderPathComponents componentsJoinedByString:@"/"]];
            if (!firstFolderFound) {
                firstFolderFound = referenceImagesPath;
            }
            BOOL isDirectory = NO;
            BOOL referenceDirExists = [[NSFileManager defaultManager] fileExistsAtPath:referenceImagesPath isDirectory:&isDirectory];
            // if the folder exists, this is the reference dir for sure
            if (referenceDirExists && isDirectory) {
                return referenceImagesPath;
            }
        }
    }
    // if a reference folder wasn't found, we should create one
    if (firstFolderFound) {
        return firstFolderFound;
    }
    [NSException raise:@"Could not infer reference image folder" format:@"You should provide a reference dir using setGlobalReferenceImageDir(FB_REFERENCE_IMAGE_DIR);"];
    return nil;
 }
@end
@@ -114,11 +133,11 @@ NSString *sanitizedTestPath(){
    return name;
 }
-EXPMatcherImplementationBegin(haveValidSnapshot, (void)){
+EXPMatcherImplementationBegin(haveValidSnapshotWithTolerance, (CGFloat tolerance)){
    __block NSError *error = nil;
    prerequisite(^BOOL{
-        return actual;
+        return actual != nil;
    });
@@ -132,7 +151,7 @@ EXPMatcherImplementationBegin(haveValidSnapshot, (void)){
            actual = [actual view];
        }
-        return [EXPExpectFBSnapshotTest compareSnapshotOfViewOrLayer:actual snapshot:name testCase:[self testCase] record:NO referenceDirectory:referenceImageDir error:&error];
+        return [EXPExpectFBSnapshotTest compareSnapshotOfViewOrLayer:actual snapshot:name testCase:[self testCase] record:NO referenceDirectory:referenceImageDir tolerance:tolerance error:&error];
    });
    failureMessageForTo(^NSString *{
@@ -149,18 +168,22 @@ EXPMatcherImplementationBegin(haveValidSnapshot, (void)){
 }
 EXPMatcherImplementationEnd
 EXPMatcherImplementationBegin(haveValidSnapshot, (void)) {
    return self.haveValidSnapshotWithTolerance(0);
 }
 EXPMatcherImplementationEnd
 EXPMatcherImplementationBegin(recordSnapshot, (void)) {
    __block NSError *error = nil;
    BOOL actualIsViewLayerOrViewController = ([actual isKindOfClass:UIView.class] || [actual isKindOfClass:CALayer.class] || [actual isKindOfClass:UIViewController.class]);
    prerequisite(^BOOL{
-        return actual && actualIsViewLayerOrViewController;
+        return actual != nil && actualIsViewLayerOrViewController;
    });
    match(^BOOL{
        NSString *referenceImageDir = [self _getDefaultReferenceDirectory];
        // For view controllers do the viewWill/viewDid dance, then pass view through
        if ([actual isKindOfClass:UIViewController.class]) {
@@ -169,7 +192,7 @@ EXPMatcherImplementationBegin(recordSnapshot, (void)) {
            actual = [actual view];
        }
-        [EXPExpectFBSnapshotTest compareSnapshotOfViewOrLayer:actual snapshot:sanitizedTestPath() testCase:[self testCase] record:YES referenceDirectory:referenceImageDir error:&error];
+        [EXPExpectFBSnapshotTest compareSnapshotOfViewOrLayer:actual snapshot:sanitizedTestPath() testCase:[self testCase] record:YES referenceDirectory:referenceImageDir tolerance:0 error:&error];
        return NO;
    });
@@ -198,12 +221,12 @@ EXPMatcherImplementationBegin(recordSnapshot, (void)) {
 }
 EXPMatcherImplementationEnd
-EXPMatcherImplementationBegin(haveValidSnapshotNamed, (NSString *snapshot)){
+EXPMatcherImplementationBegin(haveValidSnapshotNamedWithTolerance, (NSString *snapshot, CGFloat tolerance)) {
    BOOL snapshotIsNil = (snapshot == nil);
    __block NSError *error = nil;
    prerequisite(^BOOL{
-        return actual && !(snapshotIsNil);
+        return actual != nil && !(snapshotIsNil);
    });
    match(^BOOL{
@@ -214,7 +237,7 @@ EXPMatcherImplementationBegin(haveValidSnapshotNamed, (NSString *snapshot)){
            actual = [actual view];
        }
-        return [EXPExpectFBSnapshotTest compareSnapshotOfViewOrLayer:actual snapshot:snapshot testCase:[self testCase] record:NO referenceDirectory:referenceImageDir error:&error];
+        return [EXPExpectFBSnapshotTest compareSnapshotOfViewOrLayer:actual snapshot:snapshot testCase:[self testCase] record:NO referenceDirectory:referenceImageDir tolerance:tolerance error:&error];
    });
    failureMessageForTo(^NSString *{
@@ -232,6 +255,11 @@ EXPMatcherImplementationBegin(haveValidSnapshotNamed, (NSString *snapshot)){
 }
 EXPMatcherImplementationEnd
 EXPMatcherImplementationBegin(haveValidSnapshotNamed, (NSString *snapshot)) {
    return self.haveValidSnapshotNamedWithTolerance(snapshot, 0);
 }
 EXPMatcherImplementationEnd
 EXPMatcherImplementationBegin(recordSnapshotNamed, (NSString *snapshot)) {
    BOOL snapshotExists = (snapshot != nil);
    BOOL actualIsViewLayerOrViewController = ([actual isKindOfClass:UIView.class] || [actual isKindOfClass:CALayer.class] || [actual isKindOfClass:UIViewController.class]);
@@ -239,12 +267,11 @@ EXPMatcherImplementationBegin(recordSnapshotNamed, (NSString *snapshot)) {
    id actualRef = actual;
    prerequisite(^BOOL{
-        return actualRef && snapshotExists && actualIsViewLayerOrViewController;
+        return actualRef != nil && snapshotExists && actualIsViewLayerOrViewController;
    });
    match(^BOOL{
        NSString *referenceImageDir = [self _getDefaultReferenceDirectory];
        // For view controllers do the viewWill/viewDid dance, then pass view through
        if ([actual isKindOfClass:UIViewController.class]) {
            [actual beginAppearanceTransition:YES animated:NO];
@@ -252,7 +279,7 @@ EXPMatcherImplementationBegin(recordSnapshotNamed, (NSString *snapshot)) {
            actual = [actual view];
        }
-        [EXPExpectFBSnapshotTest compareSnapshotOfViewOrLayer:actual snapshot:snapshot testCase:[self testCase] record:YES referenceDirectory:referenceImageDir error:&error];
+        [EXPExpectFBSnapshotTest compareSnapshotOfViewOrLayer:actual snapshot:snapshot testCase:[self testCase] record:YES referenceDirectory:referenceImageDir tolerance:0 error:&error];
        return NO;
    });
@@ -14,4 +14,8 @@
 + (BOOL)usesDrawViewHierarchyInRect;
 + (void)setDeviceAgnostic:(BOOL)deviceAgnostic;
 + (BOOL)isDeviceAgnostic;
@end
@@ -22,4 +22,15 @@ static NSString const *kUsesDrawViewHierarchyInRectKey = @"ExpectaObject+FBSnaps
    return usesDrawViewHierarchyInRect.boolValue;
 }
 + (void)setDeviceAgnostic:(BOOL)deviceAgnostic
 {
    objc_setAssociatedObject(self, @selector(isDeviceAgnostic), @(deviceAgnostic), OBJC_ASSOCIATION_ASSIGN);
 }
 + (BOOL)isDeviceAgnostic
 {
  NSNumber *isDeviceAgnostic = objc_getAssociatedObject(self, @selector(isDeviceAgnostic));
  return isDeviceAgnostic.boolValue;
 }
@end
@@ -3,7 +3,7 @@ Expecta Matchers for FBSnapshotTestCase
 [Expecta](https://github.com/specta/expecta) matchers for [ios-snapshot-test-case](https://github.com/facebook/ios-snapshot-test-case).
-[![Build Status](https://travis-ci.org/dblock/ios-snapshot-test-case-expecta.png)](https://travis-ci.org/dblock/ios-snapshot-test-case-expecta)
+[![Build Status](https://travis-ci.org/dblock/ios-snapshot-test-case-expecta.svg)](https://travis-ci.org/dblock/ios-snapshot-test-case-expecta)
 ### Usage
@@ -63,6 +63,15 @@ describe(@"test name derived matching", ^{
 SpecEnd
 ```
 ### Approximation support
 If for some reason you want to specify a tolerance for your test, you can use either named or unnamed matchers, where the `tolerance` parameter is a `CGFloat` in the interval `[0, 1]` and it represents the minimum ratio of unmatched points by the total number of points in your snapshot. In the example below, a tolerance of `0.01` means our `view` could be up to `1%` different from the reference image.
 ``` Objective-C
 expect(view).to.haveValidSnapshotWithTolerance(0.01);
 expect(view).to.haveValidSnapshotNamedWithTolerance(@"unique snapshot name", 0.01);
 ```
 ### Sane defaults
 `EXPMatchers+FBSnapshotTest` will automatically figure out the tests folder, and [add a reference image](https://github.com/dblock/ios-snapshot-test-case-expecta/blob/master/EXPMatchers%2BFBSnapshotTest.m#L84-L85) directory, if you'd like to override this, you should include a `beforeAll` block setting the `setGlobalReferenceImageDir` in each file containing tests.
@@ -9,9 +9,9 @@
 #ifndef Expecta_EXPDefines_h
 #define Expecta_EXPDefines_h
-typedef void (^EXPBasicBlock)();
+typedef void (^EXPBasicBlock)(void);
-typedef id (^EXPIdBlock)();
+typedef id (^EXPIdBlock)(void);
-typedef BOOL (^EXPBoolBlock)();
+typedef BOOL (^EXPBoolBlock)(void);
-typedef NSString *(^EXPStringBlock)();
+typedef NSString *(^EXPStringBlock)(void);
 #endif
@@ -10,6 +10,10 @@ EXPMatcherImplementationBegin(respondTo, (SEL expected)) {
  });
  match(^BOOL {
    if ([actual respondsToSelector:@selector(instancesRespondToSelector:)] &&
        [actual instancesRespondToSelector:expected]) {
      return YES;
    }
    return [actual respondsToSelector:expected];
  });
@@ -1,13 +1,8 @@
-#Expecta
+# Expecta [![Build Status](http://img.shields.io/travis/specta/expecta/master.svg?style=flat)](https://travis-ci.org/specta/expecta) [![Pod Version](http://img.shields.io/cocoapods/v/Expecta.svg?style=flat)](http://cocoadocs.org/docsets/Expecta/)
 [![Build Status](http://img.shields.io/travis/specta/expecta/master.svg?style=flat)](https://travis-ci.org/specta/expecta)
 [![Pod Version](http://img.shields.io/cocoapods/v/Expecta.svg?style=flat)](http://cocoadocs.org/docsets/Expecta/)
 [![Pod Platform](http://img.shields.io/cocoapods/p/Expecta.svg?style=flat)](http://cocoadocs.org/docsets/Expecta/)
 [![Pod License](http://img.shields.io/cocoapods/l/Expecta.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0.html)
 A matcher framework for Objective-C and Cocoa.
-## Introduction
+## FEATURES
 The main advantage of using Expecta over other matcher frameworks is that you do not have to specify the data types. Also, the syntax of Expecta matchers is much more readable and does not suffer from parenthesitis.
@@ -18,63 +13,10 @@ expect([bar isBar]).to.equal(YES);
 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/).
+Expecta is framework-agnostic: it works well with XCTest and XCTest-compatible test frameworks such as [Specta](http://github.com/petejkim/specta/), or [Kiwi](https://github.com/kiwi-bdd/Kiwi/).
-## Installation
+## MATCHERS
 You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [CocoaPods](http://github.com/CocoaPods/CocoaPods) or [completely manually](#setting-up-manually).
 ### Carthage
 1. Add Expecta to your project's `Cartfile.private`:
 	```ruby
 	github "specta/expecta" "master"
 	```
 2. Run `carthage update` in your project directory.
 3. Drag the appropriate **Expecta.framework** for your platform (located in `Carthage/Build/`) into your application’s Xcode project, and add it to your test target(s).
 ### CocoaPods
 1. Add Expecta to your project's `Podfile`:
 	```ruby
 	target :MyApp do
 	# Your app's dependencies
 	end
 	target :MyAppTests do
 	  pod 'Expecta', '~> 1.0.0'
 	end
 	```
 2. Run `pod update` or `pod install` in your project directory.
 ### Setting Up Manually
 1. Clone Expecta from Github.
 2. Run `rake` in your project directory to build the frameworks and libraries.
 3. Add a Cocoa or Cocoa Touch Unit Testing Bundle target to your Xcode project if you don't already have one.
 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 <Expecta/Expecta.h> // If you're using the static library, or the framework
 	```
 ## Built-in Matchers
 > `expect(x).to.equal(y);` compares objects or primitives x and y and passes if they are identical (==) or equivalent isEqual:).
@@ -132,13 +74,13 @@ You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [C
 > `expect(x).to.match(y);` passes if an instance of NSString `x` matches regular expression (given as NSString) `y` one or more times.
-## Inverting Matchers
+### Inverting Matchers
 Every matcher's criteria can be inverted by prepending `.notTo` or `.toNot`:
 >`expect(x).notTo.equal(y);` compares objects or primitives x and y and passes if they are *not* equivalent.
-## Asynchronous Testing
+### Asynchronous Testing
 Every matcher can be made to perform asynchronous testing by prepending `.will`, `.willNot` or `after(...)`:
@@ -172,14 +114,14 @@ describe(@"Foo", ^{
 });
 ```
-## Forced Failing
+### Forced Failing
 You can fail a test by using the `failure` attribute. This can be used to test branching.
 > `failure(@"This should not happen");` outright fails a test.
-## Writing New Matchers
+### WRITING NEW MATCHERS
 Writing a new matcher is easy with special macros provided by Expecta. Take a look at how `.beKindOf()` matcher is defined:
@@ -246,7 +188,7 @@ EXPMatcherImplementationBegin(beKindOf, (Class expected)) {
 EXPMatcherImplementationEnd
 ```
-## Dynamic Predicate Matchers
+## DYNAMIC PREDICATE MATCHERS
 It is possible to add predicate matchers by simply defining the matcher interface, with the matcher implementation being handled at runtime by delegating to the predicate method on your object.
@@ -282,6 +224,68 @@ You can now write your assertion as follows:
 expect(lightSwitch).isTurnedOn();
 ```
 ## INSTALLATION
 You can setup Expecta using [CocoaPods](http://github.com/CocoaPods/CocoaPods), [Carthage](https://github.com/Carthage/Carthage) or [completely manually](#setting-up-manually).
 ### CocoaPods
 1. Add Expecta to your project's `Podfile`:
 ```ruby
 target :MyApp do
 # your app dependencies
  target :MyAppTests do
    inherit! search_paths
    pod 'Expecta', '~> 1.0'
  end
 end
 ```
 ### Carthage
 1. Add Expecta to your project's `Cartfile.private`:
 	```ruby
 	github "specta/expecta" "master"
 	```
 2. Run `carthage update` in your project directory.
 3. Drag the appropriate **Expecta.framework** for your platform (located in `Carthage/Build/`) into your application’s Xcode project, and add it to your test target(s).
 2. Run `pod update` or `pod install` in your project directory.
 ### Setting Up Manually
 1. Clone Expecta from Github.
 2. Run `rake` in your project directory to build the frameworks and libraries.
 3. Add a Cocoa or Cocoa Touch Unit Testing Bundle target to your Xcode project if you don't already have one.
 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 <Expecta/Expecta.h> // If you're using the static library, or the framework
 	```
 ## STATUS
 Expecta, and Specta are considered done projects, 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) and [Nimble](https://github.com/quick/nimble).
 ## Contribution Guidelines
 * Please use only spaces and indent 2 spaces at a time.
@@ -290,4 +294,4 @@ expect(lightSwitch).isTurnedOn();
 ## 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/specta?tab=members). This software is licensed under the [MIT License](http://github.com/specta/specta/raw/master/LICENSE).
@@ -1,15 +0,0 @@
 framework module FBSnapshotTestCase {
  umbrella header "FBSnapshotTestCase.h"
  export *
  module * { export * }
  header "FBSnapshotTestCase.h"
  header "FBSnapshotTestCasePlatform.h"
  header "FBSnapshotTestController.h"
  private header "UIImage+Compare.h"
  private header "UIImage+Diff.h"
  private header "UIImage+Snapshot.h"
 }
@@ -62,43 +62,9 @@
 #define FBSnapshotVerifyViewOrLayerWithOptions(what__, viewOrLayer__, identifier__, suffixes__, tolerance__) \
 { \
-  NSString *referenceImageDirectory = [self getReferenceImageDirectoryWithDefault:(@ FB_REFERENCE_IMAGE_DIR)]; \
+  NSString *errorDescription = [self snapshotVerifyViewOrLayer:viewOrLayer__ identifier:identifier__ suffixes:suffixes__ tolerance:tolerance__]; \
-  XCTAssertNotNil(referenceImageDirectory, @"Missing value for referenceImagesDirectory - Set FB_REFERENCE_IMAGE_DIR as Environment variable in your scheme.");\
+  BOOL noErrors = (errorDescription == nil); \
-  XCTAssertTrue((suffixes__.count > 0), @"Suffixes set cannot be empty %@", suffixes__); \
+  XCTAssertTrue(noErrors, @"%@", errorDescription); \
  \
  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!"); \
 }
@@ -148,6 +114,19 @@
 - (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 viewOrLayer The UIView or CALayer 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 difference to still count as identical - 0 mean pixel perfect, 1 means I don't care
 @returns nil if the comparison (or saving of the reference image) succeeded. Otherwise it contains an error description.
 */
 - (NSString *)snapshotVerifyViewOrLayer:(id)viewOrLayer
                             identifier:(NSString *)identifier
                               suffixes:(NSOrderedSet *)suffixes
                              tolerance:(CGFloat)tolerance;
 /**
 Performs the comparison or records a snapshot of the layer if recordMode is YES.
 @param layer The Layer to snapshot
@@ -65,6 +65,62 @@
 #pragma mark - Public API
 - (NSString *)snapshotVerifyViewOrLayer:(id)viewOrLayer
                             identifier:(NSString *)identifier
                               suffixes:(NSOrderedSet *)suffixes
                              tolerance:(CGFloat)tolerance
 {
  if (nil == viewOrLayer) {
    return @"Object to be snapshotted must not be nil";
  }
  NSString *referenceImageDirectory = [self getReferenceImageDirectoryWithDefault:(@ FB_REFERENCE_IMAGE_DIR)];
  if (referenceImageDirectory == nil) {
    return @"Missing value for referenceImagesDirectory - Set FB_REFERENCE_IMAGE_DIR as Environment variable in your scheme.";
  }
  if (suffixes.count == 0) {
    return [NSString stringWithFormat:@"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 _compareSnapshotOfViewOrLayer: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 _compareSnapshotOfViewOrLayer:viewOrLayer referenceImagesDirectory:referenceImagesDirectory identifier:identifier tolerance:tolerance error:&error];
        [errors removeAllObjects];
        if (comparisonSuccess) {
          testSuccess = YES;
          break;
        } else {
          [errors addObject:error];
        }
      } else {
        [errors addObject:error];
      }
    }
  }
  if (!testSuccess) {
    return [NSString stringWithFormat:@"Snapshot comparison failed: %@", errors.firstObject];
  }
  if (self.recordMode) {
    return @"Test ran in record mode. Reference image is now saved. Disable record mode to perform an actual snapshot comparison!";
  }
  return nil;
 }
 - (BOOL)compareSnapshotOfLayer:(CALayer *)layer
      referenceImagesDirectory:(NSString *)referenceImagesDirectory
                    identifier:(NSString *)identifier
@@ -1,66 +0,0 @@
 /*
 *  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.
 *
 */
 public extension FBSnapshotTestCase {
  public func FBSnapshotVerifyView(view: UIView, identifier: String = "", suffixes: NSOrderedSet = FBSnapshotTestCaseDefaultSuffixes(), tolerance: CGFloat = 0, file: StaticString = #file, line: UInt = #line) {
    FBSnapshotVerifyViewOrLayer(view, identifier: identifier, suffixes: suffixes, tolerance: tolerance, file: file, line: line)
  }
  public func FBSnapshotVerifyLayer(layer: CALayer, identifier: String = "", suffixes: NSOrderedSet = FBSnapshotTestCaseDefaultSuffixes(), tolerance: CGFloat = 0, file: StaticString = #file, line: UInt = #line) {
    FBSnapshotVerifyViewOrLayer(layer, identifier: identifier, suffixes: suffixes, tolerance: tolerance, file: file, line: line)
  }
  private func FBSnapshotVerifyViewOrLayer(viewOrLayer: AnyObject, identifier: String = "", suffixes: NSOrderedSet = FBSnapshotTestCaseDefaultSuffixes(), tolerance: CGFloat = 0, file: StaticString = #file, line: UInt = #line) {
    let envReferenceImageDirectory = self.getReferenceImageDirectoryWithDefault(FB_REFERENCE_IMAGE_DIR)
    var error: NSError?
    var comparisonSuccess = false
    if let envReferenceImageDirectory = envReferenceImageDirectory {
      for suffix in suffixes {
        let referenceImagesDirectory = "\(envReferenceImageDirectory)\(suffix)"
        if viewOrLayer.isKindOfClass(UIView) {
          do {
            try compareSnapshotOfView(viewOrLayer as! UIView, referenceImagesDirectory: referenceImagesDirectory, identifier: identifier, tolerance: tolerance)
            comparisonSuccess = true
          } catch let error1 as NSError {
            error = error1
            comparisonSuccess = false
          }
        } else if viewOrLayer.isKindOfClass(CALayer) {
          do {
            try compareSnapshotOfLayer(viewOrLayer as! CALayer, referenceImagesDirectory: referenceImagesDirectory, identifier: identifier, tolerance: tolerance)
            comparisonSuccess = true
          } catch let error1 as NSError {
            error = error1
            comparisonSuccess = false
          }
        } else {
          assertionFailure("Only UIView and CALayer classes can be snapshotted")
        }
        assert(recordMode == false, message: "Test ran in record mode. Reference image is now saved. Disable record mode to perform an actual snapshot comparison!", file: file, line: line)
        if comparisonSuccess || recordMode {
          break
        }
        assert(comparisonSuccess, message: "Snapshot comparison failed: \(error)", file: file, line: line)
      }
    } else {
      XCTFail("Missing value for referenceImagesDirectory - Set FB_REFERENCE_IMAGE_DIR as Environment variable in your scheme.")
    }
  }
  func assert(assertion: Bool, message: String, file: StaticString, line: UInt) {
    if !assertion {
      XCTFail(message, file: file, line: line)
    }
  }
 }
@@ -0,0 +1 @@
 ../../../DGActivityIndicatorView/DGActivityIndicatorView/Animations/DGActivityIndicatorAnimation.h
@@ -0,0 +1 @@
 ../../../DGActivityIndicatorView/DGActivityIndicatorView/Animations/DGActivityIndicatorAnimation.h
@@ -0,0 +1 @@
 ../../../DGActivityIndicatorView/DGActivityIndicatorView/DGActivityIndicatorAnimationProtocol.h
@@ -0,0 +1 @@
 ../../../DGActivityIndicatorView/DGActivityIndicatorView/Animations/DGActivityIndicatorBallBeatAnimation.h
@@ -0,0 +1 @@
 ../../../DGActivityIndicatorView/DGActivityIndicatorView/Animations/DGActivityIndicatorBallClipRotateAnimation.h
@@ -0,0 +1 @@
 ../../../DGActivityIndicatorView/DGActivityIndicatorView/Animations/DGActivityIndicatorBallClipRotateMultipleAnimation.h
@@ -0,0 +1 @@
 ../../../DGActivityIndicatorView/DGActivityIndicatorView/Animations/DGActivityIndicatorBallClipRotatePulseAnimation.h
@@ -0,0 +1 @@
 ../../../DGActivityIndicatorView/DGActivityIndicatorView/Animations/DGActivityIndicatorBallGridBeatAnimation.h
@@ -0,0 +1 @@
 ../../../DGActivityIndicatorView/DGActivityIndicatorView/Animations/DGActivityIndicatorBallGridPulseAnimation.h
@@ -0,0 +1 @@
 ../../../DGActivityIndicatorView/DGActivityIndicatorView/Animations/DGActivityIndicatorBallPulseAnimation.h
@@ -0,0 +1 @@
 ../../../DGActivityIndicatorView/DGActivityIndicatorView/Animations/DGActivityIndicatorBallPulseSyncAnimation.h
@@ -0,0 +1 @@
 ../../../DGActivityIndicatorView/DGActivityIndicatorView/Animations/DGActivityIndicatorBallRotateAnimation.h
@@ -0,0 +1 @@
 ../../../DGActivityIndicatorView/DGActivityIndicatorView/Animations/DGActivityIndicatorBallScaleAnimation.h
		`@@ -0,0 +1 @@`
							`../../../DGActivityIndicatorView/DGActivityIndicatorView/Animations/DGActivityIndicatorAnimation.h`