diff --git a/app/src/component/AppNavigator.js b/app/src/component/AppNavigator.js index d658360a..c8c7f965 100644 --- a/app/src/component/AppNavigator.js +++ b/app/src/component/AppNavigator.js @@ -1,18 +1,18 @@ import React from 'react'; -import AboutPage from '../page/about'; -import DiscoverPage from '../page/discover'; -import DownloadsPage from '../page/downloads'; -import FilePage from '../page/file'; -import FirstRunScreen from '../page/firstRun'; -import RewardsPage from '../page/rewards'; -import TrendingPage from '../page/trending'; -import SearchPage from '../page/search'; -import SettingsPage from '../page/settings'; -import SplashScreen from '../page/splash'; -import SubscriptionsPage from '../page/subscriptions'; -import TransactionHistoryPage from '../page/transactionHistory'; -import WalletPage from '../page/wallet'; -import SearchInput from '../component/searchInput'; +import AboutPage from 'page/about'; +import DiscoverPage from 'page/discover'; +import DownloadsPage from 'page/downloads'; +import FilePage from 'page/file'; +import FirstRunScreen from 'page/firstRun'; +import RewardsPage from 'page/rewards'; +import TrendingPage from 'page/trending'; +import SearchPage from 'page/search'; +import SettingsPage from 'page/settings'; +import SplashScreen from 'page/splash'; +import SubscriptionsPage from 'page/subscriptions'; +import TransactionHistoryPage from 'page/transactionHistory'; +import WalletPage from 'page/wallet'; +import SearchInput from 'component/searchInput'; import { createDrawerNavigator, createStackNavigator, diff --git a/app/src/component/uriBar/internal/uri-bar-item.js b/app/src/component/uriBar/internal/uri-bar-item.js index 0f08f439..8d2fe8d4 100644 --- a/app/src/component/uriBar/internal/uri-bar-item.js +++ b/app/src/component/uriBar/internal/uri-bar-item.js @@ -29,7 +29,14 @@ class UriBarItem extends React.PureComponent { return ( {icon} - {shorthand || value} - {type === 'search' ? 'Search' : value} + + {shorthand || value} - {type === SEARCH_TYPES.SEARCH ? 'Search' : value} + + {type === SEARCH_TYPES.SEARCH && `Search for '${value}'`} + {type === SEARCH_TYPES.CHANNEL && `View the @${shorthand} channel`} + {type === SEARCH_TYPES.FILE && `View content at ${value}`} + + ) } diff --git a/app/src/styles/colors.js b/app/src/styles/colors.js index d6098b8b..39bd2441 100644 --- a/app/src/styles/colors.js +++ b/app/src/styles/colors.js @@ -11,6 +11,7 @@ const Colors = { Red: '#ff0000', VeryLightGrey: '#f1f1f1', White: '#ffffff', + UriDescBlue: '#3971db', StatsAudio: '#f6a637', StatsImage: '#ff4a7d', diff --git a/app/src/styles/uriBar.js b/app/src/styles/uriBar.js index 23923bba..e930e64d 100644 --- a/app/src/styles/uriBar.js +++ b/app/src/styles/uriBar.js @@ -45,14 +45,24 @@ const uriBarStyle = StyleSheet.create({ }, item: { flexDirection: 'row', - justifyContent: 'flex-start', - padding: 12 + alignItems: 'center', + padding: 12, + paddingTop: 8, + paddingBottom: 8 + }, + itemContent: { + marginLeft: 12, + marginRight: 12, + flex: 1 }, itemText: { fontFamily: 'Inter-UI-Regular', fontSize: 16, - marginLeft: 12, - marginRight: 12 + }, + itemDesc: { + fontFamily: 'Inter-UI-Regular', + fontSize: 14, + color: Colors.UriDescBlue }, drawerMenuButton: { height: '100%',