LBRYCommunity/lbry-react-native
1
0
Fork 0
Code Issues Pull requests 12 Projects Releases Packages Wiki Activity

make channel sort by selection component-specific

Browse source
This commit is contained in:
Akinwale Ariwodola 2019-12-11 09:04:19 +01:00
parent 6fe9e9a5f7
commit 18b7117765
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/page/channel/view.js
View file

@ -38,6 +38,7 @@ class ChannelPage extends React.PureComponent {
showTimePicker: false, showTimePicker: false,
orderBy: ['release_time'], // sort by new by default orderBy: ['release_time'], // sort by new by default
activeTab: Constants.CONTENT_TAB, activeTab: Constants.CONTENT_TAB,
currentSortByItem: Constants.CLAIM_SEARCH_SORT_BY_ITEMS[1], // should always default to sorting channel pages by new
}; };
componentWillMount() { componentWillMount() {
@ -48,16 +49,14 @@ class ChannelPage extends React.PureComponent {
} }
componentDidMount() { componentDidMount() {
const { fetchChannelListMine, setSortByItem } = this.props; const { fetchChannelListMine } = this.props;
NativeModules.Firebase.setCurrentScreen('Channel'); NativeModules.Firebase.setCurrentScreen('Channel');
setSortByItem(Constants.CLAIM_SEARCH_SORT_BY_ITEMS[1]); // sort by newest first
fetchChannelListMine(); fetchChannelListMine();
} }
handleSortByItemSelected = item => { handleSortByItemSelected = item => {
const { setSortByItem } = this.props; // sort by specific only to this component state
setSortByItem(item); this.setState({ currentSortByItem: item, orderBy: getOrderBy(item), showSortPicker: false });
this.setState({ orderBy: getOrderBy(item), showSortPicker: false });
}; };
handleTimeItemSelected = item => { handleTimeItemSelected = item => {
@ -67,17 +66,18 @@ class ChannelPage extends React.PureComponent {
}; };
listHeader = () => { listHeader = () => {
const { sortByItem, timeItem } = this.props; const { timeItem } = this.props;
const { currentSortByItem } = this.state;
return ( return (
<View style={channelPageStyle.listHeader}> <View style={channelPageStyle.listHeader}>
<View style={discoverStyle.pickerRow}> <View style={discoverStyle.pickerRow}>
<View style={discoverStyle.leftPickerRow}> <View style={discoverStyle.leftPickerRow}>
<TouchableOpacity style={discoverStyle.tagSortBy} onPress={() => this.setState({ showSortPicker: true })}> <TouchableOpacity style={discoverStyle.tagSortBy} onPress={() => this.setState({ showSortPicker: true })}>
<Text style={discoverStyle.tagSortText}>{__(sortByItem.label.split(' ')[0])}</Text> <Text style={discoverStyle.tagSortText}>{__(currentSortByItem.label.split(' ')[0])}</Text>
<Icon style={discoverStyle.tagSortIcon} name={'sort-down'} size={14} /> <Icon style={discoverStyle.tagSortIcon} name={'sort-down'} size={14} />
</TouchableOpacity> </TouchableOpacity>
{Constants.SORT_BY_TOP === sortByItem.name && ( {Constants.SORT_BY_TOP === currentSortByItem.name && (
<TouchableOpacity style={discoverStyle.tagTime} onPress={() => this.setState({ showTimePicker: true })}> <TouchableOpacity style={discoverStyle.tagTime} onPress={() => this.setState({ showTimePicker: true })}>
<Text style={discoverStyle.tagSortText}>{__(timeItem.label)}</Text> <Text style={discoverStyle.tagSortText}>{__(timeItem.label)}</Text>
<Icon style={discoverStyle.tagSortIcon} name={'sort-down'} size={14} /> <Icon style={discoverStyle.tagSortIcon} name={'sort-down'} size={14} />
@ -207,9 +207,9 @@ class ChannelPage extends React.PureComponent {
}; };
render() { render() {
const { channels, claim, navigation, uri, drawerStack, popDrawerStack, sortByItem, timeItem } = this.props; const { channels, claim, navigation, uri, drawerStack, popDrawerStack, timeItem } = this.props;
const { name, permanent_url: permanentUrl } = claim; const { name, permanent_url: permanentUrl } = claim;
const { autoStyle, showSortPicker, showTimePicker } = this.state; const { autoStyle, currentSortByItem, showSortPicker, showTimePicker } = this.state;
const ownedChannel = channels ? channels.map(channel => channel.permanent_url).includes(permanentUrl) : false; const ownedChannel = channels ? channels.map(channel => channel.permanent_url).includes(permanentUrl) : false;
let thumbnailUrl, let thumbnailUrl,
@ -327,7 +327,7 @@ class ChannelPage extends React.PureComponent {
title={__('Sort content by')} title={__('Sort content by')}
onOverlayPress={() => this.setState({ showSortPicker: false })} onOverlayPress={() => this.setState({ showSortPicker: false })}
onItemSelected={this.handleSortByItemSelected} onItemSelected={this.handleSortByItemSelected}
selectedItem={sortByItem} selectedItem={currentSortByItem}
items={Constants.CLAIM_SEARCH_SORT_BY_ITEMS} items={Constants.CLAIM_SEARCH_SORT_BY_ITEMS}
/> />
)} )}

2
src/page/file/view.js
View file

@ -1023,7 +1023,7 @@ class FilePage extends React.PureComponent {
<Text style={filePageStyle.largeButtonText}>{__('Tip')}</Text> <Text style={filePageStyle.largeButtonText}>{__('Tip')}</Text>
</TouchableOpacity> </TouchableOpacity>
{!canEdit && ( {!canEdit && !isPlayable && (
<View style={filePageStyle.sharedLargeButton}> <View style={filePageStyle.sharedLargeButton}>
{!fileInfo || {!fileInfo ||
(fileInfo.written_bytes <= 0 && !completed && ( (fileInfo.written_bytes <= 0 && !completed && (

2
src/page/subscriptions/view.js
View file

@ -243,7 +243,7 @@ class SubscriptionsPage extends React.PureComponent {
title={__('Sort content by')} title={__('Sort content by')}
onOverlayPress={() => this.setState({ showSortPicker: false })} onOverlayPress={() => this.setState({ showSortPicker: false })}
onItemSelected={this.handleSortByItemSelected} onItemSelected={this.handleSortByItemSelected}
selectedItem={this.state.currentSortByItem} selectedItem={currentSortByItem}
items={Constants.CLAIM_SEARCH_SORT_BY_ITEMS} items={Constants.CLAIM_SEARCH_SORT_BY_ITEMS}
/> />
)} )}