Delete and Stop download button tweaks #221
6 changed files with 47 additions and 22 deletions
|
@ -1,6 +1,7 @@
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { Text, TouchableOpacity } from 'react-native';
|
import { Text, TouchableOpacity } from 'react-native';
|
||||||
import buttonStyle from '../../styles/button';
|
import buttonStyle from '../../styles/button';
|
||||||
|
import Colors from '../../styles/colors';
|
||||||
import Icon from 'react-native-vector-icons/FontAwesome';
|
import Icon from 'react-native-vector-icons/FontAwesome';
|
||||||
|
|
||||||
export default class Button extends React.PureComponent {
|
export default class Button extends React.PureComponent {
|
||||||
|
@ -10,6 +11,7 @@ export default class Button extends React.PureComponent {
|
||||||
style,
|
style,
|
||||||
text,
|
text,
|
||||||
icon,
|
icon,
|
||||||
|
theme,
|
||||||
onPress
|
onPress
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
|
@ -30,10 +32,16 @@ export default class Button extends React.PureComponent {
|
||||||
if (icon && icon.trim().length > 0) {
|
if (icon && icon.trim().length > 0) {
|
||||||
textStyles.push(buttonStyle.textWithIcon);
|
textStyles.push(buttonStyle.textWithIcon);
|
||||||
}
|
}
|
||||||
|
if (theme === 'light') {
|
||||||
|
textStyles.push(buttonStyle.textDark);
|
||||||
|
} else {
|
||||||
|
// Dark background, default
|
||||||
|
textStyles.push(buttonStyle.textLight);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TouchableOpacity disabled={disabled} style={styles} onPress={onPress}>
|
<TouchableOpacity disabled={disabled} style={styles} onPress={onPress}>
|
||||||
{icon && <Icon name={icon} size={18} color='#ffffff' class={buttonStyle.icon} /> }
|
{icon && <Icon name={icon} size={18} color={'light' === theme ? Colors.DarkGrey : Colors.White} />}
|
||||||
{text && (text.trim().length > 0) && <Text style={textStyles}>{text}</Text>}
|
{text && (text.trim().length > 0) && <Text style={textStyles}>{text}</Text>}
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
);
|
);
|
||||||
|
|
|
@ -3,7 +3,6 @@ import { Lbry, normalizeURI } from 'lbry-redux';
|
||||||
import {
|
import {
|
||||||
ActivityIndicator,
|
ActivityIndicator,
|
||||||
Alert,
|
Alert,
|
||||||
Button,
|
|
||||||
Dimensions,
|
Dimensions,
|
||||||
NativeModules,
|
NativeModules,
|
||||||
ScrollView,
|
ScrollView,
|
||||||
|
@ -16,6 +15,7 @@ import {
|
||||||
WebView
|
WebView
|
||||||
} from 'react-native';
|
} from 'react-native';
|
||||||
import ImageViewer from 'react-native-image-zoom-viewer';
|
import ImageViewer from 'react-native-image-zoom-viewer';
|
||||||
|
import Button from '../../component/button';
|
||||||
import Colors from '../../styles/colors';
|
import Colors from '../../styles/colors';
|
||||||
import ChannelPage from '../channel';
|
import ChannelPage from '../channel';
|
||||||
import FileDownloadButton from '../../component/fileDownloadButton';
|
import FileDownloadButton from '../../component/fileDownloadButton';
|
||||||
|
@ -332,9 +332,16 @@ class FilePage extends React.PureComponent {
|
||||||
|
|
||||||
{ showActions &&
|
{ showActions &&
|
||||||
<View style={filePageStyle.actions}>
|
<View style={filePageStyle.actions}>
|
||||||
{completed && <Button color="red" title="Delete" onPress={this.onDeletePressed} />}
|
{completed && <Button style={filePageStyle.actionButton}
|
||||||
|
theme={"light"}
|
||||||
|
icon={"trash"}
|
||||||
|
text={"Delete"}
|
||||||
|
onPress={this.onDeletePressed} />}
|
||||||
{!completed && fileInfo && !fileInfo.stopped && fileInfo.written_bytes < fileInfo.total_bytes &&
|
{!completed && fileInfo && !fileInfo.stopped && fileInfo.written_bytes < fileInfo.total_bytes &&
|
||||||
<Button color="red" title="Stop Download" onPress={this.onStopDownloadPressed} />
|
<Button style={filePageStyle.actionButton}
|
||||||
|
theme={"light"}
|
||||||
|
text={"Stop Download"}
|
||||||
|
onPress={this.onStopDownloadPressed} />
|
||||||
}
|
}
|
||||||
</View>}
|
</View>}
|
||||||
<ScrollView style={showActions ? filePageStyle.scrollContainerActions : filePageStyle.scrollContainer}>
|
<ScrollView style={showActions ? filePageStyle.scrollContainerActions : filePageStyle.scrollContainer}>
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import { StyleSheet } from 'react-native';
|
import { StyleSheet } from 'react-native';
|
||||||
|
import Colors from './colors';
|
||||||
|
|
||||||
const buttonStyle = StyleSheet.create({
|
const buttonStyle = StyleSheet.create({
|
||||||
button: {
|
button: {
|
||||||
|
@ -13,13 +14,21 @@ const buttonStyle = StyleSheet.create({
|
||||||
backgroundColor: '#999999'
|
backgroundColor: '#999999'
|
||||||
},
|
},
|
||||||
row: {
|
row: {
|
||||||
flexDirection: 'row',
|
flexDirection: 'row'
|
||||||
},
|
},
|
||||||
icon: {
|
iconLight: {
|
||||||
color: '#ffffff',
|
color: Colors.White,
|
||||||
|
},
|
||||||
|
iconDark: {
|
||||||
|
color: Colors.DarkGrey,
|
||||||
|
},
|
||||||
|
textLight: {
|
||||||
|
color: Colors.White,
|
||||||
|
},
|
||||||
|
textDark: {
|
||||||
|
color: Colors.DarkGrey
|
||||||
},
|
},
|
||||||
text: {
|
text: {
|
||||||
color: '#ffffff',
|
|
||||||
fontFamily: 'Metropolis-Regular',
|
fontFamily: 'Metropolis-Regular',
|
||||||
fontSize: 14
|
fontSize: 14
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
const Colors = {
|
const Colors = {
|
||||||
Black: '#000000',
|
Black: '#000000',
|
||||||
ChannelGrey: '#9b9b9b',
|
ChannelGrey: '#9b9b9b',
|
||||||
|
DarkGrey: '#555555',
|
||||||
DescriptionGrey: '#999999',
|
DescriptionGrey: '#999999',
|
||||||
LbryGreen: '#40b89a',
|
LbryGreen: '#40b89a',
|
||||||
LightGrey: '#cccccc',
|
LightGrey: '#cccccc',
|
||||||
|
|
|
@ -146,9 +146,9 @@ const filePageStyle = StyleSheet.create({
|
||||||
marginTop: -14,
|
marginTop: -14,
|
||||||
width: '50%',
|
width: '50%',
|
||||||
},
|
},
|
||||||
deleteButton: {
|
actionButton: {
|
||||||
backgroundColor: Colors.Red,
|
backgroundColor: Colors.White,
|
||||||
width: 80
|
width: 160
|
||||||
},
|
},
|
||||||
loading: {
|
loading: {
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
|
|
Loading…
Reference in a new issue