LBRYCommunity/lbry-fdroid
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #480 from lbryio/playable-content

Browse source 
fix Play icon being displayed for non-playable content
This commit is contained in:
Akinwale Ariwodola 2019-03-15 11:58:28 +01:00 committed by GitHub
commit 81dca20b17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
app/src/page/file/view.js
View file

@ -511,30 +511,32 @@ class FilePage extends React.PureComponent {
onStartDownloadFailed={this.startDownloadFailed} />} onStartDownloadFailed={this.startDownloadFailed} />}
{!fileInfo && <FilePrice uri={uri} style={filePageStyle.filePriceContainer} textStyle={filePageStyle.filePriceText} />} {!fileInfo && <FilePrice uri={uri} style={filePageStyle.filePriceContainer} textStyle={filePageStyle.filePriceText} />}
</View> </View>
{canLoadMedia && fileInfo && <View style={playerBgStyle} {(canLoadMedia && fileInfo && isPlayable) &&
ref={(ref) => { this.playerBackground = ref; }} <View style={playerBgStyle}
onLayout={(evt) => { ref={(ref) => { this.playerBackground = ref; }}
if (!this.state.playerBgHeight) { onLayout={(evt) => {
this.setState({ playerBgHeight: evt.nativeEvent.layout.height }); if (!this.state.playerBgHeight) {
} this.setState({ playerBgHeight: evt.nativeEvent.layout.height });
}} />} }
{canLoadMedia && fileInfo && <MediaPlayer }} />}
fileInfo={fileInfo} {(canLoadMedia && fileInfo && isPlayable) &&
assignPlayer={(ref) => { this.player = ref; }} <MediaPlayer
uri={uri} fileInfo={fileInfo}
style={playerStyle} assignPlayer={(ref) => { this.player = ref; }}
autoPlay={autoplay || this.state.autoPlayMedia} uri={uri}
onFullscreenToggled={this.handleFullscreenToggle} style={playerStyle}
onLayout={(evt) => { autoPlay={autoplay || this.state.autoPlayMedia}
if (!this.state.playerHeight) { onFullscreenToggled={this.handleFullscreenToggle}
this.setState({ playerHeight: evt.nativeEvent.layout.height }); onLayout={(evt) => {
} if (!this.state.playerHeight) {
}} this.setState({ playerHeight: evt.nativeEvent.layout.height });
onMediaLoaded={() => this.onMediaLoaded(channelName, title, uri)} }
onPlaybackStarted={this.onPlaybackStarted} }}
onPlaybackFinished={this.onPlaybackFinished} onMediaLoaded={() => this.onMediaLoaded(channelName, title, uri)}
thumbnail={metadata.thumbnail} onPlaybackStarted={this.onPlaybackStarted}
/>} onPlaybackFinished={this.onPlaybackFinished}
thumbnail={metadata.thumbnail}
/>}
{showActions && {showActions &&
<View style={filePageStyle.actions}> <View style={filePageStyle.actions}>

1
app/src/styles/filePage.js
View file

@ -139,6 +139,7 @@ const filePageStyle = StyleSheet.create({
}, },
containedPlayerBackground: { containedPlayerBackground: {
width: '100%', width: '100%',
marginTop: 60,
height: containedMediaHeight, height: containedMediaHeight,
}, },
fullscreenPlayerBackground: { fullscreenPlayerBackground: {