From 9882d9d1c952bcaebdc54e654974cda8b447c9f3 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Wed, 8 Aug 2018 18:11:25 +0100 Subject: [PATCH] FontAwesome 5 everywhere --- app/src/component/AppNavigator.js | 10 +++++----- app/src/component/pageHeader/view.js | 6 +++--- .../component/uriBar/internal/uri-bar-item.js | 18 +++++++++--------- app/src/component/walletAddress/view.js | 4 ++-- app/src/page/discover/view.js | 5 ++--- app/src/page/trending/view.js | 1 - 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/app/src/component/AppNavigator.js b/app/src/component/AppNavigator.js index 18f3ef05..735cbe3c 100644 --- a/app/src/component/AppNavigator.js +++ b/app/src/component/AppNavigator.js @@ -29,7 +29,7 @@ import { } from 'react-native'; import { SETTINGS, doHideNotification, selectNotification } from 'lbry-redux'; import { makeSelectClientSetting } from '../redux/selectors/settings'; -import Feather from 'react-native-vector-icons/Feather'; +import Icon from 'react-native-vector-icons/FontAwesome5'; import discoverStyle from '../styles/discover'; import searchStyle from '../styles/search'; import SearchRightHeaderIcon from "../component/searchRightHeaderIcon"; @@ -39,7 +39,7 @@ const discoverStack = StackNavigator({ screen: DiscoverPage, navigationOptions: ({ navigation }) => ({ title: 'Discover', - headerLeft: navigation.navigate('DrawerOpen')} />, + headerLeft: navigation.navigate('DrawerOpen')} />, }) }, File: { @@ -64,7 +64,7 @@ const trendingStack = StackNavigator({ screen: TrendingPage, navigationOptions: ({ navigation }) => ({ title: 'Trending', - headerLeft: navigation.navigate('DrawerOpen')} />, + headerLeft: navigation.navigate('DrawerOpen')} />, }) } }); @@ -74,7 +74,7 @@ const walletStack = StackNavigator({ screen: WalletPage, navigationOptions: ({ navigation }) => ({ title: 'Wallet', - headerLeft: navigation.navigate('DrawerOpen')} />, + headerLeft: navigation.navigate('DrawerOpen')} />, }) }, TransactionHistory: { @@ -144,7 +144,7 @@ class AppWithNavigationState extends React.Component { } } } - return false; + return false;fo }.bind(this)); } diff --git a/app/src/component/pageHeader/view.js b/app/src/component/pageHeader/view.js index 820fbff0..7dfcdc55 100644 --- a/app/src/component/pageHeader/view.js +++ b/app/src/component/pageHeader/view.js @@ -8,7 +8,7 @@ import { TouchableOpacity, View } from 'react-native'; -import Feather from 'react-native-vector-icons/Feather'; +import Icon from 'react-native-vector-icons/FontAwesome5'; import pageHeaderStyle from '../../styles/pageHeader'; const APPBAR_HEIGHT = Platform.OS === 'ios' ? 44 : 56; @@ -21,7 +21,7 @@ class PageHeader extends React.PureComponent { pageHeaderStyle.container, { height: APPBAR_HEIGHT } ]; - + return ( @@ -35,7 +35,7 @@ class PageHeader extends React.PureComponent { - + diff --git a/app/src/component/uriBar/internal/uri-bar-item.js b/app/src/component/uriBar/internal/uri-bar-item.js index 40d54937..0f08f439 100644 --- a/app/src/component/uriBar/internal/uri-bar-item.js +++ b/app/src/component/uriBar/internal/uri-bar-item.js @@ -2,37 +2,37 @@ import React from 'react'; import { SEARCH_TYPES, normalizeURI } from 'lbry-redux'; import { Text, TouchableOpacity, View } from 'react-native'; -import Feather from 'react-native-vector-icons/Feather'; +import Icon from 'react-native-vector-icons/FontAwesome5'; import uriBarStyle from '../../../styles/uriBar'; class UriBarItem extends React.PureComponent { render() { const { item, onPress } = this.props; const { shorthand, type, value } = item; - + let icon; switch (type) { case SEARCH_TYPES.CHANNEL: - icon = + icon = break; - + case SEARCH_TYPES.SEARCH: - icon = + icon = break; - + case SEARCH_TYPES.FILE: default: - icon = + icon = break; } - + return ( {icon} {shorthand || value} - {type === 'search' ? 'Search' : value} ) - } + } } export default UriBarItem; diff --git a/app/src/component/walletAddress/view.js b/app/src/component/walletAddress/view.js index 6ad7326a..17d991fe 100644 --- a/app/src/component/walletAddress/view.js +++ b/app/src/component/walletAddress/view.js @@ -24,14 +24,14 @@ class WalletAddress extends React.PureComponent { render() { const { receiveAddress, getNewAddress, gettingNewAddress } = this.props; - + return ( Receive Credits Use this wallet address to receive credits sent by another user (or yourself).