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

Merge pull request #80 from lbryio/background-play

Browse source 
added new setting to toggle background media play
This commit is contained in:
akinwale 2018-04-23 22:22:40 +01:00 committed by GitHub
commit 41becae272
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/component/mediaPlayer/index.js
View file

@ -1,7 +1,11 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { SETTINGS } from 'lbry-redux';
import { makeSelectClientSetting } from '../../redux/selectors/settings';
import MediaPlayer from './view'; import MediaPlayer from './view';
const select = state => ({}); const select = state => ({
backgroundPlayEnabled: makeSelectClientSetting(SETTINGS.BACKGROUND_PLAY_ENABLED)(state),
});
const perform = dispatch => ({}); const perform = dispatch => ({});
export default connect(select, perform)(MediaPlayer); export default connect(select, perform)(MediaPlayer);

4
app/src/component/mediaPlayer/view.js
View file

@ -243,7 +243,7 @@ class MediaPlayer extends React.PureComponent {
} }
render() { render() {
const { fileInfo, thumbnail, style, fullScreenStyle } = this.props; const { backgroundPlayEnabled, fileInfo, thumbnail, style, fullScreenStyle } = this.props;
const flexCompleted = this.getCurrentTimePercentage() * 100; const flexCompleted = this.getCurrentTimePercentage() * 100;
const flexRemaining = (1 - this.getCurrentTimePercentage()) * 100; const flexRemaining = (1 - this.getCurrentTimePercentage()) * 100;
@ -252,7 +252,7 @@ class MediaPlayer extends React.PureComponent {
<Video source={{ uri: 'file:///' + fileInfo.download_path }} <Video source={{ uri: 'file:///' + fileInfo.download_path }}
ref={(ref: Video) => { this.video = ref }} ref={(ref: Video) => { this.video = ref }}
resizeMode={this.state.resizeMode} resizeMode={this.state.resizeMode}
playInBackground={true} playInBackground={backgroundPlayEnabled}
style={mediaPlayerStyle.player} style={mediaPlayerStyle.player}
rate={this.state.rate} rate={this.state.rate}
volume={this.state.volume} volume={this.state.volume}

1
app/src/page/settings/index.js
View file

@ -5,6 +5,7 @@ import { makeSelectClientSetting } from '../../redux/selectors/settings';
import SettingsPage from './view'; import SettingsPage from './view';
const select = state => ({ const select = state => ({
backgroundPlayEnabled: makeSelectClientSetting(SETTINGS.BACKGROUND_PLAY_ENABLED)(state),
keepDaemonRunning: makeSelectClientSetting(SETTINGS.KEEP_DAEMON_RUNNING)(state), keepDaemonRunning: makeSelectClientSetting(SETTINGS.KEEP_DAEMON_RUNNING)(state),
showNsfw: makeSelectClientSetting(SETTINGS.SHOW_NSFW)(state), showNsfw: makeSelectClientSetting(SETTINGS.SHOW_NSFW)(state),
}); });

11
app/src/page/settings/view.js
View file

@ -11,6 +11,7 @@ class SettingsPage extends React.PureComponent {
render() { render() {
const { const {
backgroundPlayEnabled,
keepDaemonRunning, keepDaemonRunning,
showNsfw, showNsfw,
setClientSetting setClientSetting
@ -21,6 +22,16 @@ class SettingsPage extends React.PureComponent {
<PageHeader title={"Settings"} <PageHeader title={"Settings"}
onBackPressed={() => { this.props.navigation.goBack(); }} /> onBackPressed={() => { this.props.navigation.goBack(); }} />
<ScrollView style={settingsStyle.scrollContainer}> <ScrollView style={settingsStyle.scrollContainer}>
<View style={settingsStyle.row}>
<View style={settingsStyle.switchText}>
<Text style={settingsStyle.label}>Enable background media playback</Text>
<Text style={settingsStyle.description}>Enable this option to play audio or video in the background when the app is suspended.</Text>
</View>
<View style={settingsStyle.switchContainer}>
<Switch value={backgroundPlayEnabled} onValueChange={(value) => setClientSetting(SETTINGS.BACKGROUND_PLAY_ENABLED, value)} />
</View>
</View>
<View style={settingsStyle.row}> <View style={settingsStyle.row}>
<View style={settingsStyle.switchText}> <View style={settingsStyle.switchText}>
<Text style={settingsStyle.label}>Show NSFW content</Text> <Text style={settingsStyle.label}>Show NSFW content</Text>