update button order

This commit is contained in:
Akinwale Ariwodola 2019-12-06 17:16:37 +01:00
parent cb4c6e1c4a
commit f2fe275e69
2 changed files with 55 additions and 22 deletions

View file

@ -597,6 +597,18 @@ class FilePage extends React.PureComponent {
setPlayerVisible(); setPlayerVisible();
}; };
onDownloadPressed = () => {
const { claim, costInfo, purchaseUri } = this.props;
this.setState(
{
downloadPressed: true,
autoPlayMedia: false,
stopDownloadConfirmed: false,
},
() => purchaseUri(claim.permanent_url, costInfo, true)
);
};
onBackButtonPressed = () => { onBackButtonPressed = () => {
const { navigation, drawerStack, popDrawerStack } = this.props; const { navigation, drawerStack, popDrawerStack } = this.props;
navigateBack(navigation, drawerStack, popDrawerStack); navigateBack(navigation, drawerStack, popDrawerStack);
@ -963,7 +975,7 @@ class FilePage extends React.PureComponent {
<View style={filePageStyle.largeButtonsRow}> <View style={filePageStyle.largeButtonsRow}>
<TouchableOpacity style={filePageStyle.largeButton} onPress={this.handleSharePress}> <TouchableOpacity style={filePageStyle.largeButton} onPress={this.handleSharePress}>
<Icon name={'share-alt'} size={20} style={filePageStyle.largeButtonIcon} /> <Icon name={'share-alt'} size={20} style={filePageStyle.largeButtonIcon} />
<Text style={filePageStyle.largeButtonText}>Share</Text> <Text style={filePageStyle.largeButtonText}>{__('Share')}</Text>
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity <TouchableOpacity
@ -971,39 +983,51 @@ class FilePage extends React.PureComponent {
onPress={() => this.setState({ showTipView: true })} onPress={() => this.setState({ showTipView: true })}
> >
<Icon name={'gift'} size={20} style={filePageStyle.largeButtonIcon} /> <Icon name={'gift'} size={20} style={filePageStyle.largeButtonIcon} />
<Text style={filePageStyle.largeButtonText}>Tip</Text> <Text style={filePageStyle.largeButtonText}>{__('Tip')}</Text>
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity <View style={filePageStyle.sharedLargeButton}>
style={filePageStyle.largeButton} {!isPlayable && !fileInfo && (
onPress={() => Linking.openURL(`https://lbry.com/dmca/${claim.claim_id}`)} <TouchableOpacity style={filePageStyle.innerLargeButton} onPress={this.onDownloadPressed}>
> <Icon name={'download'} size={20} style={filePageStyle.largeButtonIcon} />
<Icon name={'flag'} size={20} style={filePageStyle.largeButtonIcon} /> <Text style={filePageStyle.largeButtonText}>{__('Download')}</Text>
<Text style={filePageStyle.largeButtonText}>Report</Text>
</TouchableOpacity>
{canEdit && (
<TouchableOpacity style={filePageStyle.largeButton} onPress={this.onEditPressed}>
<Icon name={'edit'} size={20} style={filePageStyle.largeButtonIcon} />
<Text style={filePageStyle.largeButtonText}>Edit</Text>
</TouchableOpacity>
)}
{(completed || canEdit) && (
<TouchableOpacity style={filePageStyle.largeButton} onPress={this.onDeletePressed}>
<Icon name={'trash-alt'} size={20} style={filePageStyle.largeButtonIcon} />
<Text style={filePageStyle.largeButtonText}>Delete</Text>
</TouchableOpacity> </TouchableOpacity>
)} )}
{!completed && {!completed &&
fileInfo && fileInfo &&
!fileInfo.stopped && !fileInfo.stopped &&
fileInfo.written_bytes > 0 &&
fileInfo.written_bytes < fileInfo.total_bytes && fileInfo.written_bytes < fileInfo.total_bytes &&
!this.state.stopDownloadConfirmed && ( !this.state.stopDownloadConfirmed && (
<TouchableOpacity style={filePageStyle.largeButton} onPress={this.onStopDownloadPressed}> <TouchableOpacity style={filePageStyle.innerLargeButton} onPress={this.onStopDownloadPressed}>
<Icon name={'stop'} size={20} style={filePageStyle.largeButtonIcon} /> <Icon name={'stop'} size={20} style={filePageStyle.largeButtonIcon} />
<Text style={filePageStyle.largeButtonText}>Stop Download</Text> <Text style={filePageStyle.largeButtonText}>{__('Stop')}</Text>
</TouchableOpacity>
)}
</View>
{!canEdit && (
<TouchableOpacity
style={filePageStyle.largeButton}
onPress={() => Linking.openURL(`https://lbry.com/dmca/${claim.claim_id}`)}
>
<Icon name={'flag'} size={20} style={filePageStyle.largeButtonIcon} />
<Text style={filePageStyle.largeButtonText}>{__('Report')}</Text>
</TouchableOpacity>
)}
{canEdit && (
<TouchableOpacity style={filePageStyle.largeButton} onPress={this.onEditPressed}>
<Icon name={'edit'} size={20} style={filePageStyle.largeButtonIcon} />
<Text style={filePageStyle.largeButtonText}>{__('Edit')}</Text>
</TouchableOpacity>
)}
{(completed || canEdit) && (
<TouchableOpacity style={filePageStyle.largeButton} onPress={this.onDeletePressed}>
<Icon name={'trash-alt'} size={20} style={filePageStyle.largeButtonIcon} />
<Text style={filePageStyle.largeButtonText}>{__('Delete')}</Text>
</TouchableOpacity> </TouchableOpacity>
)} )}
</View> </View>

View file

@ -381,6 +381,15 @@ const filePageStyle = StyleSheet.create({
backButtonIcon: { backButtonIcon: {
color: Colors.White, color: Colors.White,
}, },
sharedLargeButton: {
alignItems: 'center',
justifyContent: 'center',
marginRight: 36,
},
innerLargeButton: {
alignItems: 'center',
justifyContent: 'center',
},
largeButton: { largeButton: {
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',