Skip to content

Commit

Permalink
Merge a50f2ed into 1ed9b2a
Browse files Browse the repository at this point in the history
  • Loading branch information
@lauraskelton
lauraskelton committed Jun 19, 2015
2 parents 1ed9b2a + a50f2ed commit d19a854
Show file tree
Hide file tree
Showing 463 changed files with 7,504 additions and 9,427 deletions.
Binary file added Example/Docs/if-intro.gif
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 26 additions & 4 deletions Example/JazzHandsDemo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@
445B9E227A691EC342AEEDE2 /* libPods-JazzHandsDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BB1EAF4CD1F4A61D2DBBB695 /* libPods-JazzHandsDemo.a */; };
8A7331363E195DEE4B479A7E /* libPods-JazzHandsTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C9147A8A9689CEBCB4A91E3C /* libPods-JazzHandsTests.a */; };
E973270D1A58922500AD6E55 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = E97327091A58922500AD6E55 /* InfoPlist.strings */; };
E973270F1A58922500AD6E55 /* JazzHandsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E973270C1A58922500AD6E55 /* JazzHandsTests.m */; };
FA5899DE1B3370CC008663B0 /* IFTTTFilmstripSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = FA5899DD1B3370CC008663B0 /* IFTTTFilmstripSpec.m */; };
FA5899E11B3372C5008663B0 /* MyCustomAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = FA5899E01B3372C5008663B0 /* MyCustomAnimation.m */; };
FA5899E31B338313008663B0 /* IFTTTEasingFunctionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = FA5899E21B338313008663B0 /* IFTTTEasingFunctionSpec.m */; };
FA5899E51B338612008663B0 /* IFTTTAnimationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = FA5899E41B338612008663B0 /* IFTTTAnimationSpec.m */; };
FA5899E71B3391C7008663B0 /* IFTTTInterpolatableSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = FA5899E61B3391C7008663B0 /* IFTTTInterpolatableSpec.m */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -59,8 +63,13 @@
C9147A8A9689CEBCB4A91E3C /* libPods-JazzHandsTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JazzHandsTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
E973270A1A58922500AD6E55 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
E973270B1A58922500AD6E55 /* JazzHandsTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "JazzHandsTests-Info.plist"; sourceTree = "<group>"; };
E973270C1A58922500AD6E55 /* JazzHandsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JazzHandsTests.m; sourceTree = "<group>"; };
F06E890A963B4A1A460670D4 /* Pods-JazzHandsTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JazzHandsTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-JazzHandsTests/Pods-JazzHandsTests.release.xcconfig"; sourceTree = "<group>"; };
FA5899DD1B3370CC008663B0 /* IFTTTFilmstripSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IFTTTFilmstripSpec.m; sourceTree = "<group>"; };
FA5899DF1B3372C5008663B0 /* MyCustomAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyCustomAnimation.h; sourceTree = "<group>"; };
FA5899E01B3372C5008663B0 /* MyCustomAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyCustomAnimation.m; sourceTree = "<group>"; };
FA5899E21B338313008663B0 /* IFTTTEasingFunctionSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IFTTTEasingFunctionSpec.m; sourceTree = "<group>"; };
FA5899E41B338612008663B0 /* IFTTTAnimationSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IFTTTAnimationSpec.m; sourceTree = "<group>"; };
FA5899E61B3391C7008663B0 /* IFTTTInterpolatableSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IFTTTInterpolatableSpec.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -129,6 +138,8 @@
03063F1D17F5FC61007D7A97 /* IFTTTJazzHandsViewController.m */,
03063EDD17F5FAAD007D7A97 /* IFTTTJazzHandsAppDelegate.h */,
03063EDE17F5FAAD007D7A97 /* IFTTTJazzHandsAppDelegate.m */,
FA5899DF1B3372C5008663B0 /* MyCustomAnimation.h */,
FA5899E01B3372C5008663B0 /* MyCustomAnimation.m */,
03063EE017F5FAAD007D7A97 /* Images.xcassets */,
03063ED517F5FAAD007D7A97 /* Supporting Files */,
);
Expand Down Expand Up @@ -162,7 +173,10 @@
E97327081A58922500AD6E55 /* JazzHandsTests */ = {
isa = PBXGroup;
children = (
E973270C1A58922500AD6E55 /* JazzHandsTests.m */,
FA5899E41B338612008663B0 /* IFTTTAnimationSpec.m */,
FA5899E21B338313008663B0 /* IFTTTEasingFunctionSpec.m */,
FA5899DD1B3370CC008663B0 /* IFTTTFilmstripSpec.m */,
FA5899E61B3391C7008663B0 /* IFTTTInterpolatableSpec.m */,
E97327091A58922500AD6E55 /* InfoPlist.strings */,
E973270B1A58922500AD6E55 /* JazzHandsTests-Info.plist */,
);
Expand Down Expand Up @@ -335,14 +349,18 @@
03063EDF17F5FAAD007D7A97 /* IFTTTJazzHandsAppDelegate.m in Sources */,
03063F1F17F5FC61007D7A97 /* IFTTTJazzHandsViewController.m in Sources */,
03063EDB17F5FAAD007D7A97 /* main.m in Sources */,
FA5899E11B3372C5008663B0 /* MyCustomAnimation.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
03063EE217F5FAAD007D7A97 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
E973270F1A58922500AD6E55 /* JazzHandsTests.m in Sources */,
FA5899E71B3391C7008663B0 /* IFTTTInterpolatableSpec.m in Sources */,
FA5899DE1B3370CC008663B0 /* IFTTTFilmstripSpec.m in Sources */,
FA5899E51B338612008663B0 /* IFTTTAnimationSpec.m in Sources */,
FA5899E31B338313008663B0 /* IFTTTEasingFunctionSpec.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -485,8 +503,10 @@
GCC_WARN_UNKNOWN_PRAGMAS = YES;
GCC_WARN_UNUSED_LABEL = YES;
INFOPLIST_FILE = "JazzHandsDemo/JazzHandsDemo-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
PRODUCT_NAME = "$(TARGET_NAME)";
RUN_CLANG_STATIC_ANALYZER = YES;
TARGETED_DEVICE_FAMILY = "1,2";
WARNING_CFLAGS = (
"-Wpointer-arith",
"-Winit-self",
Expand Down Expand Up @@ -534,8 +554,10 @@
GCC_WARN_UNKNOWN_PRAGMAS = YES;
GCC_WARN_UNUSED_LABEL = YES;
INFOPLIST_FILE = "JazzHandsDemo/JazzHandsDemo-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
PRODUCT_NAME = "$(TARGET_NAME)";
RUN_CLANG_STATIC_ANALYZER = YES;
TARGETED_DEVICE_FAMILY = "1,2";
WARNING_CFLAGS = (
"-Wpointer-arith",
"-Winit-self",
Expand Down
2 changes: 1 addition & 1 deletion Example/JazzHandsDemo/IFTTTJazzHandsViewController.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

#import "IFTTTJazzHands.h"

@interface IFTTTJazzHandsViewController : IFTTTAnimatedScrollViewController <IFTTTAnimatedScrollViewControllerDelegate>
@interface IFTTTJazzHandsViewController : IFTTTAnimatedPagingScrollViewController

@end

0 comments on commit d19a854

Please sign in to comment.