Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into cdz/64-75-image-lo…
Browse files Browse the repository at this point in the history 
…ading
  • Loading branch information
@cdzombak
cdzombak committed Oct 30, 2015
2 parents 655de7c + 5751193 commit 07eedb4
Show file tree
Hide file tree
Showing 16 changed files with 658 additions and 1,070 deletions.
24 changes: 0 additions & 24 deletions Example/NYTPhotoViewer.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,8 @@
B5DC9D871A9D326700F4F81F /* NYTPhotoViewControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5DC9D861A9D326700F4F81F /* NYTPhotoViewControllerTests.m */; };
B5DC9D891A9D35C500F4F81F /* NYTPhotoCaptionViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5DC9D881A9D35C500F4F81F /* NYTPhotoCaptionViewTests.m */; };
B5DC9D8B1A9F6C9800F4F81F /* NYTPhotosOverlayViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5DC9D8A1A9F6C9800F4F81F /* NYTPhotosOverlayViewTests.m */; };
B5DC9D8D1A9F771300F4F81F /* NYTOperatingSystemCompatibilityUtilityTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5DC9D8C1A9F771300F4F81F /* NYTOperatingSystemCompatibilityUtilityTests.m */; };
B5DC9D8F1A9F776100F4F81F /* NYTScalingImageViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5DC9D8E1A9F776100F4F81F /* NYTScalingImageViewTests.m */; };
B5DC9D911A9F793200F4F81F /* NYTPhotoTransitionAnimatorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5DC9D901A9F793200F4F81F /* NYTPhotoTransitionAnimatorTests.m */; };
B5DC9D941A9FAB3900F4F81F /* NYTTestiOS7TransitionContext.m in Sources */ = {isa = PBXBuildFile; fileRef = B5DC9D931A9FAB3900F4F81F /* NYTTestiOS7TransitionContext.m */; };
B5DC9D971A9FAB4800F4F81F /* NYTTestiOS8TransitionContext.m in Sources */ = {isa = PBXBuildFile; fileRef = B5DC9D961A9FAB4800F4F81F /* NYTTestiOS8TransitionContext.m */; };
B5DC9D9A1A9FB0C000F4F81F /* NYTPhotosDataSourceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B5DC9D991A9FB0C000F4F81F /* NYTPhotosDataSourceTests.m */; };
C2764961179EFD3A4397B4F6 /* libPods-NYTPhotoViewer-Swift.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C25ACCAFE75703E4107C21D /* libPods-NYTPhotoViewer-Swift.a */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -131,13 +128,8 @@
B5DC9D861A9D326700F4F81F /* NYTPhotoViewControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NYTPhotoViewControllerTests.m; sourceTree = "<group>"; };
B5DC9D881A9D35C500F4F81F /* NYTPhotoCaptionViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NYTPhotoCaptionViewTests.m; sourceTree = "<group>"; };
B5DC9D8A1A9F6C9800F4F81F /* NYTPhotosOverlayViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NYTPhotosOverlayViewTests.m; sourceTree = "<group>"; };
B5DC9D8C1A9F771300F4F81F /* NYTOperatingSystemCompatibilityUtilityTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NYTOperatingSystemCompatibilityUtilityTests.m; sourceTree = "<group>"; };
B5DC9D8E1A9F776100F4F81F /* NYTScalingImageViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NYTScalingImageViewTests.m; sourceTree = "<group>"; };
B5DC9D901A9F793200F4F81F /* NYTPhotoTransitionAnimatorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NYTPhotoTransitionAnimatorTests.m; sourceTree = "<group>"; };
B5DC9D921A9FAB3900F4F81F /* NYTTestiOS7TransitionContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NYTTestiOS7TransitionContext.h; sourceTree = "<group>"; };
B5DC9D931A9FAB3900F4F81F /* NYTTestiOS7TransitionContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NYTTestiOS7TransitionContext.m; sourceTree = "<group>"; };
B5DC9D951A9FAB4800F4F81F /* NYTTestiOS8TransitionContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NYTTestiOS8TransitionContext.h; sourceTree = "<group>"; };
B5DC9D961A9FAB4800F4F81F /* NYTTestiOS8TransitionContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NYTTestiOS8TransitionContext.m; sourceTree = "<group>"; };
B5DC9D991A9FB0C000F4F81F /* NYTPhotosDataSourceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NYTPhotosDataSourceTests.m; sourceTree = "<group>"; };
C260A188D0E255B25171088B /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
C3A795E41A9CE3AA00A5AF55 /* NYTPhotoViewer.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NYTPhotoViewer.podspec; path = ../NYTPhotoViewer.podspec; sourceTree = "<group>"; };
Expand Down Expand Up @@ -261,11 +253,9 @@
B5DC9D861A9D326700F4F81F /* NYTPhotoViewControllerTests.m */,
B5DC9D881A9D35C500F4F81F /* NYTPhotoCaptionViewTests.m */,
B5DC9D8A1A9F6C9800F4F81F /* NYTPhotosOverlayViewTests.m */,
B5DC9D8C1A9F771300F4F81F /* NYTOperatingSystemCompatibilityUtilityTests.m */,
B5DC9D8E1A9F776100F4F81F /* NYTScalingImageViewTests.m */,
B5DC9D901A9F793200F4F81F /* NYTPhotoTransitionAnimatorTests.m */,
B5DC9D991A9FB0C000F4F81F /* NYTPhotosDataSourceTests.m */,
B5DC9D981A9FAF6B00F4F81F /* Test Objects */,
6003F5B6195388D20070C39A /* Supporting Files */,
);
path = Tests;
Expand Down Expand Up @@ -344,17 +334,6 @@
name = "Common Resources";
sourceTree = "<group>";
};
B5DC9D981A9FAF6B00F4F81F /* Test Objects */ = {
isa = PBXGroup;
children = (
B5DC9D921A9FAB3900F4F81F /* NYTTestiOS7TransitionContext.h */,
B5DC9D931A9FAB3900F4F81F /* NYTTestiOS7TransitionContext.m */,
B5DC9D951A9FAB4800F4F81F /* NYTTestiOS8TransitionContext.h */,
B5DC9D961A9FAB4800F4F81F /* NYTTestiOS8TransitionContext.m */,
);
name = "Test Objects";
sourceTree = "<group>";
};
DC8AE5E7086B7FC6E4B5BE53 /* Pods */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -677,14 +656,11 @@
files = (
B5DC9D831A9D062900F4F81F /* NYTExamplePhoto.m in Sources */,
B5DC9D911A9F793200F4F81F /* NYTPhotoTransitionAnimatorTests.m in Sources */,
B5DC9D971A9FAB4800F4F81F /* NYTTestiOS8TransitionContext.m in Sources */,
B5DC9D9A1A9FB0C000F4F81F /* NYTPhotosDataSourceTests.m in Sources */,
B5DC9D841A9D092200F4F81F /* NYTViewController.m in Sources */,
B5DC9D8F1A9F776100F4F81F /* NYTScalingImageViewTests.m in Sources */,
B5DC9D821A9D04D300F4F81F /* NYTPhotosViewControllerTests.m in Sources */,
B5DC9D871A9D326700F4F81F /* NYTPhotoViewControllerTests.m in Sources */,
B5DC9D941A9FAB3900F4F81F /* NYTTestiOS7TransitionContext.m in Sources */,
B5DC9D8D1A9F771300F4F81F /* NYTOperatingSystemCompatibilityUtilityTests.m in Sources */,
B5DC9D8B1A9F6C9800F4F81F /* NYTPhotosOverlayViewTests.m in Sources */,
B5DC9D891A9D35C500F4F81F /* NYTPhotoCaptionViewTests.m in Sources */,
);
Expand Down
1 change: 0 additions & 1 deletion Example/Pods/Headers/Private/NYTPhotoViewer/NYTOperatingSystemCompatibilityUtility.h
View file

This file was deleted.

1 change: 0 additions & 1 deletion Example/Pods/Headers/Public/NYTPhotoViewer/NYTOperatingSystemCompatibilityUtility.h
View file

This file was deleted.

Loading

0 comments on commit 07eedb4

Please sign in to comment.