LBRYCommunity/lbry-android
1
0
Fork 0
Code Issues 155 Pull requests 6 Projects Releases 84 Packages Wiki Activity

Merge pull request #156 from lbryio/search-result-urls

Browse source 
Add URI to search result items. Update omnibar URI suggestions display.
This commit is contained in:
Akinwale Ariwodola 2018-06-04 17:34:38 +01:00 committed by GitHub
commit 8c3ca2161d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/component/searchResultItem/view.js
View file

@ -1,6 +1,7 @@
import React from 'react'; import React from 'react';
import { normalizeURI, parseURI } from 'lbry-redux'; import { normalizeURI, parseURI } from 'lbry-redux';
import { Text, TouchableOpacity, View } from 'react-native'; import { ActivityIndicator, Text, TouchableOpacity, View } from 'react-native';
import Colors from '../../styles/colors';
import FileItemMedia from '../fileItemMedia'; import FileItemMedia from '../fileItemMedia';
import NsfwOverlay from '../../component/nsfwOverlay'; import NsfwOverlay from '../../component/nsfwOverlay';
import searchStyle from '../../styles/search'; import searchStyle from '../../styles/search';
@ -39,7 +40,13 @@ class SearchResultItem extends React.PureComponent {
thumbnail={metadata ? metadata.thumbnail : null} /> thumbnail={metadata ? metadata.thumbnail : null} />
</View> </View>
<View style={searchStyle.detailsContainer}> <View style={searchStyle.detailsContainer}>
{isResolvingUri && <Text style={searchStyle.loading}>Loading...</Text>} {isResolvingUri && (
<View>
<Text style={searchStyle.uri}>{uri}</Text>
<View style={searchStyle.row}>
<ActivityIndicator size={"small"} color={Colors.LbryGreen} />
</View>
</View>)}
{!isResolvingUri && <Text style={searchStyle.title}>{title || name}</Text>} {!isResolvingUri && <Text style={searchStyle.title}>{title || name}</Text>}
{!isResolvingUri && channel && <Text style={searchStyle.publisher}>{channel}</Text>} {!isResolvingUri && channel && <Text style={searchStyle.publisher}>{channel}</Text>}
</View> </View>

4
app/src/component/uriBar/internal/uri-bar-item.js
View file

@ -8,7 +8,7 @@ import uriBarStyle from '../../../styles/uriBar';
class UriBarItem extends React.PureComponent { class UriBarItem extends React.PureComponent {
render() { render() {
const { item, onPress } = this.props; const { item, onPress } = this.props;
const { type, value } = item; const { shorthand, type, value } = item;
let icon; let icon;
switch (type) { switch (type) {
@ -29,7 +29,7 @@ class UriBarItem extends React.PureComponent {
return ( return (
<TouchableOpacity style={uriBarStyle.item} onPress={onPress}> <TouchableOpacity style={uriBarStyle.item} onPress={onPress}>
{icon} {icon}
<Text style={uriBarStyle.itemText} numberOfLines={1}>{value}</Text> <Text style={uriBarStyle.itemText} numberOfLines={1}>{shorthand || value} - {type === 'search' ? 'Search' : value}</Text>
</TouchableOpacity> </TouchableOpacity>
) )
} }

5
app/src/styles/search.js
View file

@ -42,6 +42,11 @@ const searchStyle = StyleSheet.create({
fontFamily: 'Metropolis-SemiBold', fontFamily: 'Metropolis-SemiBold',
fontSize: 16 fontSize: 16
}, },
uri: {
fontFamily: 'Metropolis-SemiBold',
fontSize: 14,
marginBottom: 8
},
publisher: { publisher: {
fontFamily: 'Metropolis-SemiBold', fontFamily: 'Metropolis-SemiBold',
fontSize: 12, fontSize: 12,