-
Notifications
You must be signed in to change notification settings - Fork 24
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
Support video in the picker #44
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b225632
Add media type options support for image and video
amelia2801 d17c0a8
Add video icon and duration
amelia2801 d78c367
Show hour unit only if necessary
amelia2801 8d010d0
Move icon to the right assets folder
amelia2801 97d1b62
Update header file
amelia2801 9906e51
Update colors
amelia2801 362075d
Use OptionSet to define ImagePickerMediaType
amelia2801 7f7eeb0
Subclass GalleryPhotoCell to support video cell
amelia2801 7924ab7
Minor code adjustments
amelia2801 c4ee19a
Update CHANGELOG.md
amelia2801 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "info" : { | ||
| "version" : 1, | ||
| "author" : "xcode" | ||
| } | ||
| } |
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
12 changes: 12 additions & 0 deletions
12
Pickle/Assets/Images.xcassets/video-icon.imageset/Contents.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "universal", | ||
| "filename" : "video-icon.pdf" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "version" : 1, | ||
| "author" : "xcode" | ||
| } | ||
| } |
Binary file not shown.
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| // | ||
| // This source file is part of the carousell/pickle open source project | ||
| // | ||
| // Copyright © 2017 Carousell and the project authors | ||
| // Licensed under Apache License v2.0 | ||
| // | ||
| // See https://github.com/carousell/pickle/blob/master/LICENSE for license information | ||
| // See https://github.com/carousell/pickle/graphs/contributors for the list of project authors | ||
| // | ||
|
|
||
| import UIKit | ||
| import Photos | ||
|
|
||
| internal final class GalleryVideoCell: GalleryPhotoCell { | ||
|
|
||
| private let videoPropertyView = VideoPropertyView() | ||
|
|
||
| override func setUpSubviews() { | ||
| super.setUpSubviews() | ||
|
|
||
| contentView.addSubview(videoPropertyView) | ||
| videoPropertyView.translatesAutoresizingMaskIntoConstraints = false | ||
| videoPropertyView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor).isActive = true | ||
| videoPropertyView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor).isActive = true | ||
| videoPropertyView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor).isActive = true | ||
| videoPropertyView.heightAnchor.constraint(equalToConstant: 24).isActive = true | ||
| } | ||
|
|
||
| override func configure( | ||
| with asset: PHAsset, | ||
| taggedText: String? = nil, | ||
| configuration: ImagePickerConfigurable?) { | ||
|
|
||
| super.configure( | ||
| with: asset, | ||
| taggedText: taggedText, | ||
| configuration: configuration) | ||
|
|
||
| videoPropertyView.configure(duration: asset.duration) | ||
| videoPropertyView.setSelected(taggedText != nil) | ||
| } | ||
| } |
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
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
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
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
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
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
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
Oops, something went wrong.
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.
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.
There's already a
darkGray, perhaps it needs a different name?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.
I just noticed that
0x8F939Cis duplicated for lightGray, gray, and darkGray 😂So, I removed darkGray to be replaced with darkGrey.
Also, renamed other "gray" to "grey" to follow UK spelling