-
Notifications
You must be signed in to change notification settings - Fork 378
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implements animated GIF support #71
Merged
dzlobin
merged 17 commits into
nytimes:develop
from
atlassian:feature/animated-gif-support
Dec 4, 2015
Merged
Implements animated GIF support #71
dzlobin
merged 17 commits into
nytimes:develop
from
atlassian:feature/animated-gif-support
Dec 4, 2015
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…on ViewController
…when not using ANIMATED_GIF_SUPPORT
…hen `imageData` is set
Conflicts: Example/NYTPhotoViewer.xcodeproj/project.pbxproj Pod/Classes/ios/NYTPhotoViewController.m Pod/Classes/ios/NYTPhotosViewController.m Pod/Classes/ios/NYTScalingImageView.m
Conflicts: Example/NYTPhotoViewer.xcodeproj/project.pbxproj Example/Podfile Example/Podfile.lock Example/Pods/Local Podspecs/NYTPhotoViewer.podspec.json Example/Pods/Manifest.lock Example/Pods/Pods.xcodeproj/project.pbxproj Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/NYTPhotoViewer.xcscheme Example/Pods/Target Support Files/FLAnimatedImage/FLAnimatedImage-prefix.pch Example/Pods/Target Support Files/NYTPhotoViewer/NYTPhotoViewer-Private.xcconfig Example/Pods/Target Support Files/NYTPhotoViewer/NYTPhotoViewer-prefix.pch Example/Pods/Target Support Files/NYTPhotoViewer/NYTPhotoViewer.xcconfig Example/Pods/Target Support Files/OCMock/OCMock-Private.xcconfig Example/Pods/Target Support Files/OCMock/OCMock-prefix.pch Example/Pods/Target Support Files/Pods-NYTPhotoViewer-Swift/Pods-NYTPhotoViewer-Swift-resources.sh Example/Pods/Target Support Files/Pods-NYTPhotoViewer-Swift/Pods-NYTPhotoViewer-Swift.debug.xcconfig Example/Pods/Target Support Files/Pods-NYTPhotoViewer-Swift/Pods-NYTPhotoViewer-Swift.release.xcconfig Example/Pods/Target Support Files/Pods-NYTPhotoViewer-SwiftTests/Pods-NYTPhotoViewer-SwiftTests-resources.sh Example/Pods/Target Support Files/Pods-NYTPhotoViewer-SwiftTests/Pods-NYTPhotoViewer-SwiftTests.debug.xcconfig Example/Pods/Target Support Files/Pods-NYTPhotoViewer-SwiftTests/Pods-NYTPhotoViewer-SwiftTests.release.xcconfig Example/Pods/Target Support Files/Pods-NYTPhotoViewer/Pods-NYTPhotoViewer-resources.sh Example/Pods/Target Support Files/Pods-NYTPhotoViewer/Pods-NYTPhotoViewer.debug.xcconfig Example/Pods/Target Support Files/Pods-NYTPhotoViewer/Pods-NYTPhotoViewer.release.xcconfig Example/Pods/Target Support Files/Pods-Tests-NYTPhotoViewer/Pods-Tests-NYTPhotoViewer-prefix.pch Example/Pods/Target Support Files/Pods-Tests-OCMock/Pods-Tests-OCMock-prefix.pch Example/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh Example/Pods/Target Support Files/Pods-Tests/Pods-Tests.debug.xcconfig Example/Pods/Target Support Files/Pods-Tests/Pods-Tests.release.xcconfig Example/Tests/NYTPhotosViewControllerTests.m NYTPhotoViewer.podspec Pod/Classes/ios/NYTPhotosViewController.m
Merging in develop, so we can get the GIF support PR merged in the base repo.
7babc82
to
de81f65
Compare
…iss-transition Fix animated gif does not animate to reference view on dismissal
@@ -42,6 +42,7 @@ - (void)testSingleTapGestureRecognizerHasAssociatedViewAfterViewDidLoad { | |||
|
|||
- (void)testPageViewControllerExistsAfterInitialization { | |||
NYTPhotosViewController *photosViewController = [[NYTPhotosViewController alloc] initWithPhotos:[self newTestPhotos]]; | |||
[photosViewController viewDidLoad]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[Minor] Would you mind dropping a newline between these last two lines?
@kimar I'll actually address those minor changes in a separate PR; this is good to go. |
dzlobin
added a commit
that referenced
this pull request
Dec 4, 2015
Implements animated GIF support
kimar
pushed a commit
to atlassian/NYTPhotoViewer
that referenced
this pull request
Dec 6, 2015
Merged
How can I load gif in NYTPhotoViewer? Is there any documentation? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hey guys, I've invested some time adding animated GIF support, as this topic is more than trivial I expect this PR to get lively and thing be subject to change.
There is one change which requires the user to add one more property to his
NYTPhoto
conform object, namelyimageData
. This property can be used together withimage
to specify an image to be shown. Other thanimage
it does not hold anUIImage
but aNSData
representation of the image. This is important forFLAnimatedImage
to recognize the GIF correctly and display it.I’ve added two subspecs to the Podspec:
By default (e.g. when just using
pod ‘NYTPhotoViewer’
) theCore
subspec is used.I hop we can start working on this PR, I’d be pleased to get some early feedback so we can get things clean. Looking forward to it.
Cheers,
Marcus