From e62d5741c28291d88f17d915888c6dcc996c91aa Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola <akinwale@gmail.com> Date: Fri, 15 Mar 2019 12:50:58 +0100 Subject: [PATCH] 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 ( <View style={channelPageStyle.container}> - <PageHeader title={name} onBackPressed={() => navigateBack(navigation, drawerStack, popDrawerStack)} /> + <UriBar value={uri} navigation={navigation} /> + <View style={channelPageStyle.channelHeader}> + <Text style={channelPageStyle.channelName}>{name}</Text> + <SubscribeButton style={channelPageStyle.subscribeButton} uri={uri} name={name} /> + </View> {contentList} {(totalPages > 1) && this.state.showPageButtons && <View style={channelPageStyle.pageButtons}> @@ -99,7 +104,6 @@ class ChannelPage extends React.PureComponent { disabled={!!fetching} onPress={this.handleNextPage} />} </View>} - <UriBar value={uri} navigation={navigation} /> </View> ) } 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 } });