From 2149e73a02f113992aa8676909852bd20dd684fc Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Wed, 8 Jan 2020 09:15:57 +0100
Subject: [PATCH 01/11] allow scrolling for displaying more search results
---
package-lock.json | 4 ++--
package.json | 2 +-
src/page/search/index.js | 6 +++++-
src/page/search/view.js | 42 ++++++++++++++++++++++++++++++++++------
src/styles/search.js | 6 ++++++
5 files changed, 50 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index f1bf389..8bf3f03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7067,8 +7067,8 @@
}
},
"lbry-redux": {
- "version": "github:lbryio/lbry-redux#e8f29f1c47b136669df265babb109d2488a37db0",
- "from": "github:lbryio/lbry-redux#e8f29f1c47b136669df265babb109d2488a37db0",
+ "version": "github:lbryio/lbry-redux#c910cd2b80b165843a81fdf6ce96094429b94ec8",
+ "from": "github:lbryio/lbry-redux#c910cd2b80b165843a81fdf6ce96094429b94ec8",
"requires": {
"proxy-polyfill": "0.1.6",
"reselect": "^3.0.0",
diff --git a/package.json b/package.json
index a211509..5a6745b 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"base-64": "^0.1.0",
"@expo/vector-icons": "^8.1.0",
"gfycat-style-urls": "^1.0.3",
- "lbry-redux": "lbryio/lbry-redux#e8f29f1c47b136669df265babb109d2488a37db0",
+ "lbry-redux": "lbryio/lbry-redux#c910cd2b80b165843a81fdf6ce96094429b94ec8",
"lbryinc": "lbryio/lbryinc#053ca52f4f7f9bf8eb62a3581b183671a475ad1c",
"lodash": ">=4.17.11",
"merge": ">=1.2.1",
diff --git a/src/page/search/index.js b/src/page/search/index.js
index 339a0e4..6c4bd1c 100644
--- a/src/page/search/index.js
+++ b/src/page/search/index.js
@@ -5,6 +5,7 @@ import {
doResolvedSearch,
doUpdateSearchQuery,
makeSelectResolvedSearchResults,
+ makeSelectResolvedSearchResultsLastPageReached,
makeSelectSearchUris,
selectClaimSearchByQuery,
selectIsSearching,
@@ -27,10 +28,13 @@ const select = state => ({
resolvingUris: selectResolvingUris(state),
uris: makeSelectSearchUris(makeSelectQueryWithOptions(null, numSearchResults)(state))(state),
results: makeSelectResolvedSearchResults(makeSelectQueryWithOptions(null, numSearchResults)(state))(state),
+ lastPageReached: makeSelectResolvedSearchResultsLastPageReached(
+ makeSelectQueryWithOptions(null, numSearchResults)(state),
+ )(state),
});
const perform = dispatch => ({
- search: query => dispatch(doResolvedSearch(query, numSearchResults, null, false, {})),
+ search: (query, from) => dispatch(doResolvedSearch(query, numSearchResults, from, false, {})),
claimSearch: options => dispatch(doClaimSearch(options)),
updateSearchQuery: query => dispatch(doUpdateSearchQuery(query)),
pushDrawerStack: () => dispatch(doPushDrawerStack(Constants.DRAWER_ROUTE_SEARCH)),
diff --git a/src/page/search/view.js b/src/page/search/view.js
index 5747637..fa31ea6 100644
--- a/src/page/search/view.js
+++ b/src/page/search/view.js
@@ -20,9 +20,13 @@ import FloatingWalletBalance from 'component/floatingWalletBalance';
import UriBar from 'component/uriBar';
import searchStyle from 'styles/search';
+const pageSize = 25;
+const softLimit = 500;
+
class SearchPage extends React.PureComponent {
state = {
currentQuery: null,
+ currentFrom: 0,
currentUri: null,
showTagResult: false,
claimSearchRun: false,
@@ -56,6 +60,7 @@ class SearchPage extends React.PureComponent {
const searchQuery = query || this.getSearchQuery();
if (searchQuery && searchQuery.trim().length > 0) {
this.setState({
+ currentFrom: 0,
currentQuery: searchQuery,
currentUri: isURIValid(searchQuery) ? normalizeURI(searchQuery) : null,
claimSearchOptions: null,
@@ -64,7 +69,7 @@ class SearchPage extends React.PureComponent {
resultsResolved: false,
tagResultDisplayed: false,
});
- search(searchQuery);
+ search(searchQuery, 0);
}
});
};
@@ -83,12 +88,13 @@ class SearchPage extends React.PureComponent {
if (query && query.trim().length > 0 && query !== this.state.currentQuery) {
this.setState({
+ currentFrom: 0,
currentQuery: query,
currentUri: isURIValid(query) ? normalizeURI(query) : null,
resultsResolved: false,
tagResultDisplayed: false,
});
- search(query);
+ search(query, 0);
}
}
@@ -134,13 +140,15 @@ class SearchPage extends React.PureComponent {
const { search } = this.props;
this.setState({
currentUri: isURIValid(keywords) ? normalizeURI(keywords) : null,
+ currentFrom: 0,
+ currentQuery: keywords,
claimSearchOptions: null,
claimSearchRun: false,
showTagResult: false,
resultsResolved: false,
tagResultDisplayed: false,
});
- search(keywords);
+ search(keywords, 0);
};
listEmptyComponent = () => {
@@ -186,6 +194,21 @@ class SearchPage extends React.PureComponent {
navigation.navigate({ routeName: Constants.DRAWER_ROUTE_TAG, key: `tagPage`, params: { tag: tag.toLowerCase() } });
};
+ handleVerticalEndReached = () => {
+ // fetch more content
+ const { lastPageReached, results, search, isSearching } = this.props;
+ if (lastPageReached || (results && results.length > softLimit)) {
+ return;
+ }
+
+ if (!isSearching) {
+ const from = results ? results.length : 0;
+ this.setState({ currentFrom: from }, () => {
+ search(this.state.currentQuery, from);
+ });
+ }
+ };
+
render() {
const { isSearching, navigation, query, results } = this.props;
@@ -193,13 +216,13 @@ class SearchPage extends React.PureComponent {
<View style={searchStyle.container}>
<UriBar value={query} navigation={navigation} onSearchSubmitted={this.handleSearchSubmitted} />
- {isSearching && (
+ {isSearching && this.state.currentFrom === 0 && (
<View style={searchStyle.busyContainer}>
<ActivityIndicator size="large" color={Colors.NextLbryGreen} style={searchStyle.loading} />
</View>
)}
- {!isSearching && (
+ {(!isSearching || this.state.currentFrom > 0) && (
<FlatList
extraData={this.state}
style={searchStyle.scrollContainer}
@@ -207,8 +230,10 @@ class SearchPage extends React.PureComponent {
keyboardShouldPersistTaps={'handled'}
data={results}
keyExtractor={(item, index) => item.claimId}
- initialNumToRender={8}
+ initialNumToRender={10}
maxToRenderPerBatch={20}
+ onEndReached={this.handleVerticalEndReached}
+ onEndReachedThreshold={0.2}
removeClippedSubviews
ListEmptyComponent={!isSearching ? this.listEmptyComponent() : null}
ListHeaderComponent={this.listHeaderComponent(this.state.showTagResult, this.state.currentQuery)}
@@ -217,6 +242,11 @@ class SearchPage extends React.PureComponent {
)}
/>
)}
+ {this.state.currentFrom > 0 && isSearching && (
+ <View style={searchStyle.moreLoading}>
+ <ActivityIndicator size="small" coolor={Colors.NextLbryGreen} />
+ </View>
+ )}
<FloatingWalletBalance navigation={navigation} />
</View>
);
diff --git a/src/styles/search.js b/src/styles/search.js
index 559d0a1..9e8bc25 100644
--- a/src/styles/search.js
+++ b/src/styles/search.js
@@ -80,6 +80,12 @@ const searchStyle = StyleSheet.create({
loading: {
position: 'absolute',
},
+ moreLoading: {
+ width: '100%',
+ height: 48,
+ alignItems: 'center',
+ justifyContent: 'center',
+ },
});
export default searchStyle;
--
2.49.1
From 8441848f375afcf09c20a6bf260a352d53383878 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Wed, 8 Jan 2020 09:20:33 +0100
Subject: [PATCH 02/11] add search page size constant
---
src/constants.js | 2 ++
src/page/search/index.js | 12 ++++++------
src/page/search/view.js | 3 +--
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/constants.js b/src/constants.js
index 9bae614..7ff1a5f 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -136,6 +136,8 @@ const Constants = {
DEFAULT_PAGE_SIZE: 10,
+ SEARCH_RESULTS_PAGE_SIZE: 25,
+
ALL_PLACEHOLDER: '_all',
MORE_PLACEHOLDER: '_more',
diff --git a/src/page/search/index.js b/src/page/search/index.js
index 6c4bd1c..03094f8 100644
--- a/src/page/search/index.js
+++ b/src/page/search/index.js
@@ -18,23 +18,23 @@ import { selectCurrentRoute } from 'redux/selectors/drawer';
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
import SearchPage from './view';
-const numSearchResults = 25;
-
const select = state => ({
claimSearchByQuery: selectClaimSearchByQuery(state),
currentRoute: selectCurrentRoute(state),
isSearching: selectIsSearching(state),
query: selectSearchValue(state),
resolvingUris: selectResolvingUris(state),
- uris: makeSelectSearchUris(makeSelectQueryWithOptions(null, numSearchResults)(state))(state),
- results: makeSelectResolvedSearchResults(makeSelectQueryWithOptions(null, numSearchResults)(state))(state),
+ uris: makeSelectSearchUris(makeSelectQueryWithOptions(null, Constants.SEARCH_RESULTS_PAGE_SIZE)(state))(state),
+ results: makeSelectResolvedSearchResults(makeSelectQueryWithOptions(null, Constants.SEARCH_RESULTS_PAGE_SIZE)(state))(
+ state,
+ ),
lastPageReached: makeSelectResolvedSearchResultsLastPageReached(
- makeSelectQueryWithOptions(null, numSearchResults)(state),
+ makeSelectQueryWithOptions(null, Constants.SEARCH_RESULTS_PAGE_SIZE)(state),
)(state),
});
const perform = dispatch => ({
- search: (query, from) => dispatch(doResolvedSearch(query, numSearchResults, from, false, {})),
+ search: (query, from) => dispatch(doResolvedSearch(query, Constants.SEARCH_RESULTS_PAGE_SIZE, from, false, {})),
claimSearch: options => dispatch(doClaimSearch(options)),
updateSearchQuery: query => dispatch(doUpdateSearchQuery(query)),
pushDrawerStack: () => dispatch(doPushDrawerStack(Constants.DRAWER_ROUTE_SEARCH)),
diff --git a/src/page/search/view.js b/src/page/search/view.js
index fa31ea6..2f0f269 100644
--- a/src/page/search/view.js
+++ b/src/page/search/view.js
@@ -20,7 +20,6 @@ import FloatingWalletBalance from 'component/floatingWalletBalance';
import UriBar from 'component/uriBar';
import searchStyle from 'styles/search';
-const pageSize = 25;
const softLimit = 500;
class SearchPage extends React.PureComponent {
@@ -195,7 +194,7 @@ class SearchPage extends React.PureComponent {
};
handleVerticalEndReached = () => {
- // fetch more content
+ // fetch more results
const { lastPageReached, results, search, isSearching } = this.props;
if (lastPageReached || (results && results.length > softLimit)) {
return;
--
2.49.1
From 561aa0db9c520303e2f5135a1c6a4f297feba01e Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Wed, 8 Jan 2020 10:17:52 +0100
Subject: [PATCH 03/11] placeholder background for thumbnails being loaded
---
src/styles/colors.js | 2 ++
src/styles/fileList.js | 1 +
2 files changed, 3 insertions(+)
diff --git a/src/styles/colors.js b/src/styles/colors.js
index 90cf009..465e09b 100644
--- a/src/styles/colors.js
+++ b/src/styles/colors.js
@@ -24,6 +24,8 @@ const Colors = {
StatsAudio: '#f6a637',
StatsImage: '#ff4a7d',
StatsOther: '#26bcf7',
+
+ ThumbnailPlaceholder: '#d5d5d5',
};
export default Colors;
diff --git a/src/styles/fileList.js b/src/styles/fileList.js
index fe5811b..2a69c81 100644
--- a/src/styles/fileList.js
+++ b/src/styles/fileList.js
@@ -32,6 +32,7 @@ const fileListStyle = StyleSheet.create({
color: Colors.White,
},
thumbnail: {
+ backgroundColor: Colors.ThumbnailPlaceholder,
width: thumbnailWidth,
height: thumbnailHeight,
marginRight: screenWidthPixels <= 720 ? 10 : 12,
--
2.49.1
From b6ab92a70087f32f1717167ab0b4feba59274745 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Wed, 8 Jan 2020 12:06:06 +0100
Subject: [PATCH 04/11] adjust margins for view count and floating wallet
balance
---
src/styles/filePage.js | 2 +-
src/styles/floatingButton.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/styles/filePage.js b/src/styles/filePage.js
index aff3122..f5d974f 100644
--- a/src/styles/filePage.js
+++ b/src/styles/filePage.js
@@ -65,7 +65,6 @@ const filePageStyle = StyleSheet.create({
titleRow: {
flexDirection: 'row',
marginTop: 12,
- marginBottom: 2,
marginLeft: 12,
marginRight: 12,
alignItems: 'center',
@@ -455,6 +454,7 @@ const filePageStyle = StyleSheet.create({
fontFamily: 'Inter-UI-Regular',
fontSize: 12,
color: Colors.DescriptionGrey,
+ marginTop: -6,
marginLeft: 12,
marginRight: 12,
},
diff --git a/src/styles/floatingButton.js b/src/styles/floatingButton.js
index c4e6a4b..9018fe2 100644
--- a/src/styles/floatingButton.js
+++ b/src/styles/floatingButton.js
@@ -46,8 +46,8 @@ const floatingButtonStyle = StyleSheet.create({
fontSize: 16,
},
bottomRight: {
- right: 10,
- bottom: 10,
+ right: 0,
+ bottom: 0,
},
rewardIcon: {
color: Colors.White,
--
2.49.1
From 00dfc205a55678e0485f0e40e55054eabe6f9acb Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Wed, 8 Jan 2020 12:08:32 +0100
Subject: [PATCH 05/11] readjust margin for view count
---
src/styles/filePage.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/styles/filePage.js b/src/styles/filePage.js
index f5d974f..181fb5f 100644
--- a/src/styles/filePage.js
+++ b/src/styles/filePage.js
@@ -454,7 +454,6 @@ const filePageStyle = StyleSheet.create({
fontFamily: 'Inter-UI-Regular',
fontSize: 12,
color: Colors.DescriptionGrey,
- marginTop: -6,
marginLeft: 12,
marginRight: 12,
},
--
2.49.1
From 8519b561b3e5720cb7d020ed0607dd333f1a0f7c Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Wed, 8 Jan 2020 21:23:02 +0100
Subject: [PATCH 06/11] improve markdown display
---
src/page/file/view.js | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/page/file/view.js b/src/page/file/view.js
index 60c128d..82f52a1 100644
--- a/src/page/file/view.js
+++ b/src/page/file/view.js
@@ -109,6 +109,7 @@ class FilePage extends React.PureComponent {
onComponentFocused = () => {
StatusBar.setHidden(false);
+ console.log('fileComponent Focused...');
NativeModules.Firebase.setCurrentScreen('File').then(result => {
DeviceEventEmitter.addListener('onStoragePermissionGranted', this.handleStoragePermissionGranted);
DeviceEventEmitter.addListener('onStoragePermissionRefused', this.handleStoragePermissionRefused);
@@ -652,13 +653,13 @@ class FilePage extends React.PureComponent {
const isPlayable = mediaType === 'video' || mediaType === 'audio';
const isViewable = mediaType === 'image' || mediaType === 'text';
- const { permanent_url: uri } = claim;
- NativeModules.Firebase.track('purchase_uri', { uri: uri });
+ const purchaseUrl = this.getPurchaseUrl();
+ NativeModules.Firebase.track('purchase_uri', { uri: purchaseUrl });
if (!isPlayable) {
this.checkStoragePermissionForDownload();
} else {
- this.confirmPurchaseUri(uri, costInfo, !isPlayable);
+ this.confirmPurchaseUri(purchaseUrl, costInfo, !isPlayable);
}
if (isPlayable) {
@@ -671,6 +672,19 @@ class FilePage extends React.PureComponent {
}
};
+ getPurchaseUrl = () => {
+ const { claim, navigation } = this.props;
+ const { permanent_url: permanentUrl } = claim;
+
+ let purchaseUrl;
+ if (navigation.state.params) {
+ const { uri, fullUri } = navigation.state.params;
+ purchaseUrl = fullUri || uri || permanentUrl;
+ }
+
+ return purchaseUrl;
+ };
+
onDownloadPressed = () => {
this.checkStoragePermissionForDownload();
};
@@ -796,6 +810,11 @@ class FilePage extends React.PureComponent {
'<html>' +
' <head>' +
' <meta charset="utf-8"/>' +
+ ' <meta name="viewport" content="width=device-width, user-scalable=no"/>' +
+ ' <style type="text/css">' +
+ ' body { margin: 16px }' +
+ ' img { width: 100%; }' +
+ ' </style>' +
' </head>' +
' <body>' +
' <div id="content"></div>' +
@@ -842,7 +861,7 @@ class FilePage extends React.PureComponent {
<View style={filePageStyle.pageContainer}>
<UriBar value={uri} navigation={navigation} />
{isResolvingUri && (
- <View stylebuildWeb={filePageStyle.busyContainer}>
+ <View style={filePageStyle.busyContainer}>
<ActivityIndicator size="large" color={Colors.NextLbryGreen} />
<Text style={filePageStyle.infoText}>{__('Loading decentralized data...')}</Text>
</View>
--
2.49.1
From 24fa80d92ac639f21c6b2fc24d4f1f6463308e53 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 9 Jan 2020 04:29:48 +0100
Subject: [PATCH 07/11] open links displayed in the embedded webview on the
device browser
---
src/page/file/view.js | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/page/file/view.js b/src/page/file/view.js
index 82f52a1..d1887a7 100644
--- a/src/page/file/view.js
+++ b/src/page/file/view.js
@@ -64,6 +64,10 @@ class FilePage extends React.PureComponent {
converter = null;
+ linkHandlerScript = `(function () {
+ window.onclick = function(evt) { evt.preventDefault(); window.ReactNativeWebView.postMessage(evt.target.href); evt.stopPropagation(); }
+ }());`;
+
constructor(props) {
super(props);
this.state = {
@@ -109,7 +113,6 @@ class FilePage extends React.PureComponent {
onComponentFocused = () => {
StatusBar.setHidden(false);
- console.log('fileComponent Focused...');
NativeModules.Firebase.setCurrentScreen('File').then(result => {
DeviceEventEmitter.addListener('onStoragePermissionGranted', this.handleStoragePermissionGranted);
DeviceEventEmitter.addListener('onStoragePermissionRefused', this.handleStoragePermissionRefused);
@@ -800,6 +803,13 @@ class FilePage extends React.PureComponent {
}
};
+ handleWebViewMessage = evt => {
+ const href = evt.nativeEvent.data;
+ if (href && href.startsWith('http')) {
+ Linking.openURL(href);
+ }
+ };
+
buildWebViewSource = () => {
const { contentType, fileInfo } = this.props;
const localFileUri = this.localUriForFileInfo(fileInfo);
@@ -996,6 +1006,8 @@ class FilePage extends React.PureComponent {
source={this.buildWebViewSource()}
style={filePageStyle.viewer}
onLoad={this.handleWebViewLoad}
+ injectedJavaScript={this.linkHandlerScript}
+ onMessage={this.handleWebViewMessage}
/>
)}
{this.state.showImageViewer && (
--
2.49.1
From 8c79115ce0a1bcedec634f2108df30ad9004b6f2 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 9 Jan 2020 04:42:06 +0100
Subject: [PATCH 08/11] update input cursor position on press when the uri bar
focused
---
src/component/uriBar/view.js | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/component/uriBar/view.js b/src/component/uriBar/view.js
index 80c25a7..72fa163 100644
--- a/src/component/uriBar/view.js
+++ b/src/component/uriBar/view.js
@@ -170,6 +170,12 @@ class UriBar extends React.PureComponent {
);
};
+ handleTouchStart = () => {
+ if (this.state.focused) {
+ this.setState({ selection: null });
+ }
+ };
+
handleBlur = () => {
this.setState({
focused: false,
@@ -268,6 +274,7 @@ class UriBar extends React.PureComponent {
ref={ref => {
this.textInput = ref;
}}
+ onTouchStart={this.handleTouchStart}
autoCorrect={false}
style={uriBarStyle.uriText}
selection={this.state.selection}
--
2.49.1
From e97bf7ce79aba8d1b630953ce63149a7adb4659b Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 9 Jan 2020 04:43:09 +0100
Subject: [PATCH 09/11] cleanup: remove unused function
---
src/component/uriBar/view.js | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/component/uriBar/view.js b/src/component/uriBar/view.js
index 72fa163..3666e8a 100644
--- a/src/component/uriBar/view.js
+++ b/src/component/uriBar/view.js
@@ -183,10 +183,6 @@ class UriBar extends React.PureComponent {
});
};
- onSearchPageBlurred() {
- this.setState({ currenValueSet: false });
- }
-
render() {
const {
allowEdit,
--
2.49.1
From b149c0039a20b5b0a0824fd04d344535b255d862 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 9 Jan 2020 15:43:36 +0100
Subject: [PATCH 10/11] update fontFamily definitions
---
src/styles/about.js | 18 ++++++------
src/styles/button.js | 2 +-
src/styles/channelCreator.js | 30 ++++++++++----------
src/styles/channelIcon.js | 6 ++--
src/styles/channelPage.js | 14 +++++-----
src/styles/channelSelector.js | 18 ++++++------
src/styles/claimList.js | 2 +-
src/styles/discover.js | 44 ++++++++++++++---------------
src/styles/downloads.js | 2 +-
src/styles/emptyState.js | 2 +-
src/styles/fileDownloadButton.js | 2 +-
src/styles/fileItemMedia.js | 6 ++--
src/styles/fileList.js | 14 +++++-----
src/styles/filePage.js | 42 ++++++++++++++--------------
src/styles/firstRun.js | 24 ++++++++--------
src/styles/floatingButton.js | 2 +-
src/styles/mediaPlayer.js | 4 +--
src/styles/modalPicker.js | 4 +--
src/styles/modalTagSelector.js | 2 +-
src/styles/modalTip.js | 12 ++++----
src/styles/pageHeader.js | 2 +-
src/styles/publish.js | 44 ++++++++++++++---------------
src/styles/relatedContent.js | 2 +-
src/styles/reward.js | 42 ++++++++++++++--------------
src/styles/search.js | 10 +++----
src/styles/settings.js | 10 +++----
src/styles/splash.js | 10 +++----
src/styles/storageStats.js | 10 +++----
src/styles/subscriptions.js | 24 ++++++++--------
src/styles/tag.js | 6 ++--
src/styles/transactionList.js | 10 +++----
src/styles/uriBar.js | 8 +++---
src/styles/wallet.js | 48 ++++++++++++++++----------------
33 files changed, 238 insertions(+), 238 deletions(-)
diff --git a/src/styles/about.js b/src/styles/about.js
index 03bf90c..27c0e90 100644
--- a/src/styles/about.js
+++ b/src/styles/about.js
@@ -32,14 +32,14 @@ const aboutStyle = StyleSheet.create({
title: {
color: Colors.LbryGreen,
fontSize: 24,
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
marginTop: 16,
marginLeft: 12,
marginRight: 12,
marginBottom: 8,
},
paragraph: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
lineHeight: 24,
marginLeft: 12,
@@ -53,13 +53,13 @@ const aboutStyle = StyleSheet.create({
},
link: {
color: Colors.LbryGreen,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginBottom: 24,
},
listLink: {
color: Colors.LbryGreen,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 15,
alignSelf: 'flex-end',
},
@@ -67,30 +67,30 @@ const aboutStyle = StyleSheet.create({
alignSelf: 'stretch',
},
socialTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
marginLeft: 12,
marginRight: 12,
marginBottom: 8,
fontSize: 20,
},
releaseInfoTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
marginLeft: 12,
marginRight: 12,
marginBottom: 12,
fontSize: 20,
},
text: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 15,
},
valueText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
textAlign: 'right',
fontSize: 15,
},
lineValueText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 15,
},
});
diff --git a/src/styles/button.js b/src/styles/button.js
index 99bda7f..30ae7f5 100644
--- a/src/styles/button.js
+++ b/src/styles/button.js
@@ -29,7 +29,7 @@ const buttonStyle = StyleSheet.create({
color: Colors.DarkGrey,
},
text: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
textWithIcon: {
diff --git a/src/styles/channelCreator.js b/src/styles/channelCreator.js
index 5ba0287..dc3cf0c 100644
--- a/src/styles/channelCreator.js
+++ b/src/styles/channelCreator.js
@@ -17,7 +17,7 @@ const channelCreatorStyle = StyleSheet.create({
backgroundColor: Colors.PageBackground,
},
channelPicker: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
height: 52,
width: '100%',
@@ -27,7 +27,7 @@ const channelCreatorStyle = StyleSheet.create({
alignItems: 'center',
},
label: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
balance: {
@@ -36,24 +36,24 @@ const channelCreatorStyle = StyleSheet.create({
marginLeft: 24,
},
balanceText: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 14,
marginLeft: 4,
},
channelNameInput: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
paddingLeft: 20,
},
bidAmountInput: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginLeft: 16,
textAlign: 'right',
width: 80,
},
helpText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
color: Colors.DescriptionGrey,
},
@@ -68,7 +68,7 @@ const channelCreatorStyle = StyleSheet.create({
position: 'absolute',
left: 4,
top: 13,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
buttonContainer: {
@@ -90,7 +90,7 @@ const channelCreatorStyle = StyleSheet.create({
alignSelf: 'flex-end',
},
inlineError: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
color: Colors.Red,
marginTop: 2,
@@ -151,12 +151,12 @@ const channelCreatorStyle = StyleSheet.create({
alignItems: 'center',
},
channelListTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 18,
marginBottom: 4,
},
channelListName: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
channelListAvatar: {
@@ -189,13 +189,13 @@ const channelCreatorStyle = StyleSheet.create({
marginBottom: 4,
},
textInputTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
marginBottom: -10,
marginLeft: 4,
},
inputText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
toggleContainer: {
@@ -209,7 +209,7 @@ const channelCreatorStyle = StyleSheet.create({
marginRight: 16,
},
cardTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 20,
marginBottom: 8,
},
@@ -243,7 +243,7 @@ const channelCreatorStyle = StyleSheet.create({
},
editIcon: {
color: Colors.White,
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 12,
},
uploadProgress: {
@@ -262,7 +262,7 @@ const channelCreatorStyle = StyleSheet.create({
},
uploadText: {
color: Colors.White,
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 12,
marginLeft: 4,
},
diff --git a/src/styles/channelIcon.js b/src/styles/channelIcon.js
index 63e09c4..82a5c22 100644
--- a/src/styles/channelIcon.js
+++ b/src/styles/channelIcon.js
@@ -10,7 +10,7 @@ const channelIconStyle = StyleSheet.create({
alignSelf: 'flex-start',
},
placeholderText: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 14,
},
thumbnailContainer: {
@@ -39,14 +39,14 @@ const channelIconStyle = StyleSheet.create({
justifyContent: 'center',
},
title: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
width: 80,
marginTop: 4,
textAlign: 'center',
},
autothumbCharacter: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 48,
color: Colors.White,
},
diff --git a/src/styles/channelPage.js b/src/styles/channelPage.js
index c271e16..24f5561 100644
--- a/src/styles/channelPage.js
+++ b/src/styles/channelPage.js
@@ -23,7 +23,7 @@ const channelPageStyle = StyleSheet.create({
},
title: {
color: Colors.LbryGreen,
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 30,
margin: 16,
},
@@ -34,7 +34,7 @@ const channelPageStyle = StyleSheet.create({
padding: 24,
},
infoText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 20,
textAlign: 'center',
},
@@ -62,7 +62,7 @@ const channelPageStyle = StyleSheet.create({
},
channelName: {
color: Colors.White,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 18,
padding: 2,
backgroundColor: '#000000aa',
@@ -98,7 +98,7 @@ const channelPageStyle = StyleSheet.create({
justifyContent: 'flex-end',
},
tabTitle: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 14,
color: Colors.White,
},
@@ -131,12 +131,12 @@ const channelPageStyle = StyleSheet.create({
padding: 24,
},
aboutTitle: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 16,
lineHeight: 24,
},
aboutText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
lineHeight: 24,
},
@@ -182,7 +182,7 @@ const channelPageStyle = StyleSheet.create({
marginRight: 8,
},
followerCount: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
color: Colors.White,
marginTop: 2,
diff --git a/src/styles/channelSelector.js b/src/styles/channelSelector.js
index 8ac4e29..d3a4ef3 100644
--- a/src/styles/channelSelector.js
+++ b/src/styles/channelSelector.js
@@ -6,13 +6,13 @@ const channelSelectorStyle = StyleSheet.create({
flex: 1,
},
channelPicker: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
height: 52,
width: '100%',
},
channelPickerItem: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
bidRow: {
@@ -21,7 +21,7 @@ const channelSelectorStyle = StyleSheet.create({
alignItems: 'center',
},
label: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
balance: {
@@ -30,24 +30,24 @@ const channelSelectorStyle = StyleSheet.create({
marginLeft: 24,
},
balanceText: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 14,
marginLeft: 4,
},
channelNameInput: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
paddingLeft: 20,
},
bidAmountInput: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginLeft: 16,
textAlign: 'right',
width: 80,
},
helpText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
},
createChannelContainer: {
@@ -59,7 +59,7 @@ const channelSelectorStyle = StyleSheet.create({
position: 'absolute',
left: 4,
top: 13,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
buttonContainer: {
@@ -80,7 +80,7 @@ const channelSelectorStyle = StyleSheet.create({
backgroundColor: Colors.NextLbryGreen,
},
inlineError: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
color: Colors.Red,
marginTop: 2,
diff --git a/src/styles/claimList.js b/src/styles/claimList.js
index 5918795..2bd1b06 100644
--- a/src/styles/claimList.js
+++ b/src/styles/claimList.js
@@ -13,7 +13,7 @@ const claimListStyle = StyleSheet.create({
},
noContentText: {
color: Colors.DescriptionGrey,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
margin: 16,
textAlign: 'center',
diff --git a/src/styles/discover.js b/src/styles/discover.js
index 0ad9f3d..cfece22 100644
--- a/src/styles/discover.js
+++ b/src/styles/discover.js
@@ -55,11 +55,11 @@ const discoverStyle = StyleSheet.create({
alignItems: 'center',
},
pageTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 24,
},
customizeLink: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
trendingContainer: {
@@ -74,7 +74,7 @@ const discoverStyle = StyleSheet.create({
flexDirection: 'row',
},
title: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 20,
textAlign: 'center',
marginLeft: 10,
@@ -95,7 +95,7 @@ const discoverStyle = StyleSheet.create({
marginBottom: 56,
},
footerTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 20,
marginBottom: 10,
},
@@ -108,7 +108,7 @@ const discoverStyle = StyleSheet.create({
marginBottom: 12,
},
categoryName: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 18,
color: Colors.Black,
},
@@ -127,7 +127,7 @@ const discoverStyle = StyleSheet.create({
justifyContent: 'center',
},
moreText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
color: Colors.White,
fontSize: 24,
},
@@ -142,18 +142,18 @@ const discoverStyle = StyleSheet.create({
justifyContent: 'center',
},
fileItemName: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
marginTop: 8,
fontSize: 14,
},
channelName: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 12,
marginTop: 4,
color: Colors.LbryGreen,
},
anonChannelName: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 12,
marginTop: 4,
color: Colors.DescriptionGrey,
@@ -176,7 +176,7 @@ const discoverStyle = StyleSheet.create({
borderRadius: 4,
},
filePriceText: {
- fontFamily: 'Inter-UI-Bold',
+ fontFamily: 'Inter-Bold',
fontSize: 12,
textAlign: 'center',
color: '#0c604b',
@@ -205,7 +205,7 @@ const discoverStyle = StyleSheet.create({
color: Colors.White,
fontSize: 14,
textAlign: 'center',
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
},
rewardTitleContainer: {
alignItems: 'center',
@@ -222,11 +222,11 @@ const discoverStyle = StyleSheet.create({
flex: 0.9,
},
menuText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
titleText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
},
detailsRow: {
flexDirection: 'row',
@@ -236,7 +236,7 @@ const discoverStyle = StyleSheet.create({
marginTop: 2,
},
dateTimeText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
color: Colors.DescriptionGrey,
},
@@ -259,7 +259,7 @@ const discoverStyle = StyleSheet.create({
flex: 1,
},
tagPageTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 24,
},
tagPageClaimList: {
@@ -288,7 +288,7 @@ const discoverStyle = StyleSheet.create({
alignItems: 'center',
},
tagSortText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
marginRight: 4,
},
@@ -296,7 +296,7 @@ const discoverStyle = StyleSheet.create({
marginTop: -6,
},
pickerLabel: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
color: Colors.DescriptionGrey,
marginRight: 6,
@@ -307,7 +307,7 @@ const discoverStyle = StyleSheet.create({
marginBottom: 8,
},
menuGroupName: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
color: Colors.DescriptionGrey,
textTransform: 'uppercase',
@@ -337,7 +337,7 @@ const discoverStyle = StyleSheet.create({
},
menuItem: {
marginLeft: 8,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
signInContainer: {
@@ -353,7 +353,7 @@ const discoverStyle = StyleSheet.create({
left: 16,
},
signedInEmail: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 15,
color: Colors.White,
},
@@ -388,13 +388,13 @@ const discoverStyle = StyleSheet.create({
},
signInMenuItemText: {
color: Colors.DescriptionGrey,
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 14,
textAlign: 'center',
},
signInMenuItemButtonText: {
color: Colors.White,
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 14,
textAlign: 'center',
},
diff --git a/src/styles/downloads.js b/src/styles/downloads.js
index 2da3f5f..8337dc0 100644
--- a/src/styles/downloads.js
+++ b/src/styles/downloads.js
@@ -30,7 +30,7 @@ const downloadsStyle = StyleSheet.create({
paddingBottom: 16,
},
noDownloadsText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
lineHeight: 24,
marginLeft: 16,
diff --git a/src/styles/emptyState.js b/src/styles/emptyState.js
index 4d30c8d..8b487e5 100644
--- a/src/styles/emptyState.js
+++ b/src/styles/emptyState.js
@@ -30,7 +30,7 @@ const emptyStateStyle = StyleSheet.create({
message: {
marginTop: 24,
textAlign: 'center',
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 18,
lineHeight: 28,
marginBottom: 24,
diff --git a/src/styles/fileDownloadButton.js b/src/styles/fileDownloadButton.js
index 7485b9f..2ec132e 100644
--- a/src/styles/fileDownloadButton.js
+++ b/src/styles/fileDownloadButton.js
@@ -11,7 +11,7 @@ const fileDownloadButtonStyle = StyleSheet.create({
backgroundColor: Colors.LbryGreen,
},
text: {
- fontFamily: 'Inter-UI-Medium',
+ fontFamily: 'Inter-Medium',
color: Colors.White,
fontSize: 14,
textAlign: 'center',
diff --git a/src/styles/fileItemMedia.js b/src/styles/fileItemMedia.js
index 6d7197d..4940056 100644
--- a/src/styles/fileItemMedia.js
+++ b/src/styles/fileItemMedia.js
@@ -10,7 +10,7 @@ const fileItemMediaStyle = StyleSheet.create({
alignItems: 'center',
},
autothumbText: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
textAlign: 'center',
color: Colors.White,
fontSize: 40,
@@ -22,7 +22,7 @@ const fileItemMediaStyle = StyleSheet.create({
},
text: {
color: '#ffffff',
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginTop: 8,
},
@@ -45,7 +45,7 @@ const fileItemMediaStyle = StyleSheet.create({
paddingRight: 2,
},
durationText: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 12,
color: Colors.White,
},
diff --git a/src/styles/fileList.js b/src/styles/fileList.js
index 2a69c81..31761ec 100644
--- a/src/styles/fileList.js
+++ b/src/styles/fileList.js
@@ -22,12 +22,12 @@ const fileListStyle = StyleSheet.create({
flex: 1,
},
featuredUri: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 24,
color: Colors.White,
},
featuredTitle: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: screenWidthPixels <= 720 ? 12 : 16,
color: Colors.White,
},
@@ -50,16 +50,16 @@ const fileListStyle = StyleSheet.create({
backgroundColor: '#000000aa',
},
title: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: screenWidthPixels <= 720 ? 12 : 14,
},
uri: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: screenWidthPixels <= 720 ? 12 : 14,
marginBottom: 8,
},
publisher: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: screenWidthPixels <= 720 ? 11 : 12,
marginTop: screenWidthPixels <= 720 ? 1 : 3,
color: Colors.LbryGreen,
@@ -73,7 +73,7 @@ const fileListStyle = StyleSheet.create({
justifyContent: 'space-between',
},
infoText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: screenWidthPixels <= 720 ? 11 : 12,
color: Colors.ChannelGrey,
},
@@ -134,7 +134,7 @@ const fileListStyle = StyleSheet.create({
borderRadius: 4,
},
filePriceText: {
- fontFamily: 'Inter-UI-Bold',
+ fontFamily: 'Inter-Bold',
fontSize: 12,
textAlign: 'center',
color: '#0c604b',
diff --git a/src/styles/filePage.js b/src/styles/filePage.js
index 181fb5f..1a894bd 100644
--- a/src/styles/filePage.js
+++ b/src/styles/filePage.js
@@ -38,7 +38,7 @@ const filePageStyle = StyleSheet.create({
marginBottom: -17,
},
emptyClaimText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
textAlign: 'center',
fontSize: 20,
marginLeft: 24,
@@ -54,7 +54,7 @@ const filePageStyle = StyleSheet.create({
flex: 1,
},
title: {
- fontFamily: 'Inter-UI-Bold',
+ fontFamily: 'Inter-Bold',
fontSize: 16,
flex: 18,
alignSelf: 'flex-start',
@@ -88,17 +88,17 @@ const filePageStyle = StyleSheet.create({
marginTop: 6,
},
channelName: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 14,
color: Colors.LbryGreen,
},
anonChannelName: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
color: Colors.DescriptionGrey,
},
publishDateText: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 12,
color: Colors.DescriptionGrey,
},
@@ -107,7 +107,7 @@ const filePageStyle = StyleSheet.create({
},
description: {
color: Colors.DescriptionGrey,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 13,
lineHeight: 18,
marginTop: -8,
@@ -179,7 +179,7 @@ const filePageStyle = StyleSheet.create({
borderRadius: 4,
},
filePriceText: {
- fontFamily: 'Inter-UI-Bold',
+ fontFamily: 'Inter-Bold',
fontSize: 12,
textAlign: 'center',
color: '#0c604b',
@@ -234,19 +234,19 @@ const filePageStyle = StyleSheet.create({
paddingRight: 24,
},
dmcaText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 18,
lineHeight: 24,
},
dmcaLink: {
color: Colors.LbryGreen,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 18,
lineHeight: 24,
marginTop: 24,
},
infoText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 20,
textAlign: 'center',
marginLeft: 10,
@@ -293,7 +293,7 @@ const filePageStyle = StyleSheet.create({
marginBottom: 14,
},
input: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
tipAmountInput: {
@@ -315,7 +315,7 @@ const filePageStyle = StyleSheet.create({
marginTop: -8,
},
text: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
lineHeight: 24,
},
@@ -336,12 +336,12 @@ const filePageStyle = StyleSheet.create({
flexDirection: 'row',
},
tagTitle: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
flex: 0.2,
marginTop: 4,
},
tagList: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
flex: 0.8,
flexDirection: 'row',
flexWrap: 'wrap',
@@ -363,7 +363,7 @@ const filePageStyle = StyleSheet.create({
marginRight: 8,
},
rewardDriverText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
color: Colors.White,
fontSize: 14,
},
@@ -402,7 +402,7 @@ const filePageStyle = StyleSheet.create({
color: Colors.DescriptionGrey,
},
largeButtonText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
marginTop: 4,
},
@@ -430,7 +430,7 @@ const filePageStyle = StyleSheet.create({
},
unsupportedContentFilename: {
color: Colors.LbryGreen,
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 16,
},
unsupportedContentImage: {
@@ -439,11 +439,11 @@ const filePageStyle = StyleSheet.create({
marginRight: 24,
},
unsupportedContentTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 20,
},
unsupportedContentText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginTop: 4,
},
@@ -451,7 +451,7 @@ const filePageStyle = StyleSheet.create({
marginTop: 16,
},
viewCount: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
color: Colors.DescriptionGrey,
marginLeft: 12,
@@ -463,7 +463,7 @@ const filePageStyle = StyleSheet.create({
marginLeft: 24,
},
balanceText: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 14,
marginLeft: 4,
},
diff --git a/src/styles/firstRun.js b/src/styles/firstRun.js
index eadcf9e..d0bd438 100644
--- a/src/styles/firstRun.js
+++ b/src/styles/firstRun.js
@@ -17,7 +17,7 @@ const firstRunStyle = StyleSheet.create({
backgroundColor: Colors.LbryGreen,
},
title: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 40,
marginLeft: 32,
marginRight: 32,
@@ -25,7 +25,7 @@ const firstRunStyle = StyleSheet.create({
color: Colors.White,
},
paragraph: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 18,
lineHeight: 24,
marginLeft: 32,
@@ -34,7 +34,7 @@ const firstRunStyle = StyleSheet.create({
color: Colors.White,
},
spacedParagraph: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 18,
lineHeight: 28,
marginLeft: 32,
@@ -43,7 +43,7 @@ const firstRunStyle = StyleSheet.create({
color: Colors.White,
},
infoParagraph: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
lineHeight: 20,
marginLeft: 32,
@@ -55,7 +55,7 @@ const firstRunStyle = StyleSheet.create({
marginTop: 36,
},
rowParagraph: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
lineHeight: 24,
color: Colors.White,
@@ -67,7 +67,7 @@ const firstRunStyle = StyleSheet.create({
marginRight: 8,
},
emailInput: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 24,
lineHeight: 24,
marginLeft: 32,
@@ -76,7 +76,7 @@ const firstRunStyle = StyleSheet.create({
textAlign: 'center',
},
passwordInput: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 24,
lineHeight: 24,
marginLeft: 32,
@@ -102,7 +102,7 @@ const firstRunStyle = StyleSheet.create({
actionButton: {
backgroundColor: Colors.White,
alignSelf: 'center',
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
paddingLeft: 16,
paddingRight: 16,
@@ -114,18 +114,18 @@ const firstRunStyle = StyleSheet.create({
paddingRight: 32,
},
buttonText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 18,
color: Colors.White,
},
smallButtonText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
color: Colors.White,
marginBottom: -2,
},
smallLeftButtonText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
color: Colors.White,
marginBottom: 6,
@@ -183,7 +183,7 @@ const firstRunStyle = StyleSheet.create({
},
passwordWarningText: {
color: Colors.NextLbryGreen,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
centered: {
diff --git a/src/styles/floatingButton.js b/src/styles/floatingButton.js
index 9018fe2..768c97d 100644
--- a/src/styles/floatingButton.js
+++ b/src/styles/floatingButton.js
@@ -42,7 +42,7 @@ const floatingButtonStyle = StyleSheet.create({
},
text: {
color: Colors.White,
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 16,
},
bottomRight: {
diff --git a/src/styles/mediaPlayer.js b/src/styles/mediaPlayer.js
index 0948d50..be345bf 100644
--- a/src/styles/mediaPlayer.js
+++ b/src/styles/mediaPlayer.js
@@ -78,7 +78,7 @@ const mediaPlayerStyle = StyleSheet.create({
bottom: 14,
},
elapsedDuration: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
position: 'absolute',
left: 8,
bottom: 24,
@@ -86,7 +86,7 @@ const mediaPlayerStyle = StyleSheet.create({
color: '#ffffff',
},
totalDuration: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
position: 'absolute',
right: 48,
bottom: 24,
diff --git a/src/styles/modalPicker.js b/src/styles/modalPicker.js
index 41a615a..103f1e1 100644
--- a/src/styles/modalPicker.js
+++ b/src/styles/modalPicker.js
@@ -29,7 +29,7 @@ const modalPickerStyle = StyleSheet.create({
padding: 12,
},
title: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 12,
marginTop: 4,
textTransform: 'uppercase',
@@ -54,7 +54,7 @@ const modalPickerStyle = StyleSheet.create({
itemLabel: {
marginLeft: 8,
alignSelf: 'flex-start',
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
itemSelected: {
diff --git a/src/styles/modalTagSelector.js b/src/styles/modalTagSelector.js
index a341c95..0ba147f 100644
--- a/src/styles/modalTagSelector.js
+++ b/src/styles/modalTagSelector.js
@@ -42,7 +42,7 @@ const modalTagSelectorStyle = StyleSheet.create({
marginBottom: 12,
},
title: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 24,
},
buttons: {
diff --git a/src/styles/modalTip.js b/src/styles/modalTip.js
index e86f95c..a0dedf9 100644
--- a/src/styles/modalTip.js
+++ b/src/styles/modalTip.js
@@ -6,7 +6,7 @@ const modalTipStyle = StyleSheet.create({
padding: 16,
},
title: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 24,
},
row: {
@@ -19,7 +19,7 @@ const modalTipStyle = StyleSheet.create({
marginRight: 24,
},
tipAmountInput: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
alignSelf: 'flex-start',
textAlign: 'right',
@@ -27,7 +27,7 @@ const modalTipStyle = StyleSheet.create({
letterSpacing: 1,
},
currency: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
marginLeft: 4,
},
@@ -49,7 +49,7 @@ const modalTipStyle = StyleSheet.create({
marginLeft: 24,
},
balanceText: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 14,
marginLeft: 4,
},
@@ -57,12 +57,12 @@ const modalTipStyle = StyleSheet.create({
marginTop: 4,
},
infoText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
color: Colors.DescriptionGrey,
},
learnMoreLink: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
color: Colors.LbryGreen,
},
diff --git a/src/styles/pageHeader.js b/src/styles/pageHeader.js
index 5833d87..daccac3 100644
--- a/src/styles/pageHeader.js
+++ b/src/styles/pageHeader.js
@@ -42,7 +42,7 @@ const pageHeaderStyle = StyleSheet.create({
flexDirection: 'row',
},
titleText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: Platform.OS === 'ios' ? 17 : 20,
fontWeight: Platform.OS === 'ios' ? '700' : '500',
color: 'rgba(0, 0, 0, .9)',
diff --git a/src/styles/publish.js b/src/styles/publish.js
index d7ac27b..a7ebd80 100644
--- a/src/styles/publish.js
+++ b/src/styles/publish.js
@@ -23,7 +23,7 @@ const publishStyle = StyleSheet.create({
height: 90,
},
inputText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
card: {
@@ -57,7 +57,7 @@ const publishStyle = StyleSheet.create({
alignSelf: 'flex-end',
},
cardTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 20,
marginBottom: 8,
},
@@ -84,7 +84,7 @@ const publishStyle = StyleSheet.create({
},
actionText: {
color: Colors.White,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
marginTop: 8,
},
@@ -119,12 +119,12 @@ const publishStyle = StyleSheet.create({
},
priceInput: {
width: 80,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
textAlign: 'right',
},
currency: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
},
cardRow: {
flex: 1,
@@ -155,12 +155,12 @@ const publishStyle = StyleSheet.create({
},
loadingText: {
color: Colors.White,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginLeft: 8,
},
listEmptyText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
titleRow: {
@@ -168,7 +168,7 @@ const publishStyle = StyleSheet.create({
justifyContent: 'space-between',
},
cardText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
cameraPreview: {
@@ -192,12 +192,12 @@ const publishStyle = StyleSheet.create({
padding: 16,
},
successTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 28,
marginBottom: 16,
},
successText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginBottom: 16,
lineHeight: 20,
@@ -211,7 +211,7 @@ const publishStyle = StyleSheet.create({
successUrl: {
flex: 0.9,
fontSize: 32,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
color: Colors.NextLbryGreen,
marginRight: 16,
},
@@ -305,7 +305,7 @@ const publishStyle = StyleSheet.create({
paddingBottom: 12,
},
rewardDriverText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
color: Colors.White,
fontSize: 14,
},
@@ -325,7 +325,7 @@ const publishStyle = StyleSheet.create({
marginBottom: 4,
},
textInputTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
marginBottom: -10,
marginLeft: 4,
@@ -346,7 +346,7 @@ const publishStyle = StyleSheet.create({
},
thumbnailUploadText: {
color: Colors.White,
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 12,
marginLeft: 4,
},
@@ -357,7 +357,7 @@ const publishStyle = StyleSheet.create({
marginBottom: 16,
},
toggleText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
marginLeft: 8,
},
@@ -398,7 +398,7 @@ const publishStyle = StyleSheet.create({
padding: 16,
},
noPublishText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
publishNowButton: {
@@ -423,21 +423,21 @@ const publishStyle = StyleSheet.create({
},
noVideos: {
color: Colors.White,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
cameraInfo: {
color: Colors.White,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
warningText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
color: Colors.DescriptionGrey,
},
helpText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
color: Colors.DescriptionGrey,
},
@@ -463,7 +463,7 @@ const publishStyle = StyleSheet.create({
},
editIcon: {
color: Colors.White,
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 12,
},
balance: {
@@ -472,7 +472,7 @@ const publishStyle = StyleSheet.create({
marginLeft: 24,
},
balanceText: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 14,
marginLeft: 4,
},
diff --git a/src/styles/relatedContent.js b/src/styles/relatedContent.js
index 587a698..e4b091f 100644
--- a/src/styles/relatedContent.js
+++ b/src/styles/relatedContent.js
@@ -12,7 +12,7 @@ const relatedContentStyle = StyleSheet.create({
borderTopWidth: 1,
},
title: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 18,
},
itemList: {
diff --git a/src/styles/reward.js b/src/styles/reward.js
index 00d8fbf..db01262 100644
--- a/src/styles/reward.js
+++ b/src/styles/reward.js
@@ -37,7 +37,7 @@ const rewardStyle = StyleSheet.create({
marginTop: 36,
},
enrollDescText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 18,
lineHeight: 28,
color: Colors.White,
@@ -67,36 +67,36 @@ const rewardStyle = StyleSheet.create({
paddingBottom: 16,
},
text: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
lineHeight: 24,
},
infoText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 18,
marginLeft: 12,
},
title: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 22,
marginBottom: 6,
color: Colors.LbryGreen,
},
subtitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 18,
marginBottom: 6,
color: Colors.LbryGreen,
},
subcardText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 15,
lineHeight: 20,
marginLeft: 2,
marginRight: 2,
},
subcardTextInput: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginTop: 2,
marginBottom: 2,
@@ -122,7 +122,7 @@ const rewardStyle = StyleSheet.create({
},
link: {
color: Colors.LbryGreen,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
textLink: {
@@ -148,21 +148,21 @@ const rewardStyle = StyleSheet.create({
alignItems: 'center',
},
rewardAmount: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 26,
textAlign: 'center',
},
rewardCurrency: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
},
rewardTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
color: Colors.LbryGreen,
marginBottom: 4,
},
rewardDescription: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
lineHeight: 18,
marginBottom: 4,
@@ -195,7 +195,7 @@ const rewardStyle = StyleSheet.create({
},
summaryText: {
color: Colors.White,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 28,
marginLeft: 12,
},
@@ -208,19 +208,19 @@ const rewardStyle = StyleSheet.create({
marginRight: 32,
},
phoneInputText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
letterSpacing: 1.3,
color: Colors.White,
},
verifyingText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
marginLeft: 12,
alignSelf: 'flex-start',
},
verificationCodeInput: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
color: Colors.White,
fontSize: 24,
letterSpacing: 12,
@@ -244,11 +244,11 @@ const rewardStyle = StyleSheet.create({
},
notInterestedLink: {
fontSize: 14,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
color: Colors.White,
},
learnMoreLink: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
color: Colors.White,
textDecorationLine: 'underline',
},
@@ -258,7 +258,7 @@ const rewardStyle = StyleSheet.create({
paddingRight: 16,
},
customCodeInput: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
letterSpacing: 1.3,
marginTop: -8,
@@ -285,7 +285,7 @@ const rewardStyle = StyleSheet.create({
verificationTitle: {
fontSize: 32,
color: Colors.White,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
marginLeft: 32,
marginRight: 32,
marginBottom: 24,
@@ -300,7 +300,7 @@ const rewardStyle = StyleSheet.create({
fontSize: 14,
},
paragraphText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
color: Colors.White,
fontSize: 12,
lineHeight: 16,
diff --git a/src/styles/search.js b/src/styles/search.js
index 559d0a1..4321f9e 100644
--- a/src/styles/search.js
+++ b/src/styles/search.js
@@ -44,19 +44,19 @@ const searchStyle = StyleSheet.create({
backgroundColor: Colors.DarkerGrey,
},
tagResultTitle: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 24,
color: Colors.White,
},
tagResultDescription: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
color: Colors.VeryLightGrey,
},
searchInput: {
width: '100%',
height: '100%',
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
noResults: {
@@ -67,14 +67,14 @@ const searchStyle = StyleSheet.create({
alignItems: 'center',
},
noResultsText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginTop: 16,
marginLeft: 16,
marginRight: 16,
},
boldText: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 16,
},
loading: {
diff --git a/src/styles/settings.js b/src/styles/settings.js
index 1ea6c81..b159ac8 100644
--- a/src/styles/settings.js
+++ b/src/styles/settings.js
@@ -38,23 +38,23 @@ const settingsStyle = StyleSheet.create({
},
label: {
fontSize: 14,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
lineHeight: 18,
},
description: {
color: '#aaaaaa',
fontSize: 12,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
lineHeight: 18,
},
sectionTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 20,
marginBottom: 4,
},
sectionDescription: {
color: '#aaaaaa',
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
lineHeight: 18,
marginBottom: 8,
@@ -66,7 +66,7 @@ const settingsStyle = StyleSheet.create({
width: '85%',
},
languagePickerItem: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
pickerRow: {
diff --git a/src/styles/splash.js b/src/styles/splash.js
index 2064f70..1e46f07 100644
--- a/src/styles/splash.js
+++ b/src/styles/splash.js
@@ -8,14 +8,14 @@ const splashStyle = StyleSheet.create({
backgroundColor: Colors.LbryGreen,
},
title: {
- fontFamily: 'Inter-UI-Bold',
+ fontFamily: 'Inter-Bold',
fontSize: 64,
textAlign: 'center',
marginBottom: 48,
color: Colors.White,
},
errorTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 28,
marginBottom: 24,
marginLeft: 24,
@@ -23,7 +23,7 @@ const splashStyle = StyleSheet.create({
color: Colors.White,
},
paragraph: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
lineHeight: 24,
marginBottom: 20,
@@ -48,7 +48,7 @@ const splashStyle = StyleSheet.create({
width: '50%',
},
details: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
marginLeft: 16,
marginRight: 16,
@@ -56,7 +56,7 @@ const splashStyle = StyleSheet.create({
textAlign: 'center',
},
message: {
- fontFamily: 'Inter-UI-Bold',
+ fontFamily: 'Inter-Bold',
fontSize: 18,
color: Colors.White,
marginLeft: 16,
diff --git a/src/styles/storageStats.js b/src/styles/storageStats.js
index 17e4d06..236f9a8 100644
--- a/src/styles/storageStats.js
+++ b/src/styles/storageStats.js
@@ -16,16 +16,16 @@ const storageStatsStyle = StyleSheet.create({
padding: 16,
},
totalSize: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 36,
},
annotation: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
marginTop: -4,
},
statsText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
distributionBar: {
@@ -57,12 +57,12 @@ const storageStatsStyle = StyleSheet.create({
height: 16,
},
legendText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
flex: 0.3,
},
legendSize: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
flex: 0.6,
textAlign: 'right',
diff --git a/src/styles/subscriptions.js b/src/styles/subscriptions.js
index bb1ff78..e74f455 100644
--- a/src/styles/subscriptions.js
+++ b/src/styles/subscriptions.js
@@ -37,7 +37,7 @@ const subscriptionsStyle = StyleSheet.create({
paddingTop: 24,
},
infoText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginTop: 8,
marginBottom: 8,
@@ -57,7 +57,7 @@ const subscriptionsStyle = StyleSheet.create({
marginTop: 16,
},
contentText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginLeft: 24,
marginRight: 24,
@@ -96,7 +96,7 @@ const subscriptionsStyle = StyleSheet.create({
justifyContent: 'center',
},
fileItemName: {
- fontFamily: 'Inter-UI-Bold',
+ fontFamily: 'Inter-Bold',
marginTop: 8,
fontSize: 18,
},
@@ -109,7 +109,7 @@ const subscriptionsStyle = StyleSheet.create({
borderBottomWidth: 1,
},
channelTitle: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 20,
marginLeft: 24,
marginTop: 16,
@@ -136,16 +136,16 @@ const subscriptionsStyle = StyleSheet.create({
color: Colors.LbryGreen,
},
inactiveMode: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
},
activeMode: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
},
claimList: {
flex: 1,
},
pageTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 24,
},
titleRow: {
@@ -171,7 +171,7 @@ const subscriptionsStyle = StyleSheet.create({
marginRight: 24,
},
tagSortText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
marginRight: 4,
},
@@ -216,13 +216,13 @@ const subscriptionsStyle = StyleSheet.create({
top: 0,
},
suggestedItemTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginBottom: 4,
width: '85%',
},
suggestedItemName: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 14,
marginBottom: 4,
color: Colors.LbryGreen,
@@ -233,7 +233,7 @@ const subscriptionsStyle = StyleSheet.create({
flexWrap: 'wrap',
},
suggestedSubTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 20,
marginLeft: 16,
marginRight: 16,
@@ -251,7 +251,7 @@ const subscriptionsStyle = StyleSheet.create({
alignItems: 'center',
},
suggestedLink: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
modalContainer: {
diff --git a/src/styles/tag.js b/src/styles/tag.js
index a048f6e..e028410 100644
--- a/src/styles/tag.js
+++ b/src/styles/tag.js
@@ -7,7 +7,7 @@ const tagStyle = StyleSheet.create({
marginBottom: 4,
},
tagSearchInput: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
content: {
@@ -22,7 +22,7 @@ const tagStyle = StyleSheet.create({
marginRight: 8,
},
text: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
marginRight: 8,
},
@@ -34,7 +34,7 @@ const tagStyle = StyleSheet.create({
marginTop: 8,
},
nsfwTagsTitle: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginBottom: 4,
},
diff --git a/src/styles/transactionList.js b/src/styles/transactionList.js
index 9d42452..f575dc2 100644
--- a/src/styles/transactionList.js
+++ b/src/styles/transactionList.js
@@ -24,29 +24,29 @@ const transactionListStyle = StyleSheet.create({
alignSelf: 'stretch',
},
text: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
link: {
color: Colors.LbryGreen,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
amount: {
textAlign: 'right',
},
smallText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
color: '#aaaaaa',
},
smallLink: {
color: Colors.LbryGreen,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
},
noTransactions: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
textAlign: 'center',
padding: 16,
color: '#aaaaaa',
diff --git a/src/styles/uriBar.js b/src/styles/uriBar.js
index 47d6bc6..9284df8 100644
--- a/src/styles/uriBar.js
+++ b/src/styles/uriBar.js
@@ -29,7 +29,7 @@ const uriBarStyle = StyleSheet.create({
borderRadius: 24,
paddingLeft: 12,
paddingRight: 12,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
height: 44,
lineHeight: 18,
@@ -66,11 +66,11 @@ const uriBarStyle = StyleSheet.create({
flex: 1,
},
itemText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
itemDesc: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
color: Colors.UriDescBlue,
},
@@ -108,7 +108,7 @@ const uriBarStyle = StyleSheet.create({
alignItems: 'center',
},
itemCount: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 20,
marginLeft: 30,
},
diff --git a/src/styles/wallet.js b/src/styles/wallet.js
index e8df6f9..7d26807 100644
--- a/src/styles/wallet.js
+++ b/src/styles/wallet.js
@@ -26,7 +26,7 @@ const walletStyle = StyleSheet.create({
flexDirection: 'row',
},
address: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
letterSpacing: 0.8,
borderWidth: 1,
borderRadius: 16,
@@ -69,12 +69,12 @@ const walletStyle = StyleSheet.create({
margin: 16,
},
title: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 20,
marginBottom: 24,
},
transactionsTitle: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 20,
},
transactionsHeader: {
@@ -86,16 +86,16 @@ const walletStyle = StyleSheet.create({
borderBottomColor: '#eeeeee',
},
text: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
link: {
color: Colors.LbryGreen,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
smallText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 12,
},
balanceCard: {
@@ -111,14 +111,14 @@ const walletStyle = StyleSheet.create({
},
balanceTitle: {
color: Colors.White,
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 20,
marginLeft: 16,
marginTop: 16,
},
balanceCaption: {
color: '#caedB9',
- fontFamily: 'Inter-UI-Medium',
+ fontFamily: 'Inter-Medium',
fontSize: 14,
marginLeft: 16,
marginTop: 8,
@@ -126,7 +126,7 @@ const walletStyle = StyleSheet.create({
},
balance: {
color: Colors.White,
- fontFamily: 'Inter-UI-Bold',
+ fontFamily: 'Inter-Bold',
fontSize: 36,
marginLeft: 16,
marginBottom: 16,
@@ -137,19 +137,19 @@ const walletStyle = StyleSheet.create({
marginLeft: 24,
},
balanceText: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 14,
marginLeft: 4,
},
infoText: {
color: '#aaaaaa',
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
padding: 16,
textAlign: 'center',
},
input: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
amountInput: {
@@ -172,14 +172,14 @@ const walletStyle = StyleSheet.create({
},
warningParagraph: {
color: Colors.White,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
lineHeight: 24,
marginBottom: 16,
},
warningText: {
color: Colors.White,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
lineHeight: 24,
marginBottom: 8,
@@ -222,7 +222,7 @@ const walletStyle = StyleSheet.create({
},
rewardDriverText: {
color: Colors.White,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
lineHeight: 16,
},
@@ -237,7 +237,7 @@ const walletStyle = StyleSheet.create({
marginRight: 16,
},
syncDriverTitle: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 20,
paddingLeft: 16,
marginTop: 16,
@@ -247,7 +247,7 @@ const walletStyle = StyleSheet.create({
},
syncDriverLink: {
color: Colors.LbryGreen,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 14,
},
actionRow: {
@@ -291,11 +291,11 @@ const walletStyle = StyleSheet.create({
justifyContent: 'flex-end',
},
labelText: {
- fontFamily: 'Inter-UI-SemiBold',
+ fontFamily: 'Inter-SemiBold',
fontSize: 16,
},
valueText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
},
rightLink: {
@@ -316,7 +316,7 @@ const walletStyle = StyleSheet.create({
},
loadingText: {
color: '#aaaaaa',
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 16,
marginLeft: 8,
},
@@ -331,11 +331,11 @@ const walletStyle = StyleSheet.create({
},
continueLink: {
fontSize: 14,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
color: Colors.White,
},
learnMoreLink: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
color: Colors.NextLbryGreen,
},
signInButton: {
@@ -353,7 +353,7 @@ const walletStyle = StyleSheet.create({
marginTop: 36,
},
onboardingText: {
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 18,
lineHeight: 28,
color: Colors.White,
@@ -363,7 +363,7 @@ const walletStyle = StyleSheet.create({
},
signInTitle: {
color: Colors.White,
- fontFamily: 'Inter-UI-Regular',
+ fontFamily: 'Inter-Regular',
fontSize: 28,
},
});
--
2.49.1
From 2ea964dea0111b6bfd602497afc8d64493eade89 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 9 Jan 2020 16:47:58 +0100
Subject: [PATCH 11/11] use default page size. fix typo.
---
src/constants.js | 4 +---
src/page/search/index.js | 10 ++++------
src/page/search/view.js | 2 +-
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/constants.js b/src/constants.js
index 7ff1a5f..20bf1d9 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -134,9 +134,7 @@ const Constants = {
ORDER_BY_EFFECTIVE_AMOUNT: 'effective_amount',
- DEFAULT_PAGE_SIZE: 10,
-
- SEARCH_RESULTS_PAGE_SIZE: 25,
+ DEFAULT_PAGE_SIZE: 20,
ALL_PLACEHOLDER: '_all',
diff --git a/src/page/search/index.js b/src/page/search/index.js
index 03094f8..edb4b1f 100644
--- a/src/page/search/index.js
+++ b/src/page/search/index.js
@@ -24,17 +24,15 @@ const select = state => ({
isSearching: selectIsSearching(state),
query: selectSearchValue(state),
resolvingUris: selectResolvingUris(state),
- uris: makeSelectSearchUris(makeSelectQueryWithOptions(null, Constants.SEARCH_RESULTS_PAGE_SIZE)(state))(state),
- results: makeSelectResolvedSearchResults(makeSelectQueryWithOptions(null, Constants.SEARCH_RESULTS_PAGE_SIZE)(state))(
- state,
- ),
+ uris: makeSelectSearchUris(makeSelectQueryWithOptions(null, Constants.DEFAULT_PAGE_SIZE)(state))(state),
+ results: makeSelectResolvedSearchResults(makeSelectQueryWithOptions(null, Constants.DEFAULT_PAGE_SIZE)(state))(state),
lastPageReached: makeSelectResolvedSearchResultsLastPageReached(
- makeSelectQueryWithOptions(null, Constants.SEARCH_RESULTS_PAGE_SIZE)(state),
+ makeSelectQueryWithOptions(null, Constants.DEFAULT_PAGE_SIZE)(state),
)(state),
});
const perform = dispatch => ({
- search: (query, from) => dispatch(doResolvedSearch(query, Constants.SEARCH_RESULTS_PAGE_SIZE, from, false, {})),
+ search: (query, from) => dispatch(doResolvedSearch(query, Constants.DEFAULT_PAGE_SIZE, from, false, {})),
claimSearch: options => dispatch(doClaimSearch(options)),
updateSearchQuery: query => dispatch(doUpdateSearchQuery(query)),
pushDrawerStack: () => dispatch(doPushDrawerStack(Constants.DRAWER_ROUTE_SEARCH)),
diff --git a/src/page/search/view.js b/src/page/search/view.js
index 2f0f269..7710b3e 100644
--- a/src/page/search/view.js
+++ b/src/page/search/view.js
@@ -243,7 +243,7 @@ class SearchPage extends React.PureComponent {
)}
{this.state.currentFrom > 0 && isSearching && (
<View style={searchStyle.moreLoading}>
- <ActivityIndicator size="small" coolor={Colors.NextLbryGreen} />
+ <ActivityIndicator size="small" color={Colors.NextLbryGreen} />
</View>
)}
<FloatingWalletBalance navigation={navigation} />
--
2.49.1