From 7d2617e9dc2b4e6f9d62cc70ab5c320b08dcd40c Mon Sep 17 00:00:00 2001 From: Daniel Dominguez Date: Thu, 31 May 2018 22:38:30 -0300 Subject: [PATCH] Add play/pause and return to claim page buttons. --- src/renderer/component/videoOverlay/index.js | 9 +++++- src/renderer/component/videoOverlay/view.jsx | 34 ++++++++++++++++---- src/renderer/constants/icons.js | 3 ++ src/renderer/scss/component/_overlay.scss | 31 ++++++++++++------ 4 files changed, 60 insertions(+), 17 deletions(-) diff --git a/src/renderer/component/videoOverlay/index.js b/src/renderer/component/videoOverlay/index.js index 09574a725..c6ad66ceb 100644 --- a/src/renderer/component/videoOverlay/index.js +++ b/src/renderer/component/videoOverlay/index.js @@ -1,14 +1,21 @@ import { connect } from 'react-redux'; import { selectPlayingUri } from 'redux/selectors/content'; -import { doSetPlayingUri } from 'redux/actions/content'; +import { doSetPlayingUri, doPlayUri } from 'redux/actions/content'; +import { doNavigate } from 'redux/actions/navigation'; +import { doPlay, doPause } from 'redux/actions/media'; +import { selectMediaPaused } from 'redux/selectors/media'; import VideoOverlay from './view'; const select = state => ({ playingUri: selectPlayingUri(state), + mediaPaused: selectMediaPaused(state), }); const perform = dispatch => ({ + navigate: (path, params) => dispatch(doNavigate(path, params)), cancelPlay: () => dispatch(doSetPlayingUri(null)), + play: uri => dispatch(doPlayUri(uri)), + doPause: () => dispatch(doPause()), }); export default connect(select, perform)(VideoOverlay); diff --git a/src/renderer/component/videoOverlay/view.jsx b/src/renderer/component/videoOverlay/view.jsx index 9444100ef..1bc7eb9da 100644 --- a/src/renderer/component/videoOverlay/view.jsx +++ b/src/renderer/component/videoOverlay/view.jsx @@ -2,25 +2,45 @@ import React from 'react'; import Video from 'component/video'; import Overlay from 'component/overlay'; -import VideoOverlayHeader from '../videoOverlayHeader'; +import VideoOverlayHeader from 'component/videoOverlayHeader'; +import Button from 'component/button'; +import * as icons from 'constants/icons'; type Props = { + play: () => void, cancelPlay: () => void, + navigate: (string, ?{}) => void, playingUri: ?string, + play: (string) => void, + doPause: () => void, + mediaPaused: boolean, }; class VideoOverlay extends React.Component { + renderPlayOrPauseButton() { + const { mediaPaused, doPause, play, playingUri } = this.props; + if (mediaPaused) { + return