From 9b486bc4535ca9df9255c8b98962980826db8b52 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Fri, 19 Apr 2019 13:39:07 +0100 Subject: [PATCH] more style tweaks. add downloaded icon to file tiles. --- app/src/component/fileItem/view.js | 3 ++- app/src/component/fileListItem/view.js | 2 ++ app/src/page/discover/index.js | 4 ++++ app/src/page/discover/view.js | 4 +++- app/src/page/downloads/view.js | 18 +++++++++--------- app/src/styles/colors.js | 1 + app/src/styles/discover.js | 11 ++++++++--- app/src/styles/fileList.js | 5 +++++ 8 files changed, 34 insertions(+), 14 deletions(-) diff --git a/app/src/component/fileItem/view.js b/app/src/component/fileItem/view.js index 34de929d..0679cb9b 100644 --- a/app/src/component/fileItem/view.js +++ b/app/src/component/fileItem/view.js @@ -78,7 +78,8 @@ class FileItem extends React.PureComponent { isResolvingUri={isResolvingUri} style={mediaStyle} /> - {!compactView && } + {(!compactView && fileInfo && fileInfo.completed) && } + {(!compactView && (!fileInfo || !fileInfo.completed)) && } {!compactView && {title} {isRewardContent && } diff --git a/app/src/component/fileListItem/view.js b/app/src/component/fileListItem/view.js index 2db2fd9b..d181c95f 100644 --- a/app/src/component/fileListItem/view.js +++ b/app/src/component/fileListItem/view.js @@ -12,6 +12,7 @@ import { navigateToUri, formatBytes } from 'utils/helper'; import Colors from 'styles/colors'; import DateTime from 'component/dateTime'; import FileItemMedia from 'component/fileItemMedia'; +import Icon from 'react-native-vector-icons/FontAwesome5'; import Link from 'component/link'; import NsfwOverlay from 'component/nsfwOverlay'; import fileListStyle from 'styles/fileList'; @@ -85,6 +86,7 @@ class FileListItem extends React.PureComponent { resizeMode="cover" title={(title || name)} thumbnail={metadata ? metadata.thumbnail : null} /> + {fileInfo && fileInfo.completed && } {featuredResult && {uri}} diff --git a/app/src/page/discover/index.js b/app/src/page/discover/index.js index 0e3f9cb5..2f18171c 100644 --- a/app/src/page/discover/index.js +++ b/app/src/page/discover/index.js @@ -1,6 +1,8 @@ import { connect } from 'react-redux'; import { + doFileList, selectBalance, + selectFileInfosDownloaded, } from 'lbry-redux'; import { doFetchFeaturedUris, @@ -24,6 +26,7 @@ const select = state => ({ enabledChannelNotifications: selectEnabledChannelNotifications(state), featuredUris: selectFeaturedUris(state), fetchingFeaturedUris: selectFetchingFeaturedUris(state), + fileInfos: selectFileInfosDownloaded(state), ratingReminderDisabled: makeSelectClientSetting(Constants.SETTING_RATING_REMINDER_DISABLED)(state), ratingReminderLastShown: makeSelectClientSetting(Constants.SETTING_RATING_REMINDER_LAST_SHOWN)(state), unreadSubscriptions: selectUnreadSubscriptions(state), @@ -33,6 +36,7 @@ const perform = dispatch => ({ fetchFeaturedUris: () => dispatch(doFetchFeaturedUris()), fetchRewardedContent: () => dispatch(doFetchRewardedContent()), fetchSubscriptions: () => dispatch(doFetchMySubscriptions()), + fileList: () => dispatch(doFileList()), removeUnreadSubscriptions: () => dispatch(doRemoveUnreadSubscriptions()), setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)) }); diff --git a/app/src/page/discover/view.js b/app/src/page/discover/view.js index 29388608..32e8674b 100644 --- a/app/src/page/discover/view.js +++ b/app/src/page/discover/view.js @@ -46,12 +46,14 @@ class DiscoverPage extends React.PureComponent { const { fetchFeaturedUris, fetchRewardedContent, - fetchSubscriptions + fetchSubscriptions, + fileList } = this.props; fetchFeaturedUris(); fetchRewardedContent(); fetchSubscriptions(); + fileList(); this.showRatingReminder(); } diff --git a/app/src/page/downloads/view.js b/app/src/page/downloads/view.js index a4c00b45..2c4303d6 100644 --- a/app/src/page/downloads/view.js +++ b/app/src/page/downloads/view.js @@ -9,15 +9,15 @@ import { View, ScrollView } from 'react-native'; -import { navigateToUri, uriFromFileInfo } from '../../utils/helper'; -import Colors from '../../styles/colors'; -import PageHeader from '../../component/pageHeader'; -import FileListItem from '../../component/fileListItem'; -import FloatingWalletBalance from '../../component/floatingWalletBalance'; -import StorageStatsCard from '../../component/storageStatsCard'; -import UriBar from '../../component/uriBar'; -import downloadsStyle from '../../styles/downloads'; -import fileListStyle from '../../styles/fileList'; +import { navigateToUri, uriFromFileInfo } from 'utils/helper'; +import Colors from 'styles/colors'; +import PageHeader from 'component/pageHeader'; +import FileListItem from 'component/fileListItem'; +import FloatingWalletBalance from 'component/floatingWalletBalance'; +import StorageStatsCard from 'component/storageStatsCard'; +import UriBar from 'component/uriBar'; +import downloadsStyle from 'styles/downloads'; +import fileListStyle from 'styles/fileList'; class DownloadsPage extends React.PureComponent { static navigationOptions = { diff --git a/app/src/styles/colors.js b/app/src/styles/colors.js index 39bd2441..9e1d2761 100644 --- a/app/src/styles/colors.js +++ b/app/src/styles/colors.js @@ -4,6 +4,7 @@ const Colors = { DarkGrey: '#555555', DescriptionGrey: '#999999', LbryGreen: '#2f9176', + BrightGreen: '#61fcd8', BrighterLbryGreen: '#40b887', LightGrey: '#cccccc', LighterGrey: '#e5e5e5', diff --git a/app/src/styles/discover.js b/app/src/styles/discover.js index 07a217c9..2c9b9237 100644 --- a/app/src/styles/discover.js +++ b/app/src/styles/discover.js @@ -70,12 +70,17 @@ const discoverStyle = StyleSheet.create({ marginTop: 4, color: Colors.LbryGreen }, + downloadedIcon: { + position: 'absolute', + right: 8, + top: 8 + }, filePriceContainer: { - backgroundColor: '#61fcd8', + backgroundColor: Colors.BrightGreen, justifyContent: 'center', position: 'absolute', - right: 16, - top: 16, + right: 8, + top: 8, width: 56, height: 24, borderRadius: 4 diff --git a/app/src/styles/fileList.js b/app/src/styles/fileList.js index 4210db89..9f7b81c8 100644 --- a/app/src/styles/fileList.js +++ b/app/src/styles/fileList.js @@ -81,6 +81,11 @@ const fileListStyle = StyleSheet.create({ backgroundColor: Colors.LbryGreen, opacity: 0.2 }, + downloadedIcon: { + position: 'absolute', + top: 8, + left: 8 + } }); export default fileListStyle;