From e62d5741c28291d88f17d915888c6dcc996c91aa Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Fri, 15 Mar 2019 12:50:58 +0100 Subject: [PATCH 1/4] add channel name to channel page --- app/src/page/channel/view.js | 8 ++++++-- app/src/styles/channelPage.js | 19 ++++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/app/src/page/channel/view.js b/app/src/page/channel/view.js index 14da2754..c4329e65 100644 --- a/app/src/page/channel/view.js +++ b/app/src/page/channel/view.js @@ -6,6 +6,7 @@ import Colors from 'styles/colors'; import Button from 'component/button'; import FileList from 'component/fileList'; import PageHeader from 'component/pageHeader'; +import SubscribeButton from 'component/subscribeButton'; import UriBar from 'component/uriBar'; import channelPageStyle from 'styles/channelPage'; @@ -82,7 +83,11 @@ class ChannelPage extends React.PureComponent { return ( - navigateBack(navigation, drawerStack, popDrawerStack)} /> + + + {name} + + {contentList} {(totalPages > 1) && this.state.showPageButtons && @@ -99,7 +104,6 @@ class ChannelPage extends React.PureComponent { disabled={!!fetching} onPress={this.handleNextPage} />} } - ) } diff --git a/app/src/styles/channelPage.js b/app/src/styles/channelPage.js index 43b8f068..9e241e5e 100644 --- a/app/src/styles/channelPage.js +++ b/app/src/styles/channelPage.js @@ -39,7 +39,7 @@ const channelPageStyle = StyleSheet.create({ flexDirection: 'row', justifyContent: 'space-between', position: 'absolute', - bottom: 76, + bottom: 16, paddingLeft: 16, paddingRight: 16 }, @@ -50,6 +50,23 @@ const channelPageStyle = StyleSheet.create({ }, nextButton: { alignSelf: 'flex-end' + }, + channelHeader: { + marginTop: 60, + marginLeft: 16, + marginRight: 16 + }, + channelName: { + fontFamily: 'Inter-UI-SemiBold', + fontSize: 24, + marginTop: 16, + marginBottom: 8 + }, + subscribeButton: { + alignSelf: 'flex-start', + backgroundColor: Colors.White, + paddingLeft: 16, + paddingRight: 16 } }); -- 2.45.2 From 4132416f0df17b1f620c004b3115455a81295fca Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Fri, 15 Mar 2019 13:18:45 +0100 Subject: [PATCH 2/4] shorten search hint --- app/src/component/uriBar/view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/component/uriBar/view.js b/app/src/component/uriBar/view.js index 4cea8a3a..6dc82f9a 100644 --- a/app/src/component/uriBar/view.js +++ b/app/src/component/uriBar/view.js @@ -118,7 +118,7 @@ class UriBar extends React.PureComponent { style={uriBarStyle.uriText} onLayout={() => { this.setSelection(); }} selectTextOnFocus={true} - placeholder={'Search for videos, music, games and more'} + placeholder={'Search movies, music, and more'} underlineColorAndroid={'transparent'} numberOfLines={1} clearButtonMode={'while-editing'} -- 2.45.2 From 7f94c3a5e1b16b823178b5b51c38ddc8a5f7c8a2 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Fri, 15 Mar 2019 18:21:06 +0100 Subject: [PATCH 3/4] show rewards icon in pending rewards button --- app/src/component/floatingWalletBalance/view.js | 12 +++++++----- app/src/styles/floatingButton.js | 5 +++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/component/floatingWalletBalance/view.js b/app/src/component/floatingWalletBalance/view.js index be0843f8..fed4c241 100644 --- a/app/src/component/floatingWalletBalance/view.js +++ b/app/src/component/floatingWalletBalance/view.js @@ -2,10 +2,11 @@ import React from 'react'; import { ActivityIndicator, Text, TouchableOpacity, View } from 'react-native'; import { formatCredits } from 'lbry-redux' -import Address from '../address'; -import Button from '../button'; -import Colors from '../../styles/colors'; -import floatingButtonStyle from '../../styles/floatingButton'; +import Address from 'component/address'; +import Button from 'component/button'; +import Colors from 'styles/colors'; +import Icon from 'react-native-vector-icons/FontAwesome5'; +import floatingButtonStyle from 'styles/floatingButton'; type Props = { balance: number, @@ -27,7 +28,8 @@ class FloatingWalletBalance extends React.PureComponent { {unclaimedRewardAmount > 0 && navigation && navigation.navigate({ routeName: 'Rewards' })} > - claim {unclaimedRewardAmount} + + {unclaimedRewardAmount} } ); diff --git a/app/src/styles/floatingButton.js b/app/src/styles/floatingButton.js index 9c939984..c8dd00be 100644 --- a/app/src/styles/floatingButton.js +++ b/app/src/styles/floatingButton.js @@ -36,6 +36,7 @@ const floatingButtonStyle = StyleSheet.create({ alignItems: 'center', justifyContent: 'center', backgroundColor: Colors.BrighterLbryGreen, + flexDirection: 'row', elevation: 3 }, text: { @@ -46,6 +47,10 @@ const floatingButtonStyle = StyleSheet.create({ bottomRight: { right: 10, bottom: 10 + }, + rewardIcon: { + color: Colors.White, + marginRight: 4 } }); -- 2.45.2 From 93908e0d3a2e8b2140e1d30bd0da1b2fd9faf561 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Fri, 15 Mar 2019 18:37:23 +0100 Subject: [PATCH 4/4] collapse file description by default and add display toggle --- app/src/page/file/view.js | 21 ++++++++++----------- app/src/styles/filePage.js | 10 ++++++++-- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/src/page/file/view.js b/app/src/page/file/view.js index e369f37a..c2a15559 100644 --- a/app/src/page/file/view.js +++ b/app/src/page/file/view.js @@ -16,6 +16,7 @@ import { WebView } from 'react-native'; import { navigateToUri } from 'utils/helper'; +import Icon from 'react-native-vector-icons/FontAwesome5'; import ImageViewer from 'react-native-image-zoom-viewer'; import Button from 'component/button'; import Colors from 'styles/colors'; @@ -62,6 +63,7 @@ class FilePage extends React.PureComponent { mediaLoaded: false, pageSuspended: false, relatedContentY: 0, + showDescription: false, showImageViewer: false, showWebView: false, showTipView: false, @@ -538,15 +540,8 @@ class FilePage extends React.PureComponent { thumbnail={metadata.thumbnail} />} - {showActions && + {(showActions && showFileActions) && - -