From 133559ff7a2357b030fe6aa840908dbe533e4d0e Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Tue, 28 Nov 2017 11:09:14 -0200 Subject: [PATCH] - Video modal removed - Temp thumb --- app/containers/message/Video.js | 47 ++++++++++++++++++++-------- app/containers/message/VideoModal.js | 44 -------------------------- 2 files changed, 34 insertions(+), 57 deletions(-) delete mode 100644 app/containers/message/VideoModal.js diff --git a/app/containers/message/Video.js b/app/containers/message/Video.js index 582eaf74c..05daa67b4 100644 --- a/app/containers/message/Video.js +++ b/app/containers/message/Video.js @@ -1,13 +1,25 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { View, Text, StyleSheet, TouchableOpacity } from 'react-native'; +import { View, StyleSheet, TouchableOpacity, Image } from 'react-native'; import { connect } from 'react-redux'; - -import VideoModal from './VideoModal'; +import Modal from 'react-native-modal'; +import VideoPlayer from 'react-native-video-controls'; const styles = StyleSheet.create({ container: { - flex: 1 + flex: 1, + height: 100, + margin: 5 + }, + modal: { + margin: 0, + backgroundColor: '#000' + }, + image: { + flex: 1, + width: null, + height: null, + resizeMode: 'contain' } }); @@ -26,32 +38,41 @@ export default class Video extends React.PureComponent { super(props); const { server, file, user } = this.props; this.state = { - modalVisible: false, + isVisible: false, uri: `${ server }${ file.video_url }?rc_uid=${ user.id }&rc_token=${ user.token }` }; } toggleModal() { this.setState({ - modalVisible: !this.state.modalVisible + isVisible: !this.state.isVisible }); } render() { - const { modalVisible, uri } = this.state; + const { isVisible, uri } = this.state; return ( this.toggleModal()} > - Open + - this.toggleModal()} - /> + + this.toggleModal()} + disableVolume + /> + ); } diff --git a/app/containers/message/VideoModal.js b/app/containers/message/VideoModal.js deleted file mode 100644 index 6ebb99543..000000000 --- a/app/containers/message/VideoModal.js +++ /dev/null @@ -1,44 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import Modal from 'react-native-modal'; -import VideoPlayer from 'react-native-video-controls'; - - -const styles = { - modal: { - margin: 0, - alignItems: 'center', - justifyContent: 'center', - backgroundColor: '#000' - } -}; -export default class extends React.PureComponent { - static propTypes = { - uri: PropTypes.string.isRequired, - isVisible: PropTypes.bool, - onClose: PropTypes.func.isRequired - } - - renderVideo() { - return ( - - ); - } - - render() { - const { isVisible } = this.props; - return ( - - {this.renderVideo()} - - ); - } -}