Skip to content
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.

Sign up for GitHub

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/upload captured photo #13450

Merged
merged 7 commits into from
Jan 25, 2019
Merged

Rnmobile/upload captured photo #13450

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6fa13f
Added camera capture photo button
marecar3 Jan 23, 2019
bf73e5f
Assign the callback to camera capture button
marecar3 Jan 23, 2019
ab85615
Merge branch 'rnmobile/upload_media_file' into rnmobile/upload_captur…
marecar3 Jan 23, 2019
422f854
Merge branch 'rnmobile/upload_media_file' into rnmobile/upload_captur…
SergioEstevao Jan 24, 2019
8fbd60b
Merge branch 'rnmobile/upload_media_file' into rnmobile/upload_captur…
SergioEstevao Jan 24, 2019
32cc4d2
Merge branch 'rnmobile/upload_media_file' into rnmobile/upload_captur…
marecar3 Jan 25, 2019
2ff60af
Merge branch 'rnmobile/upload_media_file' into rnmobile/upload_captur…
SergioEstevao Jan 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions packages/block-library/src/image/edit.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
subscribeMediaUpload,
onMediaLibraryPressed,
onUploadMediaPressed,
onCapturePhotoPressed,
} from 'react-native-gutenberg-bridge';

/**
Expand Down Expand Up @@ -122,10 +123,20 @@ export default class ImageEdit extends React.Component {
} );
};

const onCapturePhotoButtonPressed = () => {
onCapturePhotoPressed( ( mediaId, mediaUri ) => {
if ( mediaUri ) {
this.addMediaUploadListener( );
setAttributes( { url: mediaUri, id: mediaId } );
}
} );
};

return (
<MediaPlaceholder
onUploadMediaPressed={ onUploadMediaButtonPressed }
onMediaLibraryPressed={ onMediaLibraryButtonPressed }
onCapturePhotoPressed={ onCapturePhotoButtonPressed }
/>
);
}
Expand Down
5 changes: 3 additions & 2 deletions packages/editor/src/components/media-placeholder/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ function MediaPlaceholder( props ) {
{ __( 'Upload a new image or select a file from your library.' ) }
</Text>
<View style={ styles.emptyStateButtonsContainer }>
<Button title={ __( 'Upload' ) } onPress={ props.onUploadMediaPressed } />
<Button title={ __( 'Media Library' ) } onPress={ props.onMediaLibraryPressed } />
<Button title={ __( 'Device Library' ) } onPress={ props.onUploadMediaPressed } />
<Button title={ __( 'Take photo' ) } onPress={ props.onCapturePhotoPressed } />
</View>
<Button title={ __( 'Media Library' ) } onPress={ props.onMediaLibraryPressed } />
</View>
);
}
Expand Down
1 change: 1 addition & 0 deletions packages/editor/src/components/media-placeholder/styles.native.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

.emptyStateButtonsContainer {
margin-top: 15;
margin-bottom: 15;
flex-direction: row;
justify-content: space-evenly;
width: 100%;
Expand Down