Tag search result #71
5 changed files with 34 additions and 11 deletions
|
@ -9,15 +9,15 @@ import discoverStyle from 'styles/discover';
|
||||||
|
|
||||||
const groupedMenuItems = {
|
const groupedMenuItems = {
|
||||||
'Find content': [
|
'Find content': [
|
||||||
{ icon: 'hashtag', label: 'Your tags', route: Constants.DRAWER_ROUTE_DISCOVER },
|
{ icon: 'hashtag', label: 'Your Tags', route: Constants.DRAWER_ROUTE_DISCOVER },
|
||||||
{ icon: 'heart', solid: true, label: 'Subscriptions', route: Constants.DRAWER_ROUTE_SUBSCRIPTIONS },
|
{ icon: 'heart', solid: true, label: 'Subscriptions', route: Constants.DRAWER_ROUTE_SUBSCRIPTIONS },
|
||||||
{ icon: 'globe-americas', label: 'All content', route: Constants.DRAWER_ROUTE_TRENDING },
|
{ icon: 'globe-americas', label: 'All Content', route: Constants.DRAWER_ROUTE_TRENDING },
|
||||||
],
|
],
|
||||||
'Your content': [
|
'Your content': [
|
||||||
{ icon: 'at', label: 'Channels', route: Constants.DRAWER_ROUTE_CHANNEL_CREATOR },
|
{ icon: 'at', label: 'Channels', route: Constants.DRAWER_ROUTE_CHANNEL_CREATOR },
|
||||||
{ icon: 'download', label: 'Library', route: Constants.DRAWER_ROUTE_MY_LBRY },
|
{ icon: 'download', label: 'Library', route: Constants.DRAWER_ROUTE_MY_LBRY },
|
||||||
{ icon: 'cloud-upload-alt', label: 'Publishes', route: Constants.DRAWER_ROUTE_PUBLISHES },
|
{ icon: 'cloud-upload-alt', label: 'Publishes', route: Constants.DRAWER_ROUTE_PUBLISHES },
|
||||||
{ icon: 'upload', label: 'New publish', route: Constants.DRAWER_ROUTE_PUBLISH },
|
{ icon: 'upload', label: 'New Publish', route: Constants.DRAWER_ROUTE_PUBLISH },
|
||||||
],
|
],
|
||||||
Wallet: [
|
Wallet: [
|
||||||
{ icon: 'wallet', label: 'Wallet', route: Constants.DRAWER_ROUTE_WALLET },
|
{ icon: 'wallet', label: 'Wallet', route: Constants.DRAWER_ROUTE_WALLET },
|
||||||
|
@ -112,14 +112,14 @@ class DrawerContent extends React.PureComponent {
|
||||||
accessibilityLabel={'Sign In'}
|
accessibilityLabel={'Sign In'}
|
||||||
onPress={this.launchSignInFlow}
|
onPress={this.launchSignInFlow}
|
||||||
delayPressIn={0}
|
delayPressIn={0}
|
||||||
style={discoverStyle.signInMenuItem}
|
style={[discoverStyle.signInMenuItem, discoverStyle.signInMenuItemButton]}
|
||||||
>
|
>
|
||||||
<Text style={discoverStyle.signInMenuItemText}>SIGN IN</Text>
|
<Text style={discoverStyle.signInMenuItemButtonText}>SIGN IN</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{signedIn && (
|
{signedIn && (
|
||||||
<View style={discoverStyle.signInMenuItem}>
|
<View style={[discoverStyle.signInMenuItem, discoverStyle.signInMenuItemBorder]}>
|
||||||
<Text style={discoverStyle.signInMenuItemText} numberOfLines={1}>
|
<Text style={discoverStyle.signInMenuItemText} numberOfLines={1}>
|
||||||
{user.primary_email.toUpperCase()}
|
{user.primary_email.toUpperCase()}
|
||||||
</Text>
|
</Text>
|
||||||
|
|
|
@ -4,6 +4,7 @@ import { ActivityIndicator, NativeModules, Platform, Text, View } from 'react-na
|
||||||
import AsyncStorage from '@react-native-community/async-storage';
|
import AsyncStorage from '@react-native-community/async-storage';
|
||||||
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 Link from 'component/link';
|
||||||
import firstRunStyle from 'styles/firstRun';
|
import firstRunStyle from 'styles/firstRun';
|
||||||
|
|
||||||
class WelcomePage extends React.PureComponent {
|
class WelcomePage extends React.PureComponent {
|
||||||
|
@ -106,6 +107,11 @@ class WelcomePage extends React.PureComponent {
|
||||||
LBRY is a community-controlled content platform where you can find and publish videos, music, books, and
|
LBRY is a community-controlled content platform where you can find and publish videos, music, books, and
|
||||||
more.
|
more.
|
||||||
</Text>
|
</Text>
|
||||||
|
<Text style={[firstRunStyle.infoParagraph, firstRunStyle.tosParagraph]}>
|
||||||
|
By continuing, I agree to the{' '}
|
||||||
|
<Link style={firstRunStyle.tosLink} text={'Terms of Service'} href={'https://lbry.com/termsofservice'} />{' '}
|
||||||
|
and confirm I am over the age of 13.
|
||||||
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -295,9 +295,7 @@ const discoverStyle = StyleSheet.create({
|
||||||
color: Colors.DescriptionGrey,
|
color: Colors.DescriptionGrey,
|
||||||
marginRight: 6,
|
marginRight: 6,
|
||||||
},
|
},
|
||||||
menuScrollContent: {
|
menuScrollContent: {},
|
||||||
paddingTop: 12,
|
|
||||||
},
|
|
||||||
menuGroup: {
|
menuGroup: {
|
||||||
marginTop: 8,
|
marginTop: 8,
|
||||||
marginBottom: 8,
|
marginBottom: 8,
|
||||||
|
@ -368,20 +366,32 @@ const discoverStyle = StyleSheet.create({
|
||||||
height: '100%',
|
height: '100%',
|
||||||
},
|
},
|
||||||
signInMenuItem: {
|
signInMenuItem: {
|
||||||
paddingTop: 6,
|
paddingTop: 16,
|
||||||
paddingBottom: 12,
|
paddingBottom: 12,
|
||||||
paddingLeft: 16,
|
paddingLeft: 16,
|
||||||
paddingRight: 16,
|
paddingRight: 16,
|
||||||
marginBottom: 6,
|
marginBottom: 6,
|
||||||
borderBottomWidth: 1,
|
borderBottomWidth: 1,
|
||||||
|
},
|
||||||
|
signInMenuItemBorder: {
|
||||||
borderBottomColor: Colors.VeryLightGrey,
|
borderBottomColor: Colors.VeryLightGrey,
|
||||||
},
|
},
|
||||||
|
signInMenuItemButton: {
|
||||||
|
backgroundColor: Colors.LbryGreen,
|
||||||
|
borderBottomColor: Colors.LbryGreen,
|
||||||
|
},
|
||||||
signInMenuItemText: {
|
signInMenuItemText: {
|
||||||
color: Colors.DescriptionGrey,
|
color: Colors.DescriptionGrey,
|
||||||
fontFamily: 'Inter-UI-SemiBold',
|
fontFamily: 'Inter-UI-SemiBold',
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
textAlign: 'center',
|
textAlign: 'center',
|
||||||
},
|
},
|
||||||
|
signInMenuItemButtonText: {
|
||||||
|
color: Colors.White,
|
||||||
|
fontFamily: 'Inter-UI-SemiBold',
|
||||||
|
fontSize: 14,
|
||||||
|
textAlign: 'center',
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export default discoverStyle;
|
export default discoverStyle;
|
||||||
|
|
|
@ -209,6 +209,12 @@ const firstRunStyle = StyleSheet.create({
|
||||||
revealIcon: {
|
revealIcon: {
|
||||||
color: Colors.White,
|
color: Colors.White,
|
||||||
},
|
},
|
||||||
|
tosLink: {
|
||||||
|
textDecorationLine: 'underline',
|
||||||
|
},
|
||||||
|
tosParagraph: {
|
||||||
|
marginTop: 48,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export default firstRunStyle;
|
export default firstRunStyle;
|
||||||
|
|
|
@ -249,7 +249,8 @@ const rewardStyle = StyleSheet.create({
|
||||||
},
|
},
|
||||||
learnMoreLink: {
|
learnMoreLink: {
|
||||||
fontFamily: 'Inter-UI-Regular',
|
fontFamily: 'Inter-UI-Regular',
|
||||||
color: Colors.NextLbryGreen,
|
color: Colors.White,
|
||||||
|
textDecorationLine: 'underline',
|
||||||
},
|
},
|
||||||
enrollButton: {
|
enrollButton: {
|
||||||
backgroundColor: Colors.White,
|
backgroundColor: Colors.White,
|
||||||
|
|
Loading…
Reference in a new issue