From 48350ff17591dc833bea71141a3a86731f75d71d Mon Sep 17 00:00:00 2001 From: akinwale Date: Thu, 10 May 2018 21:18:18 +0100 Subject: [PATCH] Added text view to display URIs at the bottom of the file page (#116) * Added text view to display URIs at the bottom of the file page * added color constants --- .travis.yml | 1 + app/src/page/file/view.js | 7 +++++++ app/src/styles/colors.js | 10 ++++++++-- app/src/styles/filePage.js | 25 ++++++++++++++++++++----- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c322402..87eed44d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,6 +44,7 @@ install: - echo $'\nd56f5187479451eabf01fb78af6dfcb131a6481e' > ~/.buildozer/android/platform/android-sdk-23/licenses/android-sdk-license script: - "./release.sh | grep -Fv -e 'working:' -e 'copy' -e 'Compiling' --line-buffered" +- cp bin/*.apk /dev/null before_deploy: - cd bin - export BUILD_VERSION=$(cat ../src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') diff --git a/app/src/page/file/view.js b/app/src/page/file/view.js index 05350432..d229010d 100644 --- a/app/src/page/file/view.js +++ b/app/src/page/file/view.js @@ -5,6 +5,7 @@ import { Alert, Button, Text, + TextInput, View, ScrollView, StatusBar, @@ -156,6 +157,12 @@ class FilePage extends React.PureComponent { {channelName && {channelName}} {description && {description}} + + + ); } diff --git a/app/src/styles/colors.js b/app/src/styles/colors.js index 1858a037..387ce48c 100644 --- a/app/src/styles/colors.js +++ b/app/src/styles/colors.js @@ -1,6 +1,12 @@ const Colors = { - LbryGreen: '#40b89a' + Black: '#000000', + ChannelGrey: '#9b9b9b', + DescriptionGrey: '#999999', + LbryGreen: '#40b89a', + LightGrey: '#cccccc', + Red: '#ff0000', + VeryLightGrey: '#f1f1f1', + White: '#ffffff' }; export default Colors; - diff --git a/app/src/styles/filePage.js b/app/src/styles/filePage.js index 8daaaafa..ed377769 100644 --- a/app/src/styles/filePage.js +++ b/app/src/styles/filePage.js @@ -1,4 +1,5 @@ import { StyleSheet, Dimensions } from 'react-native'; +import Colors from './colors'; const screenDimension = Dimensions.get('window'); const screenWidth = screenDimension.width; @@ -25,7 +26,7 @@ const filePageStyle = StyleSheet.create({ }, scrollContainer: { flex: 1, - marginTop: -20, + marginTop: -16, marginBottom: -4, paddingTop: 10 }, @@ -46,7 +47,7 @@ const filePageStyle = StyleSheet.create({ marginLeft: 20, marginRight: 20, marginBottom: 20, - color: '#9b9b9b' + color: Colors.ChannelGrey }, description: { fontFamily: 'Metropolis-Regular', @@ -54,7 +55,7 @@ const filePageStyle = StyleSheet.create({ marginLeft: 20, marginRight: 20, marginBottom: 40, - color: '#999999' + color: Colors.DescriptionGrey }, thumbnail: { width: screenWidth, @@ -79,7 +80,7 @@ const filePageStyle = StyleSheet.create({ right: 0, bottom: 0, flex: 1, - backgroundColor: '#000000', + backgroundColor: Colors.Black, zIndex: 100 }, actions: { @@ -91,12 +92,26 @@ const filePageStyle = StyleSheet.create({ width: '50%', }, deleteButton: { - backgroundColor: '#ff0000', + backgroundColor: Colors.Red, width: 80 }, loading: { position: 'absolute', top: '40%' + }, + uriContainer: { + padding: 8, + backgroundColor: Colors.VeryLightGrey, + alignSelf: 'flex-end' + }, + uriText: { + backgroundColor: Colors.White, + borderWidth: 1, + borderColor: Colors.LightGrey, + padding: 8, + borderRadius: 4, + fontFamily: 'Metropolis-Regular', + fontSize: 16 } });