Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
47bb996342 | ||
|
|
aba0b860e8 | ||
|
|
46b99e769f | ||
|
|
b5dad6b5fb | ||
|
|
31d4d46742 | ||
|
|
5d86b68a3e | ||
|
|
62ac844084 | ||
|
|
eebb25dba0 | ||
|
|
88e450eb08 | ||
|
|
ca8670e23c | ||
|
|
1b4c023c92 | ||
|
|
9aabad56a2 | ||
|
|
3051deb7c7 | ||
|
|
f2f5cd9ad5 | ||
|
|
f800f22277 | ||
|
|
2558f0c392 | ||
|
|
02d8107b50 | ||
|
|
5943a796e4 | ||
|
|
ffc4d828a7 |
No files matched your search
Generated
+4
-4
@@ -5640,8 +5640,8 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lbry-redux": {
|
"lbry-redux": {
|
||||||
"version": "github:lbryio/lbry-redux#123efacf4d45289ebda9dc291976d475de227a55",
|
"version": "github:lbryio/lbry-redux#7ec72a737bcd336f000c5f5085891643110298c3",
|
||||||
"from": "github:lbryio/lbry-redux#123efacf4d45289ebda9dc291976d475de227a55",
|
"from": "github:lbryio/lbry-redux#7ec72a737bcd336f000c5f5085891643110298c3",
|
||||||
"requires": {
|
"requires": {
|
||||||
"proxy-polyfill": "0.1.6",
|
"proxy-polyfill": "0.1.6",
|
||||||
"reselect": "^3.0.0",
|
"reselect": "^3.0.0",
|
||||||
@@ -5649,8 +5649,8 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lbryinc": {
|
"lbryinc": {
|
||||||
"version": "github:lbryio/lbryinc#b9f354ae50bd57691765a7d042c5054167878bf4",
|
"version": "github:lbryio/lbryinc#67bb3e215be3f13605c5e3f9f2b0e2fb880724cf",
|
||||||
"from": "github:lbryio/lbryinc#b9f354ae50bd57691765a7d042c5054167878bf4",
|
"from": "github:lbryio/lbryinc#67bb3e215be3f13605c5e3f9f2b0e2fb880724cf",
|
||||||
"requires": {
|
"requires": {
|
||||||
"reselect": "^3.0.0"
|
"reselect": "^3.0.0"
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -12,8 +12,8 @@
|
|||||||
"base-64": "^0.1.0",
|
"base-64": "^0.1.0",
|
||||||
"@expo/vector-icons": "^8.1.0",
|
"@expo/vector-icons": "^8.1.0",
|
||||||
"gfycat-style-urls": "^1.0.3",
|
"gfycat-style-urls": "^1.0.3",
|
||||||
"lbry-redux": "lbryio/lbry-redux#123efacf4d45289ebda9dc291976d475de227a55",
|
"lbry-redux": "lbryio/lbry-redux#7ec72a737bcd336f000c5f5085891643110298c3",
|
||||||
"lbryinc": "lbryio/lbryinc#b9f354ae50bd57691765a7d042c5054167878bf4",
|
"lbryinc": "lbryio/lbryinc#67bb3e215be3f13605c5e3f9f2b0e2fb880724cf",
|
||||||
"lodash": ">=4.17.11",
|
"lodash": ">=4.17.11",
|
||||||
"merge": ">=1.2.1",
|
"merge": ">=1.2.1",
|
||||||
"moment": "^2.22.1",
|
"moment": "^2.22.1",
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 265 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 278 KiB |
@@ -29,8 +29,9 @@ import {
|
|||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { AppState, BackHandler, Linking, NativeModules, TextInput, ToastAndroid } from 'react-native';
|
import { AppState, BackHandler, Linking, NativeModules, TextInput, ToastAndroid } from 'react-native';
|
||||||
import { selectDrawerStack } from 'redux/selectors/drawer';
|
import { selectDrawerStack } from 'redux/selectors/drawer';
|
||||||
import { SETTINGS, doDismissToast, doToast, selectToast } from 'lbry-redux';
|
import { SETTINGS, doDismissToast, doPopulateSharedUserState, doToast, selectToast } from 'lbry-redux';
|
||||||
import {
|
import {
|
||||||
|
Lbryio,
|
||||||
doGetSync,
|
doGetSync,
|
||||||
doUserCheckEmailVerified,
|
doUserCheckEmailVerified,
|
||||||
doUserEmailVerify,
|
doUserEmailVerify,
|
||||||
@@ -305,6 +306,13 @@ class AppWithNavigationState extends React.Component {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
getUserSettings = () => {
|
||||||
|
const { dispatch } = this.props;
|
||||||
|
Lbryio.call('user_settings', 'get').then(settings => {
|
||||||
|
dispatch(doPopulateSharedUserState(settings));
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
AppState.removeEventListener('change', this._handleAppStateChange);
|
AppState.removeEventListener('change', this._handleAppStateChange);
|
||||||
BackHandler.removeEventListener('hardwareBackPress');
|
BackHandler.removeEventListener('hardwareBackPress');
|
||||||
@@ -321,12 +329,8 @@ class AppWithNavigationState extends React.Component {
|
|||||||
NativeModules.Firebase.track('email_verified', { email: user.primary_email });
|
NativeModules.Firebase.track('email_verified', { email: user.primary_email });
|
||||||
ToastAndroid.show('Your email address was successfully verified.', ToastAndroid.LONG);
|
ToastAndroid.show('Your email address was successfully verified.', ToastAndroid.LONG);
|
||||||
|
|
||||||
// upon successful email verification, do wallet sync (if password has been set)
|
// get user settings after email verification
|
||||||
NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(walletPassword => {
|
this.getUserSettings();
|
||||||
if (walletPassword && walletPassword.trim().length > 0) {
|
|
||||||
dispatch(doGetSync(walletPassword));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
import { connect } from 'react-redux';
|
||||||
|
import ChannelRewardsDriver from './view';
|
||||||
|
|
||||||
|
export default connect()(ChannelRewardsDriver);
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { Text, TouchableOpacity } from 'react-native';
|
||||||
|
import Colors from 'styles/colors';
|
||||||
|
import Icon from 'react-native-vector-icons/FontAwesome5';
|
||||||
|
import publishStyle from 'styles/publish';
|
||||||
|
|
||||||
|
class ChannelRewardsDriver extends React.PureComponent<Props> {
|
||||||
|
render() {
|
||||||
|
const { navigation } = this.props;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<TouchableOpacity style={publishStyle.rewardDriverCard} onPress={() => navigation.navigate('Rewards')}>
|
||||||
|
<Icon name="award" size={16} style={publishStyle.rewardIcon} />
|
||||||
|
<Text style={publishStyle.rewardDriverText}>Earn some credits to be able to create your channel.</Text>
|
||||||
|
</TouchableOpacity>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default ChannelRewardsDriver;
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { CLAIM_VALUES, isURIValid } from 'lbry-redux';
|
import { CLAIM_VALUES, isNameValid } from 'lbry-redux';
|
||||||
import { ActivityIndicator, Picker, Text, TextInput, TouchableOpacity, View } from 'react-native';
|
import { ActivityIndicator, Picker, Text, TextInput, TouchableOpacity, View } from 'react-native';
|
||||||
import Button from 'component/button';
|
import Button from 'component/button';
|
||||||
import Colors from 'styles/colors';
|
import Colors from 'styles/colors';
|
||||||
@@ -26,8 +26,8 @@ export default class ChannelSelector extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
const { channels, channelName, fetchChannelListMine, fetchingChannels } = this.props;
|
const { channels = [], channelName, fetchChannelListMine, fetchingChannels } = this.props;
|
||||||
if (!channels.length && !fetchingChannels) {
|
if ((!channels || channels.length === 0) && !fetchingChannels) {
|
||||||
fetchChannelListMine();
|
fetchChannelListMine();
|
||||||
}
|
}
|
||||||
this.setState({ currentSelectedValue: channelName });
|
this.setState({ currentSelectedValue: channelName });
|
||||||
@@ -37,7 +37,7 @@ export default class ChannelSelector extends React.PureComponent {
|
|||||||
const { channels: prevChannels = [], channelName } = this.props;
|
const { channels: prevChannels = [], channelName } = this.props;
|
||||||
const { channels = [] } = nextProps;
|
const { channels = [] } = nextProps;
|
||||||
|
|
||||||
if (channels.length !== prevChannels.length && channelName !== this.state.currentSelectedValue) {
|
if (channels && channels.length !== prevChannels.length && channelName !== this.state.currentSelectedValue) {
|
||||||
this.setState({ currentSelectedValue: channelName });
|
this.setState({ currentSelectedValue: channelName });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -85,7 +85,7 @@ export default class ChannelSelector extends React.PureComponent {
|
|||||||
newChannelName = newChannelName.slice(1);
|
newChannelName = newChannelName.slice(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newChannelName.trim().length > 0 && !isURIValid(newChannelName)) {
|
if (newChannelName.trim().length > 0 && !isNameValid(newChannelName)) {
|
||||||
newChannelNameError = 'Your channel name contains invalid characters.';
|
newChannelNameError = 'Your channel name contains invalid characters.';
|
||||||
} else if (this.channelExists(newChannelName)) {
|
} else if (this.channelExists(newChannelName)) {
|
||||||
newChannelNameError = 'You have already created a channel with the same name.';
|
newChannelNameError = 'You have already created a channel with the same name.';
|
||||||
@@ -120,7 +120,7 @@ export default class ChannelSelector extends React.PureComponent {
|
|||||||
const { balance, createChannel, onChannelChange, notify } = this.props;
|
const { balance, createChannel, onChannelChange, notify } = this.props;
|
||||||
const { newChannelBid, newChannelName } = this.state;
|
const { newChannelBid, newChannelName } = this.state;
|
||||||
|
|
||||||
if (newChannelName.trim().length === 0 || !isURIValid(newChannelName.substr(1), false)) {
|
if (newChannelName.trim().length === 0 || !isNameValid(newChannelName.substr(1), false)) {
|
||||||
notify({ message: 'Your channel name contains invalid characters.' });
|
notify({ message: 'Your channel name contains invalid characters.' });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -167,12 +167,14 @@ export default class ChannelSelector extends React.PureComponent {
|
|||||||
|
|
||||||
channelExists = name => {
|
channelExists = name => {
|
||||||
const { channels = [] } = this.props;
|
const { channels = [] } = this.props;
|
||||||
for (let channel of channels) {
|
if (channels) {
|
||||||
if (
|
for (let channel of channels) {
|
||||||
name.toLowerCase() === channel.name.toLowerCase() ||
|
if (
|
||||||
`@${name}`.toLowerCase() === channel.name.toLowerCase()
|
name.toLowerCase() === channel.name.toLowerCase() ||
|
||||||
) {
|
`@${name}`.toLowerCase() === channel.name.toLowerCase()
|
||||||
return true;
|
) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -182,7 +184,9 @@ export default class ChannelSelector extends React.PureComponent {
|
|||||||
render() {
|
render() {
|
||||||
const channel = this.state.addingChannel ? 'new' : this.props.channel;
|
const channel = this.state.addingChannel ? 'new' : this.props.channel;
|
||||||
const { enabled, fetchingChannels, channels = [] } = this.props;
|
const { enabled, fetchingChannels, channels = [] } = this.props;
|
||||||
const pickerItems = [Constants.ITEM_ANONYMOUS, Constants.ITEM_CREATE_A_CHANNEL].concat(channels.map(ch => ch.name));
|
const pickerItems = [Constants.ITEM_ANONYMOUS, Constants.ITEM_CREATE_A_CHANNEL].concat(
|
||||||
|
channels ? channels.map(ch => ch.name) : []
|
||||||
|
);
|
||||||
|
|
||||||
const {
|
const {
|
||||||
newChannelName,
|
newChannelName,
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
import { connect } from 'react-redux';
|
||||||
|
import EmptyStateView from './view';
|
||||||
|
|
||||||
|
export default connect()(EmptyStateView);
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { NativeModules, Text, View, Image, TouchableOpacity } from 'react-native';
|
||||||
|
import Button from '../button';
|
||||||
|
import emptyStateStyle from 'styles/emptyState';
|
||||||
|
|
||||||
|
class EmptyStateView extends React.PureComponent {
|
||||||
|
render() {
|
||||||
|
const { message, buttonText, inner, onButtonPress } = this.props;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View
|
||||||
|
style={[emptyStateStyle.container, inner ? emptyStateStyle.innerContainer : emptyStateStyle.outerContainer]}
|
||||||
|
>
|
||||||
|
<Image style={emptyStateStyle.image} resizeMode={'stretch'} source={require('../../assets/gerbil-happy.png')} />
|
||||||
|
<Text style={emptyStateStyle.message}>{message}</Text>
|
||||||
|
{buttonText && (
|
||||||
|
<View style={emptyStateStyle.buttonContainer}>
|
||||||
|
<Button style={emptyStateStyle.button} text={buttonText} onPress={onButtonPress} />
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default EmptyStateView;
|
||||||
@@ -4,7 +4,7 @@ import Colors from 'styles/colors';
|
|||||||
import Icon from 'react-native-vector-icons/FontAwesome5';
|
import Icon from 'react-native-vector-icons/FontAwesome5';
|
||||||
import publishStyle from 'styles/publish';
|
import publishStyle from 'styles/publish';
|
||||||
|
|
||||||
class PublishRewadsDriver extends React.PureComponent<Props> {
|
class PublishRewardsDriver extends React.PureComponent<Props> {
|
||||||
render() {
|
render() {
|
||||||
const { navigation } = this.props;
|
const { navigation } = this.props;
|
||||||
|
|
||||||
@@ -17,4 +17,4 @@ class PublishRewadsDriver extends React.PureComponent<Props> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default PublishRewadsDriver;
|
export default PublishRewardsDriver;
|
||||||
@@ -59,7 +59,8 @@ class RewardCard extends React.PureComponent<Props> {
|
|||||||
getDisplayAmount = () => {
|
getDisplayAmount = () => {
|
||||||
const { reward } = this.props;
|
const { reward } = this.props;
|
||||||
if (reward) {
|
if (reward) {
|
||||||
if (reward.reward_range && reward.reward_range.includes('-')) {
|
const claimed = !!reward.transaction_id;
|
||||||
|
if (!claimed && reward.reward_range && reward.reward_range.includes('-')) {
|
||||||
return reward.reward_range.split('-')[0] + '+'; // ex: 5+
|
return reward.reward_range.split('-')[0] + '+'; // ex: 5+
|
||||||
} else if (reward.reward_amount > 0) {
|
} else if (reward.reward_amount > 0) {
|
||||||
return reward.reward_amount;
|
return reward.reward_amount;
|
||||||
|
|||||||
+22
-15
@@ -15,6 +15,7 @@ import {
|
|||||||
walletReducer,
|
walletReducer,
|
||||||
} from 'lbry-redux';
|
} from 'lbry-redux';
|
||||||
import {
|
import {
|
||||||
|
Lbryio,
|
||||||
authReducer,
|
authReducer,
|
||||||
blacklistReducer,
|
blacklistReducer,
|
||||||
costInfoReducer,
|
costInfoReducer,
|
||||||
@@ -41,6 +42,7 @@ import formReducer from 'redux/reducers/form';
|
|||||||
import drawerReducer from 'redux/reducers/drawer';
|
import drawerReducer from 'redux/reducers/drawer';
|
||||||
import settingsReducer from 'redux/reducers/settings';
|
import settingsReducer from 'redux/reducers/settings';
|
||||||
import thunk from 'redux-thunk';
|
import thunk from 'redux-thunk';
|
||||||
|
import isEqual from 'utils/deep-equal';
|
||||||
|
|
||||||
const globalExceptionHandler = (error, isFatal) => {
|
const globalExceptionHandler = (error, isFatal) => {
|
||||||
if (error && NativeModules.Firebase) {
|
if (error && NativeModules.Firebase) {
|
||||||
@@ -145,22 +147,27 @@ const persistor = persistStore(store, persistOptions, err => {
|
|||||||
});
|
});
|
||||||
window.persistor = persistor;
|
window.persistor = persistor;
|
||||||
|
|
||||||
/*
|
let currentPayload;
|
||||||
const persistFilter = {
|
|
||||||
'auth': ['authToken'],
|
|
||||||
'claims': ['byId', 'claimsByUri'],
|
|
||||||
'content': ['positions'],
|
|
||||||
'subscriptions': ['enabledChannelNotifications', 'subscriptions'],
|
|
||||||
'settings': ['clientSettings'],
|
|
||||||
'tags': ['followedTags'],
|
|
||||||
'wallet': ['receiveAddress']
|
|
||||||
};
|
|
||||||
|
|
||||||
store.subscribe(() => {
|
store.subscribe(() => {
|
||||||
const state = (({ auth, claims, content, subscriptions, settings, tags, wallet }) =>
|
const state = store.getState();
|
||||||
({ auth, claims, content, subscriptions, settings, tags, wallet }))(store.getState());
|
const subscriptions = state.subscriptions.subscriptions.map(({ uri }) => uri);
|
||||||
NativeModules.StatePersistor.update(state, persistFilter);
|
const tags = state.tags.followedTags;
|
||||||
}); */
|
|
||||||
|
const newPayload = {
|
||||||
|
version: '0.1',
|
||||||
|
shared: {
|
||||||
|
subscriptions,
|
||||||
|
tags,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!isEqual(newPayload, currentPayload)) {
|
||||||
|
currentPayload = newPayload;
|
||||||
|
if (Lbryio.authToken) {
|
||||||
|
Lbryio.call('user_settings', 'set', { settings: JSON.stringify(newPayload) });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// TODO: Find i18n module that is compatible with react-native
|
// TODO: Find i18n module that is compatible with react-native
|
||||||
global.__ = str => str;
|
global.__ = str => str;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { makeSelectClaimForUri, selectMyChannelClaims } from 'lbry-redux';
|
import { doAbandonClaim, doFetchChannelListMine, makeSelectClaimForUri, selectMyChannelClaims } from 'lbry-redux';
|
||||||
import { doPopDrawerStack } from 'redux/actions/drawer';
|
import { doPopDrawerStack } from 'redux/actions/drawer';
|
||||||
import { doSetSortByItem, doSetTimeItem } from 'redux/actions/settings';
|
import { doSetSortByItem, doSetTimeItem } from 'redux/actions/settings';
|
||||||
import { selectDrawerStack } from 'redux/selectors/drawer';
|
import { selectDrawerStack } from 'redux/selectors/drawer';
|
||||||
@@ -15,6 +15,8 @@ const select = (state, props) => ({
|
|||||||
});
|
});
|
||||||
|
|
||||||
const perform = dispatch => ({
|
const perform = dispatch => ({
|
||||||
|
abandonClaim: (txid, nout) => dispatch(doAbandonClaim(txid, nout)),
|
||||||
|
fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
|
||||||
popDrawerStack: () => dispatch(doPopDrawerStack()),
|
popDrawerStack: () => dispatch(doPopDrawerStack()),
|
||||||
setSortByItem: item => dispatch(doSetSortByItem(item)),
|
setSortByItem: item => dispatch(doSetSortByItem(item)),
|
||||||
setTimeItem: item => dispatch(doSetTimeItem(item)),
|
setTimeItem: item => dispatch(doSetTimeItem(item)),
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import ClaimList from 'component/claimList';
|
|||||||
import Colors from 'styles/colors';
|
import Colors from 'styles/colors';
|
||||||
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
||||||
import Button from 'component/button';
|
import Button from 'component/button';
|
||||||
|
import EmptyStateView from 'component/emptyStateView';
|
||||||
import Icon from 'react-native-vector-icons/FontAwesome5';
|
import Icon from 'react-native-vector-icons/FontAwesome5';
|
||||||
import Link from 'component/link';
|
import Link from 'component/link';
|
||||||
import ModalPicker from 'component/modalPicker';
|
import ModalPicker from 'component/modalPicker';
|
||||||
@@ -47,7 +48,9 @@ class ChannelPage extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
|
const { fetchChannelListMine } = this.props;
|
||||||
NativeModules.Firebase.setCurrentScreen('Channel');
|
NativeModules.Firebase.setCurrentScreen('Channel');
|
||||||
|
fetchChannelListMine();
|
||||||
}
|
}
|
||||||
|
|
||||||
handleSortByItemSelected = item => {
|
handleSortByItemSelected = item => {
|
||||||
@@ -128,9 +131,7 @@ class ChannelPage extends React.PureComponent {
|
|||||||
return (
|
return (
|
||||||
<View style={channelPageStyle.aboutTab}>
|
<View style={channelPageStyle.aboutTab}>
|
||||||
{!websiteUrl && !email && !description && (
|
{!websiteUrl && !email && !description && (
|
||||||
<View style={channelPageStyle.busyContainer}>
|
<EmptyStateView message={"There's nothing here yet.\nPlease check back later."} />
|
||||||
<Text style={channelPageStyle.infoText}>Nothing here yet. Please check back later.</Text>
|
|
||||||
</View>
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{(websiteUrl || email || description) && (
|
{(websiteUrl || email || description) && (
|
||||||
@@ -266,7 +267,7 @@ class ChannelPage extends React.PureComponent {
|
|||||||
)}
|
)}
|
||||||
{ownedChannel && (
|
{ownedChannel && (
|
||||||
<Button
|
<Button
|
||||||
style={channelPageStyle.deleteButton}
|
style={[channelPageStyle.actionButton, channelPageStyle.deleteButton]}
|
||||||
theme={'light'}
|
theme={'light'}
|
||||||
icon={'trash-alt'}
|
icon={'trash-alt'}
|
||||||
text={'Delete'}
|
text={'Delete'}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { CLAIM_VALUES, isURIValid, regexInvalidURI } from 'lbry-redux';
|
import { CLAIM_VALUES, isNameValid, regexInvalidURI } from 'lbry-redux';
|
||||||
import {
|
import {
|
||||||
ActivityIndicator,
|
ActivityIndicator,
|
||||||
Alert,
|
Alert,
|
||||||
@@ -17,8 +17,10 @@ import {
|
|||||||
import { navigateToUri, uploadImageAsset } from 'utils/helper';
|
import { navigateToUri, uploadImageAsset } from 'utils/helper';
|
||||||
import Button from 'component/button';
|
import Button from 'component/button';
|
||||||
import ChannelIconItem from 'component/channelIconItem';
|
import ChannelIconItem from 'component/channelIconItem';
|
||||||
|
import ChannelRewardsDriver from 'component/channelRewardsDriver';
|
||||||
import Colors from 'styles/colors';
|
import Colors from 'styles/colors';
|
||||||
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
||||||
|
import EmptyStateView from 'component/emptyStateView';
|
||||||
import FloatingWalletBalance from 'component/floatingWalletBalance';
|
import FloatingWalletBalance from 'component/floatingWalletBalance';
|
||||||
import Icon from 'react-native-vector-icons/FontAwesome5';
|
import Icon from 'react-native-vector-icons/FontAwesome5';
|
||||||
import Link from 'component/link';
|
import Link from 'component/link';
|
||||||
@@ -100,11 +102,13 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
generateAutoStyles = size => {
|
generateAutoStyles = size => {
|
||||||
const { channels = [] } = this.props;
|
const { channels = [] } = this.props;
|
||||||
const autoStyles = [];
|
const autoStyles = [];
|
||||||
for (let i = 0; i < size && i < channels.length; i++) {
|
if (channels) {
|
||||||
// seed generator using the claim_id
|
for (let i = 0; i < size && i < channels.length; i++) {
|
||||||
const rng = seedrandom(channels[i].permanent_url); // is this efficient?
|
// seed generator using the claim_id
|
||||||
const index = Math.floor(rng.quick() * ChannelIconItem.AUTO_THUMB_STYLES.length);
|
const rng = seedrandom(channels[i].permanent_url); // is this efficient?
|
||||||
autoStyles.push(ChannelIconItem.AUTO_THUMB_STYLES[index]);
|
const index = Math.floor(rng.quick() * ChannelIconItem.AUTO_THUMB_STYLES.length);
|
||||||
|
autoStyles.push(ChannelIconItem.AUTO_THUMB_STYLES[index]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return autoStyles;
|
return autoStyles;
|
||||||
};
|
};
|
||||||
@@ -157,7 +161,7 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
if (!fetchingChannels) {
|
if (!fetchingChannels) {
|
||||||
fetchChannelListMine();
|
fetchChannelListMine();
|
||||||
}
|
}
|
||||||
if (balance > 0.1) {
|
if (balance >= 0.1) {
|
||||||
this.setState({ canSave: true });
|
this.setState({ canSave: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,10 +179,8 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
|
|
||||||
if (!isEditMode && hasFormState) {
|
if (!isEditMode && hasFormState) {
|
||||||
this.loadPendingFormState();
|
this.loadPendingFormState();
|
||||||
this.setState({ currentPhase: Constants.PHASE_CREATE });
|
|
||||||
} else {
|
|
||||||
this.setState({ currentPhase: Constants.PHASE_LIST });
|
|
||||||
}
|
}
|
||||||
|
this.setState({ currentPhase: isEditMode || hasFormState ? Constants.PHASE_CREATE : Constants.PHASE_LIST });
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -240,7 +242,7 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
componentDidUpdate() {
|
componentDidUpdate() {
|
||||||
const { channels = [] } = this.props;
|
const { channels = [] } = this.props;
|
||||||
const { editChannelUrl } = this.state;
|
const { editChannelUrl } = this.state;
|
||||||
if (channels.length > 0) {
|
if (channels && channels.length > 0) {
|
||||||
if (this.state.autoStyles.length !== channels.length) {
|
if (this.state.autoStyles.length !== channels.length) {
|
||||||
this.setState({
|
this.setState({
|
||||||
autoStyles: this.generateAutoStyles(channels.length),
|
autoStyles: this.generateAutoStyles(channels.length),
|
||||||
@@ -337,7 +339,7 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
newChannelName = newChannelName.slice(1);
|
newChannelName = newChannelName.slice(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newChannelName.trim().length > 0 && !isURIValid(newChannelName)) {
|
if (newChannelName.trim().length > 0 && !isNameValid(newChannelName)) {
|
||||||
newChannelNameError = 'Your channel name contains invalid characters.';
|
newChannelNameError = 'Your channel name contains invalid characters.';
|
||||||
} else if (this.channelExists(newChannelName)) {
|
} else if (this.channelExists(newChannelName)) {
|
||||||
newChannelNameError = 'You have already created a channel with the same name.';
|
newChannelNameError = 'You have already created a channel with the same name.';
|
||||||
@@ -390,7 +392,7 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
website,
|
website,
|
||||||
} = this.state;
|
} = this.state;
|
||||||
|
|
||||||
if (newChannelName.trim().length === 0 || !isURIValid(newChannelName.substr(1), false)) {
|
if (newChannelName.trim().length === 0 || !isNameValid(newChannelName.substr(1), false)) {
|
||||||
notify({ message: 'Your channel name contains invalid characters.' });
|
notify({ message: 'Your channel name contains invalid characters.' });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -454,8 +456,8 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
return { name: tag };
|
return { name: tag };
|
||||||
}),
|
}),
|
||||||
website,
|
website,
|
||||||
cover: coverImageUrl,
|
coverUrl: coverImageUrl,
|
||||||
thumbnail: thumbnailUrl,
|
thumbnailUrl: thumbnailUrl,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (this.state.editMode) {
|
if (this.state.editMode) {
|
||||||
@@ -479,12 +481,14 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
|
|
||||||
channelExists = name => {
|
channelExists = name => {
|
||||||
const { channels = [] } = this.props;
|
const { channels = [] } = this.props;
|
||||||
for (let channel of channels) {
|
if (channels) {
|
||||||
if (
|
for (let channel of channels) {
|
||||||
name.toLowerCase() === channel.name.toLowerCase() ||
|
if (
|
||||||
`@${name}`.toLowerCase() === channel.name.toLowerCase()
|
name.toLowerCase() === channel.name.toLowerCase() ||
|
||||||
) {
|
`@${name}`.toLowerCase() === channel.name.toLowerCase()
|
||||||
return true;
|
) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -524,9 +528,9 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
handleNewChannelPress = () => {
|
handleNewChannelPress = () => {
|
||||||
const { pushDrawerStack } = this.props;
|
const { balance, pushDrawerStack } = this.props;
|
||||||
pushDrawerStack(Constants.DRAWER_ROUTE_CHANNEL_CREATOR_FORM);
|
pushDrawerStack(Constants.DRAWER_ROUTE_CHANNEL_CREATOR_FORM);
|
||||||
this.setState({ currentPhase: Constants.PHASE_CREATE });
|
this.setState({ canSave: balance >= 0.1, currentPhase: Constants.PHASE_CREATE });
|
||||||
};
|
};
|
||||||
|
|
||||||
handleCreateCancel = () => {
|
handleCreateCancel = () => {
|
||||||
@@ -534,10 +538,12 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
showChannelList = () => {
|
showChannelList = () => {
|
||||||
const { popDrawerStack } = this.props;
|
const { drawerStack, popDrawerStack } = this.props;
|
||||||
popDrawerStack();
|
if (drawerStack[drawerStack.length - 1].route === Constants.DRAWER_ROUTE_CHANNEL_CREATOR_FORM) {
|
||||||
this.resetChannelCreator();
|
popDrawerStack();
|
||||||
|
}
|
||||||
this.setState({ currentPhase: Constants.PHASE_LIST });
|
this.setState({ currentPhase: Constants.PHASE_LIST });
|
||||||
|
this.resetChannelCreator();
|
||||||
};
|
};
|
||||||
|
|
||||||
resetChannelCreator = () => {
|
resetChannelCreator = () => {
|
||||||
@@ -556,8 +562,8 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
newChannelBidError: '',
|
newChannelBidError: '',
|
||||||
createChannelError: undefined,
|
createChannelError: undefined,
|
||||||
showCreateChannel: false,
|
showCreateChannel: false,
|
||||||
thumbnailUrl: null,
|
thumbnailUrl: '',
|
||||||
coverImageUrl: null,
|
coverImageUrl: '',
|
||||||
avatarImagePickerOpen: false,
|
avatarImagePickerOpen: false,
|
||||||
coverImagePickerOpen: false,
|
coverImagePickerOpen: false,
|
||||||
|
|
||||||
@@ -599,15 +605,17 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
prepareEdit = channel => {
|
prepareEdit = channel => {
|
||||||
const { pushDrawerStack } = this.props;
|
const { balance, pushDrawerStack } = this.props;
|
||||||
const { value } = channel;
|
const { value } = channel;
|
||||||
|
|
||||||
pushDrawerStack(Constants.DRAWER_ROUTE_CHANNEL_CREATOR_FORM);
|
pushDrawerStack(Constants.DRAWER_ROUTE_CHANNEL_CREATOR_FORM);
|
||||||
this.setState({
|
this.setState({
|
||||||
|
canSave: balance >= 0.1,
|
||||||
claimId: channel.claim_id,
|
claimId: channel.claim_id,
|
||||||
currentPhase: Constants.PHASE_CREATE,
|
currentPhase: Constants.PHASE_CREATE,
|
||||||
|
displayName: value && value.title ? value.title : channel.name.substring(1),
|
||||||
editMode: true,
|
editMode: true,
|
||||||
coverImageUrl: value && value.cover ? value.cover.url : null,
|
coverImageUrl: value && value.cover ? value.cover.url : '',
|
||||||
currentChannelName: channel.name.substring(1),
|
currentChannelName: channel.name.substring(1),
|
||||||
newChannelName: channel.name.substring(1),
|
newChannelName: channel.name.substring(1),
|
||||||
newChannelTitle: value ? value.title : null,
|
newChannelTitle: value ? value.title : null,
|
||||||
@@ -616,7 +624,7 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
email: value ? value.email : null,
|
email: value ? value.email : null,
|
||||||
website: value ? value.website_url : null,
|
website: value ? value.website_url : null,
|
||||||
tags: value && value.tags ? value.tags : [],
|
tags: value && value.tags ? value.tags : [],
|
||||||
thumbnailUrl: value && value.thumbnail ? value.thumbnail.url : null,
|
thumbnailUrl: value && value.thumbnail ? value.thumbnail.url : '',
|
||||||
showOptionalFields: value && (value.description || value.email || value.website_url || value.tags),
|
showOptionalFields: value && (value.description || value.email || value.website_url || value.tags),
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@@ -722,7 +730,7 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { abandoningClaimIds, fetchingChannels, updatingChannel, channels = [], navigation } = this.props;
|
const { abandoningClaimIds, balance, fetchingChannels, updatingChannel, channels = [], navigation } = this.props;
|
||||||
const {
|
const {
|
||||||
autoStyle,
|
autoStyle,
|
||||||
autoStyles,
|
autoStyles,
|
||||||
@@ -744,6 +752,8 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
uploadingImage,
|
uploadingImage,
|
||||||
} = this.state;
|
} = this.state;
|
||||||
|
|
||||||
|
const hasChannels = channels && channels.length > 0;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={channelCreatorStyle.container}>
|
<View style={channelCreatorStyle.container}>
|
||||||
<UriBar
|
<UriBar
|
||||||
@@ -756,34 +766,34 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
onExitSelectionMode={this.onExitSelectionMode}
|
onExitSelectionMode={this.onExitSelectionMode}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
{fetchingChannels && (
|
||||||
|
<View style={channelCreatorStyle.loading}>
|
||||||
|
<ActivityIndicator size={'large'} color={Colors.NextLbryGreen} />
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{currentPhase === Constants.PHASE_LIST && !fetchingChannels && !hasChannels && (
|
||||||
|
<EmptyStateView
|
||||||
|
message={'You have not created a channel.\nStart now by creating a new channel!'}
|
||||||
|
buttonText={'Create a channel'}
|
||||||
|
onButtonPress={this.handleNewChannelPress}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
{currentPhase === Constants.PHASE_LIST && (
|
{currentPhase === Constants.PHASE_LIST && (
|
||||||
<FlatList
|
<FlatList
|
||||||
extraData={this.state}
|
extraData={this.state}
|
||||||
ListHeaderComponent={
|
ListFooterComponent={
|
||||||
fetchingChannels ? (
|
!channels || channels.length === 0 ? null : (
|
||||||
<View style={channelCreatorStyle.listHeader}>
|
<View style={channelCreatorStyle.listFooter}>
|
||||||
<ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />
|
<Button
|
||||||
</View>
|
style={channelCreatorStyle.createChannelButton}
|
||||||
) : null
|
text={'Create a channel'}
|
||||||
}
|
onPress={this.handleNewChannelPress}
|
||||||
ListEmptyComponent={
|
/>
|
||||||
fetchingChannels ? null : (
|
|
||||||
<View style={channelCreatorStyle.listEmpty}>
|
|
||||||
<Text style={channelCreatorStyle.listEmptyText}>
|
|
||||||
You have not created a channel. Start now by creating a new channel!
|
|
||||||
</Text>
|
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
ListFooterComponent={
|
|
||||||
<View style={channelCreatorStyle.listFooter}>
|
|
||||||
<Button
|
|
||||||
style={channelCreatorStyle.createChannelButton}
|
|
||||||
text={'Create a channel'}
|
|
||||||
onPress={this.handleNewChannelPress}
|
|
||||||
/>
|
|
||||||
</View>
|
|
||||||
}
|
|
||||||
style={channelCreatorStyle.scrollContainer}
|
style={channelCreatorStyle.scrollContainer}
|
||||||
contentContainerStyle={channelCreatorStyle.scrollPadding}
|
contentContainerStyle={channelCreatorStyle.scrollPadding}
|
||||||
initialNumToRender={10}
|
initialNumToRender={10}
|
||||||
@@ -825,7 +835,7 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
data={channels.filter(channel => !abandoningClaimIds.includes(channel.claim_id))}
|
data={channels ? channels.filter(channel => !abandoningClaimIds.includes(channel.claim_id)) : []}
|
||||||
keyExtractor={(item, index) => item.claim_id}
|
keyExtractor={(item, index) => item.claim_id}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@@ -864,7 +874,7 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
source={{ uri: thumbnailUrl }}
|
source={{ uri: thumbnailUrl }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{thumbnailUrl !== null && thumbnailUrl.trim().length === 0 && newChannelName.length > 1 && (
|
{(thumbnailUrl === null || thumbnailUrl.trim().length === 0) && newChannelName.length > 0 && (
|
||||||
<Text style={channelIconStyle.autothumbCharacter}>
|
<Text style={channelIconStyle.autothumbCharacter}>
|
||||||
{newChannelName.substring(0, 1).toUpperCase()}
|
{newChannelName.substring(0, 1).toUpperCase()}
|
||||||
</Text>
|
</Text>
|
||||||
@@ -876,6 +886,7 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
|
{balance < 0.1 && <ChannelRewardsDriver navigation={navigation} />}
|
||||||
|
|
||||||
<View style={channelCreatorStyle.card}>
|
<View style={channelCreatorStyle.card}>
|
||||||
<View style={channelCreatorStyle.textInputLayout}>
|
<View style={channelCreatorStyle.textInputLayout}>
|
||||||
@@ -903,7 +914,7 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
<View>
|
<View>
|
||||||
<Text style={channelCreatorStyle.channelAt}>@</Text>
|
<Text style={channelCreatorStyle.channelAt}>@</Text>
|
||||||
<TextInput
|
<TextInput
|
||||||
editable={canSave && !creatingChannel && !updatingChannel}
|
editable={canSave && !editMode && !creatingChannel && !updatingChannel}
|
||||||
style={channelCreatorStyle.channelNameInput}
|
style={channelCreatorStyle.channelNameInput}
|
||||||
value={this.state.newChannelName}
|
value={this.state.newChannelName}
|
||||||
onChangeText={value => this.handleNewChannelNameChange(value, true)}
|
onChangeText={value => this.handleNewChannelNameChange(value, true)}
|
||||||
@@ -917,6 +928,10 @@ export default class ChannelCreator extends React.PureComponent {
|
|||||||
{newChannelNameError.length > 0 && (
|
{newChannelNameError.length > 0 && (
|
||||||
<Text style={channelCreatorStyle.inlineError}>{newChannelNameError}</Text>
|
<Text style={channelCreatorStyle.inlineError}>{newChannelNameError}</Text>
|
||||||
)}
|
)}
|
||||||
|
{editMode && (
|
||||||
|
<Text style={channelCreatorStyle.helpText}>The channel name cannot be changed while editing.</Text>
|
||||||
|
)}
|
||||||
|
|
||||||
<View style={channelCreatorStyle.bidRow}>
|
<View style={channelCreatorStyle.bidRow}>
|
||||||
<Text style={channelCreatorStyle.label}>Deposit</Text>
|
<Text style={channelCreatorStyle.label}>Deposit</Text>
|
||||||
<TextInput
|
<TextInput
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import {
|
|||||||
selectSubscriptionClaims,
|
selectSubscriptionClaims,
|
||||||
selectUnreadSubscriptions,
|
selectUnreadSubscriptions,
|
||||||
} from 'lbryinc';
|
} from 'lbryinc';
|
||||||
|
import { doPushDrawerStack } from 'redux/actions/drawer';
|
||||||
import { doSetClientSetting, doSetSortByItem, doSetTimeItem } from 'redux/actions/settings';
|
import { doSetClientSetting, doSetSortByItem, doSetTimeItem } from 'redux/actions/settings';
|
||||||
import { makeSelectClientSetting, selectSortByItem, selectTimeItem } from 'redux/selectors/settings';
|
import { makeSelectClientSetting, selectSortByItem, selectTimeItem } from 'redux/selectors/settings';
|
||||||
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
||||||
@@ -37,6 +38,7 @@ const perform = dispatch => ({
|
|||||||
fetchRewardedContent: () => dispatch(doFetchRewardedContent()),
|
fetchRewardedContent: () => dispatch(doFetchRewardedContent()),
|
||||||
fetchSubscriptions: () => dispatch(doFetchMySubscriptions()),
|
fetchSubscriptions: () => dispatch(doFetchMySubscriptions()),
|
||||||
fileList: () => dispatch(doFileList()),
|
fileList: () => dispatch(doFileList()),
|
||||||
|
pushDrawerStack: () => dispatch(doPushDrawerStack(Constants.DRAWER_ROUTE_DISCOVER)),
|
||||||
removeUnreadSubscriptions: () => dispatch(doRemoveUnreadSubscriptions()),
|
removeUnreadSubscriptions: () => dispatch(doRemoveUnreadSubscriptions()),
|
||||||
setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
|
setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
|
||||||
setSortByItem: item => dispatch(doSetSortByItem(item)),
|
setSortByItem: item => dispatch(doSetSortByItem(item)),
|
||||||
|
|||||||
+21
-10
@@ -38,8 +38,6 @@ class DiscoverPage extends React.PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
NativeModules.Firebase.setCurrentScreen('Your tags');
|
|
||||||
|
|
||||||
// Track the total time taken if this is the first launch
|
// Track the total time taken if this is the first launch
|
||||||
AsyncStorage.getItem('firstLaunchTime').then(startTime => {
|
AsyncStorage.getItem('firstLaunchTime').then(startTime => {
|
||||||
if (startTime !== null && !isNaN(parseInt(startTime, 10))) {
|
if (startTime !== null && !isNaN(parseInt(startTime, 10))) {
|
||||||
@@ -72,8 +70,29 @@ class DiscoverPage extends React.PureComponent {
|
|||||||
|
|
||||||
this.handleSortByItemSelected(sortByItem);
|
this.handleSortByItemSelected(sortByItem);
|
||||||
this.showRatingReminder();
|
this.showRatingReminder();
|
||||||
|
|
||||||
|
this.onComponentFocused();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
componentWillReceiveProps(nextProps) {
|
||||||
|
const { currentRoute: prevRoute, followedTags: prevFollowedTags } = this.props;
|
||||||
|
const { currentRoute, followedTags } = nextProps;
|
||||||
|
|
||||||
|
if (Constants.DRAWER_ROUTE_DISCOVER === currentRoute && currentRoute !== prevRoute) {
|
||||||
|
this.onComponentFocused();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!_.isEqual(followedTags, prevFollowedTags)) {
|
||||||
|
this.buildTagCollection(followedTags);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onComponentFocused = () => {
|
||||||
|
const { pushDrawerStack } = this.props;
|
||||||
|
// pushDrawerStack();
|
||||||
|
NativeModules.Firebase.setCurrentScreen('Your tags');
|
||||||
|
};
|
||||||
|
|
||||||
handleSortByItemSelected = item => {
|
handleSortByItemSelected = item => {
|
||||||
const { setSortByItem } = this.props;
|
const { setSortByItem } = this.props;
|
||||||
setSortByItem(item);
|
setSortByItem(item);
|
||||||
@@ -104,14 +123,6 @@ class DiscoverPage extends React.PureComponent {
|
|||||||
return null;
|
return null;
|
||||||
};
|
};
|
||||||
|
|
||||||
componentWillReceiveProps(nextProps) {
|
|
||||||
const { followedTags: prevFollowedTags } = this.props;
|
|
||||||
const { followedTags } = nextProps;
|
|
||||||
if (!_.isEqual(followedTags, prevFollowedTags)) {
|
|
||||||
this.buildTagCollection(followedTags);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
componentDidUpdate(prevProps, prevState) {
|
componentDidUpdate(prevProps, prevState) {
|
||||||
const { unreadSubscriptions, enabledChannelNotifications } = this.props;
|
const { unreadSubscriptions, enabledChannelNotifications } = this.props;
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import { __, navigateToUri, uriFromFileInfo } from 'utils/helper';
|
|||||||
import Colors from 'styles/colors';
|
import Colors from 'styles/colors';
|
||||||
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
||||||
import PageHeader from 'component/pageHeader';
|
import PageHeader from 'component/pageHeader';
|
||||||
|
import EmptyStateView from 'component/emptyStateView';
|
||||||
import FileListItem from 'component/fileListItem';
|
import FileListItem from 'component/fileListItem';
|
||||||
import FloatingWalletBalance from 'component/floatingWalletBalance';
|
import FloatingWalletBalance from 'component/floatingWalletBalance';
|
||||||
import StorageStatsCard from 'component/storageStatsCard';
|
import StorageStatsCard from 'component/storageStatsCard';
|
||||||
@@ -154,6 +155,10 @@ class DownloadsPage extends React.PureComponent {
|
|||||||
onDeleteActionPressed={this.onDeleteActionPressed}
|
onDeleteActionPressed={this.onDeleteActionPressed}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
{!fetching && !hasDownloads && (
|
||||||
|
<EmptyStateView message={'You do not have any\ndownloaded content on this device.'} />
|
||||||
|
)}
|
||||||
|
|
||||||
<View style={downloadsStyle.subContainer}>
|
<View style={downloadsStyle.subContainer}>
|
||||||
{hasDownloads && <StorageStatsCard fileInfos={this.getFilteredFileInfos()} />}
|
{hasDownloads && <StorageStatsCard fileInfos={this.getFilteredFileInfos()} />}
|
||||||
{fetching && (
|
{fetching && (
|
||||||
@@ -161,11 +166,7 @@ class DownloadsPage extends React.PureComponent {
|
|||||||
<ActivityIndicator size="large" color={Colors.NextLbryGreen} style={downloadsStyle.loading} />
|
<ActivityIndicator size="large" color={Colors.NextLbryGreen} style={downloadsStyle.loading} />
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
{!fetching && !hasDownloads && (
|
|
||||||
<View style={downloadsStyle.busyContainer}>
|
|
||||||
<Text style={downloadsStyle.noDownloadsText}>You do not have any downloaded content on this device.</Text>
|
|
||||||
</View>
|
|
||||||
)}
|
|
||||||
{!fetching && hasDownloads && (
|
{!fetching && hasDownloads && (
|
||||||
<FlatList
|
<FlatList
|
||||||
extraData={this.state}
|
extraData={this.state}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import {
|
import {
|
||||||
|
doAbandonClaim,
|
||||||
doFetchFileInfo,
|
doFetchFileInfo,
|
||||||
doFetchChannelListMine,
|
doFetchChannelListMine,
|
||||||
doFetchClaimListMine,
|
doFetchClaimListMine,
|
||||||
@@ -73,6 +74,7 @@ const select = (state, props) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const perform = dispatch => ({
|
const perform = dispatch => ({
|
||||||
|
abandonClaim: (txid, nout) => dispatch(doAbandonClaim(txid, nout)),
|
||||||
claimEligibleRewards: () => dispatch(doClaimEligiblePurchaseRewards()),
|
claimEligibleRewards: () => dispatch(doClaimEligiblePurchaseRewards()),
|
||||||
deleteFile: (fileInfo, deleteFromDevice, abandonClaim) => {
|
deleteFile: (fileInfo, deleteFromDevice, abandonClaim) => {
|
||||||
dispatch(doDeleteFile(fileInfo, deleteFromDevice, abandonClaim));
|
dispatch(doDeleteFile(fileInfo, deleteFromDevice, abandonClaim));
|
||||||
|
|||||||
+38
-13
@@ -22,6 +22,7 @@ import { navigateBack, navigateToUri } from 'utils/helper';
|
|||||||
import Icon from 'react-native-vector-icons/FontAwesome5';
|
import Icon from 'react-native-vector-icons/FontAwesome5';
|
||||||
import ImageViewer from 'react-native-image-zoom-viewer';
|
import ImageViewer from 'react-native-image-zoom-viewer';
|
||||||
import Button from 'component/button';
|
import Button from 'component/button';
|
||||||
|
import EmptyStateView from 'component/emptyStateView';
|
||||||
import Tag from 'component/tag';
|
import Tag from 'component/tag';
|
||||||
import ChannelPage from 'page/channel';
|
import ChannelPage from 'page/channel';
|
||||||
import Colors from 'styles/colors';
|
import Colors from 'styles/colors';
|
||||||
@@ -100,7 +101,7 @@ class FilePage extends React.PureComponent {
|
|||||||
DeviceEventEmitter.addListener('onDownloadUpdated', this.handleDownloadUpdated);
|
DeviceEventEmitter.addListener('onDownloadUpdated', this.handleDownloadUpdated);
|
||||||
DeviceEventEmitter.addListener('onDownloadCompleted', this.handleDownloadCompleted);
|
DeviceEventEmitter.addListener('onDownloadCompleted', this.handleDownloadCompleted);
|
||||||
|
|
||||||
const { fetchChannelListMine, fileInfo, isResolvingUri, resolveUri, navigation } = this.props;
|
const { fetchMyClaims, fileInfo, isResolvingUri, resolveUri, navigation } = this.props;
|
||||||
const { uri, uriVars } = navigation.state.params;
|
const { uri, uriVars } = navigation.state.params;
|
||||||
this.setState({ uri, uriVars });
|
this.setState({ uri, uriVars });
|
||||||
|
|
||||||
@@ -108,7 +109,7 @@ class FilePage extends React.PureComponent {
|
|||||||
|
|
||||||
this.fetchFileInfo(this.props);
|
this.fetchFileInfo(this.props);
|
||||||
this.fetchCostInfo(this.props);
|
this.fetchCostInfo(this.props);
|
||||||
fetchChannelListMine();
|
fetchMyClaims();
|
||||||
|
|
||||||
if (NativeModules.Firebase) {
|
if (NativeModules.Firebase) {
|
||||||
NativeModules.Firebase.track('open_file_page', { uri: uri });
|
NativeModules.Firebase.track('open_file_page', { uri: uri });
|
||||||
@@ -239,7 +240,7 @@ class FilePage extends React.PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
onDeletePressed = () => {
|
onDeletePressed = () => {
|
||||||
const { claim, deleteFile, deletePurchasedUri, fileInfo, navigation } = this.props;
|
const { abandonClaim, claim, deleteFile, deletePurchasedUri, myClaimUris, fileInfo, navigation } = this.props;
|
||||||
|
|
||||||
Alert.alert(
|
Alert.alert(
|
||||||
'Delete file',
|
'Delete file',
|
||||||
@@ -261,6 +262,16 @@ class FilePage extends React.PureComponent {
|
|||||||
mediaLoaded: false,
|
mediaLoaded: false,
|
||||||
stopDownloadConfirmed: false,
|
stopDownloadConfirmed: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (claim) {
|
||||||
|
const fullUri = normalizeURI(`${claim.name}#${claim.claim_id}`);
|
||||||
|
const ownedClaim = myClaimUris.includes(fullUri);
|
||||||
|
if (ownedClaim) {
|
||||||
|
const { txid, nout } = claim;
|
||||||
|
abandonClaim(txid, nout);
|
||||||
|
navigation.navigate({ routeName: Constants.DRAWER_ROUTE_PUBLISHES });
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
@@ -590,14 +601,15 @@ class FilePage extends React.PureComponent {
|
|||||||
} = this.props;
|
} = this.props;
|
||||||
const { uri, autoplay } = navigation.state.params;
|
const { uri, autoplay } = navigation.state.params;
|
||||||
|
|
||||||
|
const { isChannel } = parseURI(uri);
|
||||||
const myChannelUris = channels ? channels.map(channel => channel.permanent_url) : [];
|
const myChannelUris = channels ? channels.map(channel => channel.permanent_url) : [];
|
||||||
const ownedClaim = myClaimUris.includes(uri) || myChannelUris.includes(uri);
|
const ownedClaim = myClaimUris.includes(uri) || myChannelUris.includes(uri);
|
||||||
const { isChannel } = parseURI(uri);
|
|
||||||
|
|
||||||
let innerContent = null;
|
let innerContent = null;
|
||||||
if ((isResolvingUri && !claim) || !claim) {
|
if ((isResolvingUri && !claim) || !claim) {
|
||||||
return (
|
return (
|
||||||
<View style={filePageStyle.container}>
|
<View style={filePageStyle.container}>
|
||||||
|
<UriBar value={uri} navigation={navigation} />
|
||||||
{isResolvingUri && (
|
{isResolvingUri && (
|
||||||
<View style={filePageStyle.busyContainer}>
|
<View style={filePageStyle.busyContainer}>
|
||||||
<ActivityIndicator size="large" color={Colors.NextLbryGreen} />
|
<ActivityIndicator size="large" color={Colors.NextLbryGreen} />
|
||||||
@@ -607,16 +619,29 @@ class FilePage extends React.PureComponent {
|
|||||||
{claim === null && !isResolvingUri && (
|
{claim === null && !isResolvingUri && (
|
||||||
<View style={filePageStyle.container}>
|
<View style={filePageStyle.container}>
|
||||||
{ownedClaim && (
|
{ownedClaim && (
|
||||||
<Text style={filePageStyle.emptyClaimText}>
|
<EmptyStateView
|
||||||
{isChannel
|
message={
|
||||||
? 'It looks like you just created this channel. It will appear in a few minutes.'
|
isChannel
|
||||||
: 'It looks you just published this content. It will appear in a few minutes.'}
|
? 'It looks like you just created this channel. It will appear in a few minutes.'
|
||||||
</Text>
|
: 'It looks you just published this content. It will appear in a few minutes.'
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{!ownedClaim && (
|
||||||
|
<EmptyStateView
|
||||||
|
message={"There's nothing at this location."}
|
||||||
|
buttonText={'Publish something here'}
|
||||||
|
onButtonPress={() =>
|
||||||
|
navigation.navigate({
|
||||||
|
routeName: Constants.DRAWER_ROUTE_PUBLISH,
|
||||||
|
params: { vanityUrl: uri.trim() },
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
)}
|
)}
|
||||||
{!ownedClaim && <Text style={filePageStyle.emptyClaimText}>There's nothing at this location.</Text>}
|
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
<UriBar value={uri} navigation={navigation} />
|
<FloatingWalletBalance navigation={navigation} />
|
||||||
</View>
|
</View>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -859,11 +884,11 @@ class FilePage extends React.PureComponent {
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{completed && (
|
{(completed || canEdit) && (
|
||||||
<Button
|
<Button
|
||||||
style={filePageStyle.actionButton}
|
style={filePageStyle.actionButton}
|
||||||
theme={'light'}
|
theme={'light'}
|
||||||
icon={'trash'}
|
icon={'trash-alt'}
|
||||||
text={'Delete'}
|
text={'Delete'}
|
||||||
onPress={this.onDeletePressed}
|
onPress={this.onDeletePressed}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ class SkipAccountPage extends React.PureComponent {
|
|||||||
</View>
|
</View>
|
||||||
<Text style={firstRunStyle.rowParagraph}>
|
<Text style={firstRunStyle.rowParagraph}>
|
||||||
I understand that by uninstalling LBRY I will lose any balances or published content with no recovery
|
I understand that by uninstalling LBRY I will lose any balances or published content with no recovery
|
||||||
option.
|
option if it is not backed up manually (see wallet page)
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
@@ -80,13 +80,15 @@ class FirstRunScreen extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.state.syncApplyStarted && !syncApplyIsPending) {
|
if (this.state.syncApplyStarted && !syncApplyIsPending) {
|
||||||
this.setState({ syncApplyStarted: false });
|
|
||||||
if (syncApplyErrorMessage && syncApplyErrorMessage.trim().length > 0) {
|
if (syncApplyErrorMessage && syncApplyErrorMessage.trim().length > 0) {
|
||||||
notify({ message: syncApplyErrorMessage, isError: true });
|
notify({ message: syncApplyErrorMessage, syncApplyStarted: false, isError: true });
|
||||||
this.setState({ showBottomContainer: true });
|
this.setState({ showBottomContainer: true });
|
||||||
} else {
|
} else {
|
||||||
// password successfully verified
|
// password successfully verified
|
||||||
NativeModules.UtilityModule.setSecureValue(Constants.KEY_FIRST_RUN_PASSWORD, this.state.walletPassword);
|
NativeModules.UtilityModule.setSecureValue(
|
||||||
|
Constants.KEY_FIRST_RUN_PASSWORD,
|
||||||
|
this.state.walletPassword ? this.state.walletPassword : ''
|
||||||
|
);
|
||||||
setDefaultAccount(
|
setDefaultAccount(
|
||||||
() => {
|
() => {
|
||||||
setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
|
setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
|
||||||
@@ -233,6 +235,7 @@ class FirstRunScreen extends React.PureComponent {
|
|||||||
|
|
||||||
closeFinalPage() {
|
closeFinalPage() {
|
||||||
// Final page. Let the app know that first run experience is completed.
|
// Final page. Let the app know that first run experience is completed.
|
||||||
|
this.setState({ syncApplyStarted: false });
|
||||||
if (NativeModules.FirstRun) {
|
if (NativeModules.FirstRun) {
|
||||||
NativeModules.FirstRun.firstRunCompleted();
|
NativeModules.FirstRun.firstRunCompleted();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import {
|
|||||||
doResolveUri,
|
doResolveUri,
|
||||||
doToast,
|
doToast,
|
||||||
doUpdatePublishForm,
|
doUpdatePublishForm,
|
||||||
doUploadThumbnail,
|
|
||||||
selectBalance,
|
selectBalance,
|
||||||
selectPublishFormValues,
|
selectPublishFormValues,
|
||||||
} from 'lbry-redux';
|
} from 'lbry-redux';
|
||||||
@@ -28,7 +27,6 @@ const perform = dispatch => ({
|
|||||||
clearPublishFormState: () => dispatch(doClearPublishFormState()),
|
clearPublishFormState: () => dispatch(doClearPublishFormState()),
|
||||||
updatePublishForm: value => dispatch(doUpdatePublishForm(value)),
|
updatePublishForm: value => dispatch(doUpdatePublishForm(value)),
|
||||||
updatePublishFormState: data => dispatch(doUpdatePublishFormState(data)),
|
updatePublishFormState: data => dispatch(doUpdatePublishFormState(data)),
|
||||||
uploadThumbnail: (filePath, fsAdapter) => dispatch(doUploadThumbnail(filePath, null, fsAdapter)),
|
|
||||||
publish: (success, fail) => dispatch(doPublish(success, fail)),
|
publish: (success, fail) => dispatch(doPublish(success, fail)),
|
||||||
resolveUri: uri => dispatch(doResolveUri(uri)),
|
resolveUri: uri => dispatch(doResolveUri(uri)),
|
||||||
pushDrawerStack: (routeName, params) => dispatch(doPushDrawerStack(routeName, params)),
|
pushDrawerStack: (routeName, params) => dispatch(doPushDrawerStack(routeName, params)),
|
||||||
|
|||||||
+148
-75
@@ -43,7 +43,7 @@ import Tag from 'component/tag';
|
|||||||
import TagSearch from 'component/tagSearch';
|
import TagSearch from 'component/tagSearch';
|
||||||
import UriBar from 'component/uriBar';
|
import UriBar from 'component/uriBar';
|
||||||
import publishStyle from 'styles/publish';
|
import publishStyle from 'styles/publish';
|
||||||
import { __, navigateToUri } from 'utils/helper';
|
import { __, navigateToUri, uploadImageAsset } from 'utils/helper';
|
||||||
|
|
||||||
const languages = {
|
const languages = {
|
||||||
en: 'English',
|
en: 'English',
|
||||||
@@ -129,6 +129,8 @@ class PublishPage extends React.PureComponent {
|
|||||||
uploadedThumbnailUri: null,
|
uploadedThumbnailUri: null,
|
||||||
vanityUrlSet: false,
|
vanityUrlSet: false,
|
||||||
|
|
||||||
|
thumbnailImagePickerOpen: false,
|
||||||
|
|
||||||
// other
|
// other
|
||||||
publishStarted: false,
|
publishStarted: false,
|
||||||
};
|
};
|
||||||
@@ -218,10 +220,8 @@ class PublishPage extends React.PureComponent {
|
|||||||
// replace name with the specified vanity URL if there was one in the pending state
|
// replace name with the specified vanity URL if there was one in the pending state
|
||||||
this.setState({ name: this.state.vanityUrl });
|
this.setState({ name: this.state.vanityUrl });
|
||||||
}
|
}
|
||||||
this.setState({ currentPhase: Constants.PHASE_DETAILS });
|
|
||||||
} else {
|
|
||||||
this.setState({ currentPhase: Constants.PHASE_SELECTOR });
|
|
||||||
}
|
}
|
||||||
|
this.setState({ currentPhase: isEditMode || hasFormState ? Constants.PHASE_DETAILS : Constants.PHASE_SELECTOR });
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -256,6 +256,7 @@ class PublishPage extends React.PureComponent {
|
|||||||
this.setState(
|
this.setState(
|
||||||
{
|
{
|
||||||
editMode: true,
|
editMode: true,
|
||||||
|
publishStarted: false,
|
||||||
currentPhase: Constants.PHASE_DETAILS,
|
currentPhase: Constants.PHASE_DETAILS,
|
||||||
|
|
||||||
hasEditedContentAddress: true,
|
hasEditedContentAddress: true,
|
||||||
@@ -382,10 +383,12 @@ class PublishPage extends React.PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
handlePublishSuccess = data => {
|
handlePublishSuccess = data => {
|
||||||
const { navigation, notify } = this.props;
|
const { clearPublishFormState, navigation, notify } = this.props;
|
||||||
notify({
|
notify({
|
||||||
message: `Your content was successfully published to ${this.state.uri}. It will be available in a few mintues.`,
|
message: `Your content was successfully published to ${this.state.uri}. It will be available in a few mintues.`,
|
||||||
});
|
});
|
||||||
|
clearPublishFormState();
|
||||||
|
this.setState({ publishStarted: false });
|
||||||
navigation.navigate({ routeName: Constants.DRAWER_ROUTE_PUBLISHES, params: { publishSuccess: true } });
|
navigation.navigate({ routeName: Constants.DRAWER_ROUTE_PUBLISHES, params: { publishSuccess: true } });
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -407,14 +410,6 @@ class PublishPage extends React.PureComponent {
|
|||||||
this.onComponentFocused();
|
this.onComponentFocused();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (publishFormValues) {
|
|
||||||
if (publishFormValues.thumbnail && !this.state.uploadedThumbnailUri) {
|
|
||||||
const { thumbnail } = publishFormValues;
|
|
||||||
updatePublishFormState({ currentThumbnailUri: thumbnail, uploadedThumbnailUri: thumbnail });
|
|
||||||
this.setState({ currentThumbnailUri: thumbnail, uploadedThumbnailUri: thumbnail });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
if (
|
||||||
this.state.currentPhase === Constants.PHASE_DETAILS &&
|
this.state.currentPhase === Constants.PHASE_DETAILS &&
|
||||||
prevDrawerStack[prevDrawerStack.length - 1].route === Constants.DRAWER_ROUTE_PUBLISH_FORM &&
|
prevDrawerStack[prevDrawerStack.length - 1].route === Constants.DRAWER_ROUTE_PUBLISH_FORM &&
|
||||||
@@ -432,6 +427,7 @@ class PublishPage extends React.PureComponent {
|
|||||||
updatePublishFormState({ currentMedia: media, name: newName });
|
updatePublishFormState({ currentMedia: media, name: newName });
|
||||||
this.setState(
|
this.setState(
|
||||||
{
|
{
|
||||||
|
publishStarted: false,
|
||||||
currentMedia: media,
|
currentMedia: media,
|
||||||
title: null, // no title autogeneration (user will fill this in)
|
title: null, // no title autogeneration (user will fill this in)
|
||||||
name: newName,
|
name: newName,
|
||||||
@@ -449,7 +445,7 @@ class PublishPage extends React.PureComponent {
|
|||||||
};
|
};
|
||||||
|
|
||||||
showSelector() {
|
showSelector() {
|
||||||
const { updatePublishForm } = this.props;
|
const { clearPublishFormState, updatePublishForm } = this.props;
|
||||||
|
|
||||||
this.setState(
|
this.setState(
|
||||||
{
|
{
|
||||||
@@ -486,9 +482,12 @@ class PublishPage extends React.PureComponent {
|
|||||||
selectedChannel: null,
|
selectedChannel: null,
|
||||||
uploadedThumbnailUri: null,
|
uploadedThumbnailUri: null,
|
||||||
|
|
||||||
|
thumbnailImagePickerOpen: false,
|
||||||
|
|
||||||
vanityUrlSet: false,
|
vanityUrlSet: false,
|
||||||
},
|
},
|
||||||
() => {
|
() => {
|
||||||
|
clearPublishFormState();
|
||||||
// reset thumbnail
|
// reset thumbnail
|
||||||
updatePublishForm({ thumbnail: null });
|
updatePublishForm({ thumbnail: null });
|
||||||
}
|
}
|
||||||
@@ -522,19 +521,59 @@ class PublishPage extends React.PureComponent {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
onFilePicked = evt => {
|
handleThumbnailUploadSuccess = ({ url }) => {
|
||||||
this.setState({ documentPickerOpen: false }, () => {
|
const { updatePublishFormState } = this.props;
|
||||||
const currentMedia = {
|
|
||||||
id: -1,
|
this.setState({
|
||||||
filePath: `file://${evt.path}`,
|
uploadThumbnailStarted: false,
|
||||||
duration: 0,
|
currentThumbnailUri: url,
|
||||||
};
|
uploadedThumbnailUri: url,
|
||||||
this.setCurrentMedia(currentMedia);
|
|
||||||
});
|
});
|
||||||
|
updatePublishFormState({ currentThumbnailUri: url, uploadedThumbnailUri: url });
|
||||||
|
};
|
||||||
|
|
||||||
|
handleThumbnailUploadFailure = err => {
|
||||||
|
const { notify } = this.props;
|
||||||
|
this.setState({ uploadThumbnailStarted: false });
|
||||||
|
notify({ message: 'The thumbnail could not be uploaded. Please try again.' });
|
||||||
|
};
|
||||||
|
|
||||||
|
onFilePicked = evt => {
|
||||||
|
const { notify } = this.props;
|
||||||
|
if (evt.path && evt.path.length > 0) {
|
||||||
|
const fileUrl = `file://${evt.path}`;
|
||||||
|
|
||||||
|
if (this.state.documentPickerOpen) {
|
||||||
|
this.setState({ documentPickerOpen: false, thumbnailImagePickerOpen: false }, () => {
|
||||||
|
const currentMedia = {
|
||||||
|
id: -1,
|
||||||
|
filePath: evt.path,
|
||||||
|
duration: 0,
|
||||||
|
};
|
||||||
|
this.setCurrentMedia(currentMedia);
|
||||||
|
});
|
||||||
|
} else if (this.state.thumbnailImagePickerOpen) {
|
||||||
|
this.setState(
|
||||||
|
{
|
||||||
|
documentPickerOpen: false,
|
||||||
|
thumbnailImagePickerOpen: false,
|
||||||
|
uploadThumbnailStarted: true,
|
||||||
|
currentThumbnailUri: fileUrl,
|
||||||
|
},
|
||||||
|
() => {
|
||||||
|
// upload a new thumbnail
|
||||||
|
uploadImageAsset(fileUrl, this.handleThumbnailUploadSuccess, this.handleThumbnailUploadFailure);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// could not determine the file path
|
||||||
|
notify({ message: 'The path could not be determined. Please try a different file.' });
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
onPickerCanceled = () => {
|
onPickerCanceled = () => {
|
||||||
this.setState({ documentPickerOpen: false });
|
this.setState({ documentPickerOpen: false, thumbnailImagePickerOpen: false });
|
||||||
};
|
};
|
||||||
|
|
||||||
handleCloseCameraPressed = () => {
|
handleCloseCameraPressed = () => {
|
||||||
@@ -569,6 +608,7 @@ class PublishPage extends React.PureComponent {
|
|||||||
{
|
{
|
||||||
currentThumbnailUri: null,
|
currentThumbnailUri: null,
|
||||||
updatingThumbnailUri: false,
|
updatingThumbnailUri: false,
|
||||||
|
publishStarted: false,
|
||||||
currentPhase: Constants.PHASE_DETAILS,
|
currentPhase: Constants.PHASE_DETAILS,
|
||||||
showCameraOverlay: false,
|
showCameraOverlay: false,
|
||||||
videoRecordingMode: false,
|
videoRecordingMode: false,
|
||||||
@@ -593,6 +633,7 @@ class PublishPage extends React.PureComponent {
|
|||||||
{
|
{
|
||||||
currentPhase: Constants.PHASE_DETAILS,
|
currentPhase: Constants.PHASE_DETAILS,
|
||||||
currentThumbnailUri: null,
|
currentThumbnailUri: null,
|
||||||
|
publishStarted: false,
|
||||||
updatingThumbnailUri: false,
|
updatingThumbnailUri: false,
|
||||||
showCameraOverlay: false,
|
showCameraOverlay: false,
|
||||||
videoRecordingMode: false,
|
videoRecordingMode: false,
|
||||||
@@ -611,8 +652,6 @@ class PublishPage extends React.PureComponent {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
handleUploadPressed = () => {};
|
|
||||||
|
|
||||||
getRandomFileId = () => {
|
getRandomFileId = () => {
|
||||||
// generate a random id for a photo or recorded video between 1 and 20 (for creating thumbnails)
|
// generate a random id for a photo or recorded video between 1 and 20 (for creating thumbnails)
|
||||||
const id = Math.floor(Math.random() * (20 - 2)) + 1;
|
const id = Math.floor(Math.random() * (20 - 2)) + 1;
|
||||||
@@ -699,7 +738,7 @@ class PublishPage extends React.PureComponent {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { notify, uploadThumbnail } = this.props;
|
const { notify } = this.props;
|
||||||
const { thumbnailPath } = this.state;
|
const { thumbnailPath } = this.state;
|
||||||
|
|
||||||
this.setState({ updatingThumbnailUri: true });
|
this.setState({ updatingThumbnailUri: true });
|
||||||
@@ -714,7 +753,13 @@ class PublishPage extends React.PureComponent {
|
|||||||
|
|
||||||
// upload the thumbnail
|
// upload the thumbnail
|
||||||
if (!this.state.uploadedThumbnailUri) {
|
if (!this.state.uploadedThumbnailUri) {
|
||||||
this.setState({ uploadThumbnailStarted: true }, () => uploadThumbnail(this.getFilePathFromUri(uri), RNFS));
|
this.setState({ uploadThumbnailStarted: true }, () =>
|
||||||
|
uploadImageAsset(
|
||||||
|
this.getFilePathFromUri(uri),
|
||||||
|
this.handleThumbnailUploadSuccess,
|
||||||
|
this.handleThumbnailUploadFailure
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
} else if (mediaType === 'image' || mediaType === 'video') {
|
} else if (mediaType === 'image' || mediaType === 'video') {
|
||||||
const create =
|
const create =
|
||||||
@@ -725,7 +770,9 @@ class PublishPage extends React.PureComponent {
|
|||||||
.then(path => {
|
.then(path => {
|
||||||
this.setState({ currentThumbnailUri: `file://${path}`, updatingThumbnailUri: false });
|
this.setState({ currentThumbnailUri: `file://${path}`, updatingThumbnailUri: false });
|
||||||
if (!this.state.uploadedThumbnailUri) {
|
if (!this.state.uploadedThumbnailUri) {
|
||||||
this.setState({ uploadThumbnailStarted: true }, () => uploadThumbnail(path, RNFS));
|
this.setState({ uploadThumbnailStarted: true }, () =>
|
||||||
|
uploadImageAsset(path, this.handleThumbnailUploadSuccess, this.handleThumbnailUploadFailure)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
@@ -781,7 +828,7 @@ class PublishPage extends React.PureComponent {
|
|||||||
: '';
|
: '';
|
||||||
const licenseUrl = LICENSES.CC_LICENSES.reduce((value, item) => {
|
const licenseUrl = LICENSES.CC_LICENSES.reduce((value, item) => {
|
||||||
if (typeof value === 'object') {
|
if (typeof value === 'object') {
|
||||||
value = '';
|
value = license === value.value ? item.url : '';
|
||||||
}
|
}
|
||||||
if (license === item.value) {
|
if (license === item.value) {
|
||||||
value = item.url;
|
value = item.url;
|
||||||
@@ -799,11 +846,31 @@ class PublishPage extends React.PureComponent {
|
|||||||
this.setState({ otherLicenseDescription });
|
this.setState({ otherLicenseDescription });
|
||||||
};
|
};
|
||||||
|
|
||||||
|
handleThumbnailPressed = () => {
|
||||||
|
const { notify } = this.props;
|
||||||
|
if (this.state.thumbnailImagePickerOpen || this.state.uploadThumbnailStarted) {
|
||||||
|
if (this.state.uploadThumbnailStarted) {
|
||||||
|
notify({ message: 'A thumbnail is already being uploaded. Please wait for the upload to finish.' });
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.setState(
|
||||||
|
{
|
||||||
|
thumbnailImagePickerOpen: true,
|
||||||
|
},
|
||||||
|
() => {
|
||||||
|
NativeModules.UtilityModule.openDocumentPicker('image/*');
|
||||||
|
}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { balance, navigation, notify, publishFormValues } = this.props;
|
const { balance, navigation, notify, publishFormValues } = this.props;
|
||||||
const {
|
const {
|
||||||
allThumbnailsChecked,
|
allThumbnailsChecked,
|
||||||
canUseCamera,
|
canUseCamera,
|
||||||
|
showCameraOverlay,
|
||||||
currentPhase,
|
currentPhase,
|
||||||
checkedThumbnails,
|
checkedThumbnails,
|
||||||
loadingVideos,
|
loadingVideos,
|
||||||
@@ -816,7 +883,9 @@ class PublishPage extends React.PureComponent {
|
|||||||
content = (
|
content = (
|
||||||
<View style={publishStyle.gallerySelector}>
|
<View style={publishStyle.gallerySelector}>
|
||||||
<View style={publishStyle.actionsView}>
|
<View style={publishStyle.actionsView}>
|
||||||
{canUseCamera && <RNCamera style={publishStyle.cameraPreview} type={RNCamera.Constants.Type.back} />}
|
{canUseCamera && !showCameraOverlay && (
|
||||||
|
<RNCamera captureAudio={false} style={publishStyle.cameraPreview} type={RNCamera.Constants.Type.back} />
|
||||||
|
)}
|
||||||
<View style={publishStyle.actionsSubView}>
|
<View style={publishStyle.actionsSubView}>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
style={[
|
style={[
|
||||||
@@ -893,22 +962,24 @@ class PublishPage extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
content = (
|
content = (
|
||||||
<ScrollView style={publishStyle.publishDetails}>
|
<ScrollView style={publishStyle.publishDetails}>
|
||||||
{currentThumbnailUri && currentThumbnailUri.trim().length > 0 && (
|
<TouchableOpacity style={publishStyle.mainThumbnailContainer} onPress={this.handleThumbnailPressed}>
|
||||||
<View style={publishStyle.mainThumbnailContainer}>
|
<FastImage
|
||||||
<FastImage
|
style={publishStyle.mainThumbnail}
|
||||||
style={publishStyle.mainThumbnail}
|
resizeMode={FastImage.resizeMode.contain}
|
||||||
resizeMode={FastImage.resizeMode.contain}
|
source={{ uri: currentThumbnailUri }}
|
||||||
source={{ uri: currentThumbnailUri }}
|
/>
|
||||||
/>
|
|
||||||
|
|
||||||
{this.state.uploadThumbnailStarted && !this.state.uploadedThumbnailUri && (
|
<View style={publishStyle.thumbnailEditOverlay}>
|
||||||
<View style={publishStyle.thumbnailUploadContainer}>
|
<Icon name={'edit'} style={publishStyle.editIcon} />
|
||||||
<ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />
|
|
||||||
<Text style={publishStyle.thumbnailUploadText}>Uploading thumbnail...</Text>
|
|
||||||
</View>
|
|
||||||
)}
|
|
||||||
</View>
|
</View>
|
||||||
)}
|
|
||||||
|
{this.state.uploadThumbnailStarted && (
|
||||||
|
<View style={publishStyle.thumbnailUploadContainer}>
|
||||||
|
<ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />
|
||||||
|
<Text style={publishStyle.thumbnailUploadText}>Uploading thumbnail...</Text>
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
</TouchableOpacity>
|
||||||
{!this.state.canPublish && <PublishRewardsDriver navigation={navigation} />}
|
{!this.state.canPublish && <PublishRewardsDriver navigation={navigation} />}
|
||||||
|
|
||||||
<View style={publishStyle.card}>
|
<View style={publishStyle.card}>
|
||||||
@@ -1105,21 +1176,21 @@ class PublishPage extends React.PureComponent {
|
|||||||
</View>
|
</View>
|
||||||
|
|
||||||
<View style={publishStyle.actionButtons}>
|
<View style={publishStyle.actionButtons}>
|
||||||
{(this.state.publishStarted || publishFormValues.publishing) && (
|
{this.state.publishStarted && (
|
||||||
<View style={publishStyle.progress}>
|
<View style={publishStyle.progress}>
|
||||||
<ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />
|
<ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{!publishFormValues.publishing && !this.state.publishStarted && (
|
{!this.state.publishStarted && (
|
||||||
<Link style={publishStyle.cancelLink} text="Cancel" onPress={() => this.showSelector()} />
|
<Link style={publishStyle.cancelLink} text="Cancel" onPress={() => this.showSelector()} />
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{!publishFormValues.publishing && !this.state.publishStarted && (
|
{!this.state.publishStarted && (
|
||||||
<View style={publishStyle.rightActionButtons}>
|
<View style={publishStyle.rightActionButtons}>
|
||||||
<Button
|
<Button
|
||||||
style={publishStyle.publishButton}
|
style={publishStyle.publishButton}
|
||||||
disabled={!this.state.canPublish || !this.state.uploadedThumbnailUri}
|
disabled={!this.state.canPublish || this.state.uploadThumbnailStarted}
|
||||||
text={this.state.editMode ? 'Save changes' : 'Publish'}
|
text={this.state.editMode ? 'Save changes' : 'Publish'}
|
||||||
onPress={this.handlePublishPressed}
|
onPress={this.handlePublishPressed}
|
||||||
/>
|
/>
|
||||||
@@ -1168,34 +1239,36 @@ class PublishPage extends React.PureComponent {
|
|||||||
{false && Constants.PHASE_SELECTOR !== this.state.currentPhase && (
|
{false && Constants.PHASE_SELECTOR !== this.state.currentPhase && (
|
||||||
<FloatingWalletBalance navigation={navigation} />
|
<FloatingWalletBalance navigation={navigation} />
|
||||||
)}
|
)}
|
||||||
{this.state.canUseCamera && this.state.showCameraOverlay && (
|
{this.state.showCameraOverlay && (
|
||||||
<View style={publishStyle.cameraOverlay}>
|
<View style={publishStyle.cameraOverlay}>
|
||||||
<RNCamera
|
{this.state.canUseCamera && (
|
||||||
captureAudio={this.state.videoRecordingMode}
|
<RNCamera
|
||||||
style={publishStyle.fullCamera}
|
captureAudio={this.state.videoRecordingMode}
|
||||||
ref={ref => {
|
style={publishStyle.fullCamera}
|
||||||
this.camera = ref;
|
ref={ref => {
|
||||||
}}
|
this.camera = ref;
|
||||||
type={this.state.cameraType}
|
}}
|
||||||
flashMode={RNCamera.Constants.FlashMode.off}
|
type={this.state.cameraType}
|
||||||
androidCameraPermissionOptions={{
|
flashMode={RNCamera.Constants.FlashMode.off}
|
||||||
title: 'Camera',
|
androidCameraPermissionOptions={{
|
||||||
message: 'Please grant access to make use of your camera',
|
title: __('Camera'),
|
||||||
buttonPositive: 'OK',
|
message: __('Please grant access to make use of your camera'),
|
||||||
buttonNegative: 'Cancel',
|
buttonPositive: __('OK'),
|
||||||
}}
|
buttonNegative: __('Cancel'),
|
||||||
androidRecordAudioPermissionOptions={{
|
}}
|
||||||
title: 'Audio',
|
androidRecordAudioPermissionOptions={{
|
||||||
message: 'Please grant access to record audio',
|
title: __('Audio'),
|
||||||
buttonPositive: 'OK',
|
message: __('Please grant access to record audio'),
|
||||||
buttonNegative: 'Cancel',
|
buttonPositive: __('OK'),
|
||||||
}}
|
buttonNegative: __('Cancel'),
|
||||||
notAuthorizedView={
|
}}
|
||||||
<View style={publishStyle.fullCentered}>
|
notAuthorizedView={
|
||||||
<Text style={publishStyle.cameraInfo}>Camera not authorized</Text>
|
<View style={publishStyle.fullCentered}>
|
||||||
</View>
|
<Text style={publishStyle.cameraInfo}>Camera not authorized</Text>
|
||||||
}
|
</View>
|
||||||
/>
|
}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
<View
|
<View
|
||||||
style={[
|
style={[
|
||||||
publishStyle.cameraControls,
|
publishStyle.cameraControls,
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { ActivityIndicator, Alert, FlatList, NativeModules, Text, TouchableOpaci
|
|||||||
import Button from 'component/button';
|
import Button from 'component/button';
|
||||||
import Colors from 'styles/colors';
|
import Colors from 'styles/colors';
|
||||||
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
||||||
|
import EmptyStateView from 'component/emptyStateView';
|
||||||
import FileListItem from 'component/fileListItem';
|
import FileListItem from 'component/fileListItem';
|
||||||
import FloatingWalletBalance from 'component/floatingWalletBalance';
|
import FloatingWalletBalance from 'component/floatingWalletBalance';
|
||||||
import UriBar from 'component/uriBar';
|
import UriBar from 'component/uriBar';
|
||||||
@@ -137,16 +138,11 @@ class PublishesPage extends React.PureComponent {
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{!fetching && (!uris || uris.length === 0) && (
|
{!fetching && (!uris || uris.length === 0) && (
|
||||||
<View style={publishStyle.noPublishes}>
|
<EmptyStateView
|
||||||
<Text style={publishStyle.noPublishText}>
|
message={__('It looks like you have not\npublished any content to LBRY yet.')}
|
||||||
{__('It looks like you have not published anything to LBRY yet.')}
|
buttonText={__('Publish something new')}
|
||||||
</Text>
|
onButtonPress={() => navigation.navigate({ routeName: Constants.DRAWER_ROUTE_PUBLISH })}
|
||||||
<Button
|
/>
|
||||||
style={publishStyle.publishNowButton}
|
|
||||||
text={__('Publish something new')}
|
|
||||||
onPress={() => navigation.navigate({ routeName: Constants.DRAWER_ROUTE_PUBLISH })}
|
|
||||||
/>
|
|
||||||
</View>
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{uris && uris.length > 0 && (
|
{uris && uris.length > 0 && (
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { doBalanceSubscribe, doUpdateBlockHeight, doToast } from 'lbry-redux';
|
import { doBalanceSubscribe, doUpdateBlockHeight, doPopulateSharedUserState, doToast } from 'lbry-redux';
|
||||||
import {
|
import {
|
||||||
doAuthenticate,
|
doAuthenticate,
|
||||||
doBlackListedOutpointsSubscribe,
|
doBlackListedOutpointsSubscribe,
|
||||||
@@ -34,6 +34,7 @@ const perform = dispatch => ({
|
|||||||
notify: data => dispatch(doToast(data)),
|
notify: data => dispatch(doToast(data)),
|
||||||
setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
|
setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
|
||||||
setEmailToVerify: email => dispatch(doUserEmailToVerify(email)),
|
setEmailToVerify: email => dispatch(doUserEmailToVerify(email)),
|
||||||
|
populateSharedUserState: settings => dispatch(doPopulateSharedUserState(settings)),
|
||||||
updateBlockHeight: () => dispatch(doUpdateBlockHeight()),
|
updateBlockHeight: () => dispatch(doUpdateBlockHeight()),
|
||||||
verifyUserEmail: (token, recaptcha) => dispatch(doUserEmailVerify(token, recaptcha)),
|
verifyUserEmail: (token, recaptcha) => dispatch(doUserEmailVerify(token, recaptcha)),
|
||||||
verifyUserEmailFailure: error => dispatch(doUserEmailVerifyFailure(error)),
|
verifyUserEmailFailure: error => dispatch(doUserEmailVerifyFailure(error)),
|
||||||
|
|||||||
+19
-5
@@ -1,5 +1,6 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { Lbry } from 'lbry-redux';
|
import { Lbry } from 'lbry-redux';
|
||||||
|
import { Lbryio } from 'lbryinc';
|
||||||
import { ActivityIndicator, Linking, NativeModules, Platform, Text, View } from 'react-native';
|
import { ActivityIndicator, Linking, NativeModules, Platform, Text, View } from 'react-native';
|
||||||
import { NavigationActions, StackActions } from 'react-navigation';
|
import { NavigationActions, StackActions } from 'react-navigation';
|
||||||
import { decode as atob } from 'base-64';
|
import { decode as atob } from 'base-64';
|
||||||
@@ -15,6 +16,8 @@ import splashStyle from 'styles/splash';
|
|||||||
|
|
||||||
const BLOCK_HEIGHT_INTERVAL = 1000 * 60 * 2.5; // every 2.5 minutes
|
const BLOCK_HEIGHT_INTERVAL = 1000 * 60 * 2.5; // every 2.5 minutes
|
||||||
|
|
||||||
|
const SETTINGS_GET_INTERVAL = 1000 * 60 * 5; // every 5 minutes
|
||||||
|
|
||||||
const testingNetwork = 'Testing network';
|
const testingNetwork = 'Testing network';
|
||||||
const waitingForResolution = 'Waiting for name resolution';
|
const waitingForResolution = 'Waiting for name resolution';
|
||||||
|
|
||||||
@@ -95,7 +98,7 @@ class SplashScreen extends React.PureComponent {
|
|||||||
// user is authenticated, navigate to the main view
|
// user is authenticated, navigate to the main view
|
||||||
if (user.has_verified_email) {
|
if (user.has_verified_email) {
|
||||||
NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(walletPassword => {
|
NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(walletPassword => {
|
||||||
if (walletPassword && walletPassword.trim().length > 0) {
|
if (walletPassword) {
|
||||||
getSync(walletPassword);
|
getSync(walletPassword);
|
||||||
}
|
}
|
||||||
this.navigateToMain();
|
this.navigateToMain();
|
||||||
@@ -108,6 +111,13 @@ class SplashScreen extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getUserSettings = () => {
|
||||||
|
const { populateSharedUserState } = this.props;
|
||||||
|
Lbryio.call('user_settings', 'get').then(settings => {
|
||||||
|
populateSharedUserState(settings);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
finishSplashScreen = () => {
|
finishSplashScreen = () => {
|
||||||
const {
|
const {
|
||||||
authenticate,
|
authenticate,
|
||||||
@@ -127,6 +137,10 @@ class SplashScreen extends React.PureComponent {
|
|||||||
filteredOutpointsSubscribe();
|
filteredOutpointsSubscribe();
|
||||||
checkSubscriptionsInit();
|
checkSubscriptionsInit();
|
||||||
|
|
||||||
|
// get user settings interval
|
||||||
|
this.getUserSettings();
|
||||||
|
setInterval(() => this.getUserSettings(), SETTINGS_GET_INTERVAL);
|
||||||
|
|
||||||
if (user && user.id && user.has_verified_email) {
|
if (user && user.id && user.has_verified_email) {
|
||||||
// user already authenticated
|
// user already authenticated
|
||||||
NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(walletPassword => {
|
NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(walletPassword => {
|
||||||
@@ -150,7 +164,10 @@ class SplashScreen extends React.PureComponent {
|
|||||||
|
|
||||||
_updateStatusCallback(status) {
|
_updateStatusCallback(status) {
|
||||||
const { fetchSubscriptions, getSync, setClientSetting } = this.props;
|
const { fetchSubscriptions, getSync, setClientSetting } = this.props;
|
||||||
|
const blockchainHeaders = status.blockchain_headers;
|
||||||
const startupStatus = status.startup_status;
|
const startupStatus = status.startup_status;
|
||||||
|
const walletStatus = status.wallet;
|
||||||
|
|
||||||
// At the minimum, wallet should be started and blocks_behind equal to 0 before calling resolve
|
// At the minimum, wallet should be started and blocks_behind equal to 0 before calling resolve
|
||||||
const hasStarted = startupStatus.stream_manager && startupStatus.wallet && status.wallet.blocks_behind <= 0;
|
const hasStarted = startupStatus.stream_manager && startupStatus.wallet && status.wallet.blocks_behind <= 0;
|
||||||
if (hasStarted) {
|
if (hasStarted) {
|
||||||
@@ -166,7 +183,7 @@ class SplashScreen extends React.PureComponent {
|
|||||||
|
|
||||||
// For now, automatically unlock the wallet if a password is set so that downloads work
|
// For now, automatically unlock the wallet if a password is set so that downloads work
|
||||||
NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(password => {
|
NativeModules.UtilityModule.getSecureValue(Constants.KEY_FIRST_RUN_PASSWORD).then(password => {
|
||||||
if (password) {
|
if (walletStatus.is_locked) {
|
||||||
this.setState({
|
this.setState({
|
||||||
message: 'Unlocking account',
|
message: 'Unlocking account',
|
||||||
details: 'Decrypting wallet',
|
details: 'Decrypting wallet',
|
||||||
@@ -194,9 +211,6 @@ class SplashScreen extends React.PureComponent {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const blockchainHeaders = status.blockchain_headers;
|
|
||||||
const walletStatus = status.wallet;
|
|
||||||
|
|
||||||
if (blockchainHeaders) {
|
if (blockchainHeaders) {
|
||||||
this.setState({
|
this.setState({
|
||||||
isDownloadingHeaders: blockchainHeaders.downloading_headers,
|
isDownloadingHeaders: blockchainHeaders.downloading_headers,
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import React from 'react';
|
|||||||
import { ActivityIndicator, NativeModules, View, ScrollView, Text } from 'react-native';
|
import { ActivityIndicator, NativeModules, View, ScrollView, Text } from 'react-native';
|
||||||
import Colors from 'styles/colors';
|
import Colors from 'styles/colors';
|
||||||
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
||||||
|
import EmptyStateView from 'component/emptyStateView';
|
||||||
import TransactionList from 'component/transactionList';
|
import TransactionList from 'component/transactionList';
|
||||||
import UriBar from 'component/uriBar';
|
import UriBar from 'component/uriBar';
|
||||||
import walletStyle from 'styles/wallet';
|
import walletStyle from 'styles/wallet';
|
||||||
@@ -53,11 +54,9 @@ class TransactionHistoryPage extends React.PureComponent {
|
|||||||
<Text style={walletStyle.loadingText}>Loading transactions...</Text>
|
<Text style={walletStyle.loadingText}>Loading transactions...</Text>
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
|
{!fetchingTransactions && transactions.length === 0 && <EmptyStateView message={'No transactions to list.'} />}
|
||||||
<ScrollView style={walletStyle.transactionHistoryScroll}>
|
<ScrollView style={walletStyle.transactionHistoryScroll}>
|
||||||
<View style={walletStyle.historyList}>
|
<View style={walletStyle.historyList}>
|
||||||
{!fetchingTransactions && transactions.length === 0 && (
|
|
||||||
<Text style={walletStyle.infoText}>No transactions to list.</Text>
|
|
||||||
)}
|
|
||||||
{!fetchingTransactions && transactions && transactions.length > 0 && (
|
{!fetchingTransactions && transactions && transactions.length > 0 && (
|
||||||
<TransactionList navigation={navigation} transactions={transactions} />
|
<TransactionList navigation={navigation} transactions={transactions} />
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ class SyncVerifyPage extends React.PureComponent {
|
|||||||
navigation.goBack();
|
navigation.goBack();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
syncApply(syncHash, syncData, this.state.password);
|
syncApply(syncHash, syncData, this.state.password ? this.state.password : '');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@@ -68,27 +68,37 @@ class SyncVerifyPage extends React.PureComponent {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
setDefaultAccount(
|
setDefaultAccount(
|
||||||
() => {
|
() => this.finishSync(true),
|
||||||
setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
|
|
||||||
|
|
||||||
// unlock the wallet
|
|
||||||
Lbry.account_unlock({ password: this.state.password ? this.state.password : '' })
|
|
||||||
.then(() => navigation.goBack())
|
|
||||||
.catch(err =>
|
|
||||||
notify({ message: 'The wallet could not be unlocked at this time. Please restart the app.' })
|
|
||||||
);
|
|
||||||
},
|
|
||||||
err => {
|
err => {
|
||||||
notify({
|
// fail silently and still finish
|
||||||
message:
|
this.finishSync();
|
||||||
'The account restore operation could not be completed successfully. Please restart the app and try again.',
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
finishSync = (notifyUnlockFailed = false) => {
|
||||||
|
const { navigation, notify, setClientSetting } = this.props;
|
||||||
|
|
||||||
|
setClientSetting(Constants.SETTING_DEVICE_WALLET_SYNCED, true);
|
||||||
|
|
||||||
|
// unlock the wallet (if locked)
|
||||||
|
Lbry.status().then(status => {
|
||||||
|
if (status.wallet.is_locked) {
|
||||||
|
Lbry.account_unlock({ password: this.state.password ? this.state.password : '' })
|
||||||
|
.then(() => navigation.goBack())
|
||||||
|
.catch(err => {
|
||||||
|
if (notifyUnlockFailed) {
|
||||||
|
notify({ message: 'The wallet could not be unlocked at this time. Please restart the app.' });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
navigation.goBack();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
handleChangeText = text => {
|
handleChangeText = text => {
|
||||||
// save the value to the state email
|
// save the value to the state email
|
||||||
const { onPasswordChanged } = this.props;
|
const { onPasswordChanged } = this.props;
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ const channelCreatorStyle = StyleSheet.create({
|
|||||||
helpText: {
|
helpText: {
|
||||||
fontFamily: 'Inter-UI-Regular',
|
fontFamily: 'Inter-UI-Regular',
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
|
color: Colors.DescriptionGrey,
|
||||||
},
|
},
|
||||||
channelTitleInput: {
|
channelTitleInput: {
|
||||||
marginBottom: 4,
|
marginBottom: 4,
|
||||||
@@ -104,11 +105,12 @@ const channelCreatorStyle = StyleSheet.create({
|
|||||||
avatarImageContainer: {
|
avatarImageContainer: {
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
left: screenWidth / 2 - 80 / 2,
|
left: screenWidth / 2 - 80 / 2,
|
||||||
bottom: -16,
|
bottom: -8,
|
||||||
width: 80,
|
width: 80,
|
||||||
height: 80,
|
height: 80,
|
||||||
borderRadius: 160,
|
borderRadius: 160,
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
|
zIndex: 50,
|
||||||
},
|
},
|
||||||
avatarTouchArea: {
|
avatarTouchArea: {
|
||||||
width: 80,
|
width: 80,
|
||||||
@@ -121,7 +123,7 @@ const channelCreatorStyle = StyleSheet.create({
|
|||||||
height: '100%',
|
height: '100%',
|
||||||
},
|
},
|
||||||
listFooter: {
|
listFooter: {
|
||||||
marginTop: 24,
|
marginTop: 8,
|
||||||
},
|
},
|
||||||
createChannelButton: {
|
createChannelButton: {
|
||||||
backgroundColor: Colors.LbryGreen,
|
backgroundColor: Colors.LbryGreen,
|
||||||
@@ -254,6 +256,15 @@ const channelCreatorStyle = StyleSheet.create({
|
|||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
marginLeft: 4,
|
marginLeft: 4,
|
||||||
},
|
},
|
||||||
|
loading: {
|
||||||
|
position: 'absolute',
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
top: 0,
|
||||||
|
bottom: 0,
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export default channelCreatorStyle;
|
export default channelCreatorStyle;
|
||||||
@@ -169,6 +169,9 @@ const channelPageStyle = StyleSheet.create({
|
|||||||
actionButton: {
|
actionButton: {
|
||||||
backgroundColor: Colors.White,
|
backgroundColor: Colors.White,
|
||||||
},
|
},
|
||||||
|
deleteButton: {
|
||||||
|
marginLeft: 8,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export default channelPageStyle;
|
export default channelPageStyle;
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
import { StyleSheet } from 'react-native';
|
||||||
|
import Colors from './colors';
|
||||||
|
|
||||||
|
const emptyStateStyle = StyleSheet.create({
|
||||||
|
container: {
|
||||||
|
position: 'absolute',
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0,
|
||||||
|
paddingLeft: 24,
|
||||||
|
paddingRight: 24,
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
zIndex: 99,
|
||||||
|
},
|
||||||
|
outerContainer: {
|
||||||
|
top: 60,
|
||||||
|
},
|
||||||
|
innerContainer: {
|
||||||
|
top: 0,
|
||||||
|
},
|
||||||
|
button: {
|
||||||
|
backgroundColor: Colors.LbryGreen,
|
||||||
|
fontSize: 18,
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
width: 128,
|
||||||
|
height: 170,
|
||||||
|
},
|
||||||
|
message: {
|
||||||
|
marginTop: 24,
|
||||||
|
textAlign: 'center',
|
||||||
|
fontFamily: 'Inter-UI-Regular',
|
||||||
|
fontSize: 18,
|
||||||
|
lineHeight: 28,
|
||||||
|
marginBottom: 24,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
export default emptyStateStyle;
|
||||||
+25
-2
@@ -1,6 +1,9 @@
|
|||||||
import { StyleSheet } from 'react-native';
|
import { Dimensions, StyleSheet } from 'react-native';
|
||||||
import Colors from './colors';
|
import Colors from './colors';
|
||||||
|
|
||||||
|
const screenDimension = Dimensions.get('window');
|
||||||
|
const screenWidth = screenDimension.width;
|
||||||
|
|
||||||
const publishStyle = StyleSheet.create({
|
const publishStyle = StyleSheet.create({
|
||||||
container: {
|
container: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
@@ -433,8 +436,13 @@ const publishStyle = StyleSheet.create({
|
|||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
color: Colors.DescriptionGrey,
|
color: Colors.DescriptionGrey,
|
||||||
},
|
},
|
||||||
|
helpText: {
|
||||||
|
fontFamily: 'Inter-UI-Regular',
|
||||||
|
fontSize: 12,
|
||||||
|
color: Colors.DescriptionGrey,
|
||||||
|
},
|
||||||
publishesFooter: {
|
publishesFooter: {
|
||||||
marginTop: 16,
|
marginTop: 2,
|
||||||
marginLeft: 16,
|
marginLeft: 16,
|
||||||
marginRight: 16,
|
marginRight: 16,
|
||||||
},
|
},
|
||||||
@@ -443,6 +451,21 @@ const publishStyle = StyleSheet.create({
|
|||||||
backgroundColor: Colors.LbryGreen,
|
backgroundColor: Colors.LbryGreen,
|
||||||
marginTop: 16,
|
marginTop: 16,
|
||||||
},
|
},
|
||||||
|
thumbnailEditOverlay: {
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
borderRadius: 24,
|
||||||
|
position: 'absolute',
|
||||||
|
padding: 8,
|
||||||
|
left: screenWidth / 2 - 32 / 2,
|
||||||
|
bottom: 8,
|
||||||
|
backgroundColor: '#00000077',
|
||||||
|
},
|
||||||
|
editIcon: {
|
||||||
|
color: Colors.White,
|
||||||
|
fontFamily: 'Inter-UI-SemiBold',
|
||||||
|
fontSize: 12,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export default publishStyle;
|
export default publishStyle;
|
||||||
@@ -0,0 +1,117 @@
|
|||||||
|
/* eslint-disable */
|
||||||
|
// underscore's deep equal function
|
||||||
|
// https://github.com/jashkenas/underscore/blob/master/underscore.js#L1189
|
||||||
|
|
||||||
|
export default function isEqual(a, b, aStack, bStack) {
|
||||||
|
// Identical objects are equal. `0 === -0`, but they aren't identical.
|
||||||
|
// See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
|
||||||
|
if (a === b) return a !== 0 || 1 / a === 1 / b;
|
||||||
|
// `null` or `undefined` only equal to itself (strict comparison).
|
||||||
|
if (a == null || b == null) return false;
|
||||||
|
// `NaN`s are equivalent, but non-reflexive.
|
||||||
|
if (a !== a) return b !== b;
|
||||||
|
// Exhaust primitive checks
|
||||||
|
var type = typeof a;
|
||||||
|
if (type !== 'function' && type !== 'object' && typeof b != 'object') return false;
|
||||||
|
return deepEq(a, b, aStack, bStack);
|
||||||
|
}
|
||||||
|
|
||||||
|
function deepEq(a, b, aStack, bStack) {
|
||||||
|
// Compare `[[Class]]` names.
|
||||||
|
var className = toString.call(a);
|
||||||
|
if (className !== toString.call(b)) return false;
|
||||||
|
switch (className) {
|
||||||
|
// Strings, numbers, regular expressions, dates, and booleans are compared by value.
|
||||||
|
case '[object RegExp]':
|
||||||
|
// RegExps are coerced to strings for comparison (Note: '' + /a/i === '/a/i')
|
||||||
|
case '[object String]':
|
||||||
|
// Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
|
||||||
|
// equivalent to `new String("5")`.
|
||||||
|
return '' + a === '' + b;
|
||||||
|
case '[object Number]':
|
||||||
|
// `NaN`s are equivalent, but non-reflexive.
|
||||||
|
// Object(NaN) is equivalent to NaN.
|
||||||
|
if (+a !== +a) return +b !== +b;
|
||||||
|
// An `egal` comparison is performed for other numeric values.
|
||||||
|
return +a === 0 ? 1 / +a === 1 / b : +a === +b;
|
||||||
|
case '[object Date]':
|
||||||
|
case '[object Boolean]':
|
||||||
|
// Coerce dates and booleans to numeric primitive values. Dates are compared by their
|
||||||
|
// millisecond representations. Note that invalid dates with millisecond representations
|
||||||
|
// of `NaN` are not equivalent.
|
||||||
|
return +a === +b;
|
||||||
|
case '[object Symbol]':
|
||||||
|
return SymbolProto.valueOf.call(a) === SymbolProto.valueOf.call(b);
|
||||||
|
}
|
||||||
|
|
||||||
|
var areArrays = className === '[object Array]';
|
||||||
|
if (!areArrays) {
|
||||||
|
if (typeof a != 'object' || typeof b != 'object') return false;
|
||||||
|
|
||||||
|
// Objects with different constructors are not equivalent, but `Object`s or `Array`s
|
||||||
|
// from different frames are.
|
||||||
|
var aCtor = a.constructor,
|
||||||
|
bCtor = b.constructor;
|
||||||
|
if (
|
||||||
|
aCtor !== bCtor &&
|
||||||
|
!(
|
||||||
|
typeof aCtor === 'function' &&
|
||||||
|
aCtor instanceof aCtor &&
|
||||||
|
typeof bCtor === 'function' &&
|
||||||
|
bCtor instanceof bCtor
|
||||||
|
) &&
|
||||||
|
('constructor' in a && 'constructor' in b)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Assume equality for cyclic structures. The algorithm for detecting cyclic
|
||||||
|
// structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
|
||||||
|
|
||||||
|
// Initializing stack of traversed objects.
|
||||||
|
// It's done here since we only need them for objects and arrays comparison.
|
||||||
|
aStack = aStack || [];
|
||||||
|
bStack = bStack || [];
|
||||||
|
var length = aStack.length;
|
||||||
|
while (length--) {
|
||||||
|
// Linear search. Performance is inversely proportional to the number of
|
||||||
|
// unique nested structures.
|
||||||
|
if (aStack[length] === a) return bStack[length] === b;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add the first object to the stack of traversed objects.
|
||||||
|
aStack.push(a);
|
||||||
|
bStack.push(b);
|
||||||
|
|
||||||
|
// Recursively compare objects and arrays.
|
||||||
|
if (areArrays) {
|
||||||
|
// Compare array lengths to determine if a deep comparison is necessary.
|
||||||
|
length = a.length;
|
||||||
|
if (length !== b.length) return false;
|
||||||
|
// Deep compare the contents, ignoring non-numeric properties.
|
||||||
|
while (length--) {
|
||||||
|
if (!isEqual(a[length], b[length], aStack, bStack)) return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Deep compare objects.
|
||||||
|
var keys = Object.keys(a),
|
||||||
|
key;
|
||||||
|
length = keys.length;
|
||||||
|
// Ensure that both objects contain the same number of properties before comparing deep equality.
|
||||||
|
if (Object.keys(b).length !== length) return false;
|
||||||
|
while (length--) {
|
||||||
|
// Deep compare each member
|
||||||
|
key = keys[length];
|
||||||
|
if (!(has(b, key) && isEqual(a[key], b[key], aStack, bStack))) return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Remove the first object from the stack of traversed objects.
|
||||||
|
aStack.pop();
|
||||||
|
bStack.pop();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function has(obj, path) {
|
||||||
|
return obj != null && hasOwnProperty.call(obj, path);
|
||||||
|
}
|
||||||
|
/* eslint-enable */
|
||||||
Reference in new issue
Block a user