-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
[RNMobile] Added support for giphy and pexels images #18026
Merged
marecar3
merged 17 commits into
master
from
rnmobile/issue/720_pexels-and-giphy-search-not-available-from-image-block
Oct 29, 2019
Merged
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
060069c
Added method for fetch media options per type
marecar3 b7d67bd
Merge branch 'master' into rnmobile/issue/720_pexels-and-giphy-search…
marecar3 e00309b
Merge branch 'master' into rnmobile/issue/720_pexels-and-giphy-search…
marecar3 6a28739
Add proper icons for Giphy and Pexels bottom sheet cells
marecar3 786d9e8
Add mock functions
marecar3 1bcce09
Merge branch 'master' into rnmobile/issue/720_pexels-and-giphy-search…
marecar3 8f9b66a
Center media inside media&text component
marecar3 0067d14
Merge branch 'master' into rnmobile/issue/720_pexels-and-giphy-search…
marecar3 c0f88da
Fix typo in requestOtherMediaPickFrom
marecar3 f7c0f42
Fix lint error
marecar3 bc4d7dd
Fixed lint errors
marecar3 288c96a
Fix lint
marecar3 95d013c
Merge branch 'master' into rnmobile/issue/720_pexels-and-giphy-search…
marecar3 854a85a
Temp fix for broken rn/master
marecar3 2a01169
Merge branch 'master' into rnmobile/issue/720_pexels-and-giphy-search…
marecar3 5c734d6
Merge branch 'master' into rnmobile/issue/720_pexels-and-giphy-search…
marecar3 f7f82f8
Fix typo
marecar3 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 |
---|---|---|
|
@@ -164,14 +164,16 @@ class MediaContainer extends Component { | |
const { finalWidth, finalHeight, imageWidthWithinContainer, isUploadFailed, retryMessage } = params; | ||
const opacity = isUploadInProgress ? 0.3 : 1; | ||
|
||
const conttentStyle = ! imageWidthWithinContainer ? styles.content : styles.contentCentered; | ||
|
||
return ( | ||
<TouchableWithoutFeedback | ||
accessible={ ! isSelected } | ||
onPress={ this.onMediaPressed } | ||
onLongPress={ openMediaOptions } | ||
disabled={ ! isSelected } | ||
> | ||
<View style={ styles.content }> | ||
<View style={ conttentStyle }> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. See above "conttentStyle" There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Tnx! Fixed! |
||
{ ! imageWidthWithinContainer && | ||
<View style={ styles.imageContainer }> | ||
{ this.getIcon( false ) } | ||
|
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
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.
extra t: "conttentStyle" => "contentStyle"
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.
Tnx! Fixed!