Compare commits
38
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
15cbdcfaca | ||
|
|
30246a189c | ||
|
|
f77f0a7aa2 | ||
|
|
36d4bd7e99 | ||
|
|
b8f2a9e24f | ||
|
|
d7edbf55b5 | ||
|
|
d362d9e8dd | ||
|
|
f47693fb35 | ||
|
|
54b10c818e | ||
|
|
4b283e6606 | ||
|
|
67723813cc | ||
|
|
80b12a2cc8 | ||
|
|
48ce7e9d9e | ||
|
|
696ff616f7 | ||
|
|
94050e5e6d | ||
|
|
d52436e8d4 | ||
|
|
f231741789 | ||
|
|
dd7f1e82ba | ||
|
|
17b381de71 | ||
|
|
53f143f232 | ||
|
|
c58aecb35e | ||
|
|
8b4f1de951 | ||
|
|
daa4f5c5dc | ||
|
|
6ae9632fb9 | ||
|
|
c33cf47397 | ||
|
|
e0fa80f640 | ||
|
|
0e65d526d8 | ||
|
|
86e5bcf7e0 | ||
|
|
e9858f85e8 | ||
|
|
0b43454adc | ||
|
|
d69c1931ac | ||
|
|
970b53ffdc | ||
|
|
372a572ee6 | ||
|
|
01eb112888 | ||
|
|
bb9e990f5a | ||
|
|
3237652d35 | ||
|
|
fd715886cd | ||
|
|
fa2de8382a |
No files matched your search
@@ -1,3 +1,7 @@
|
||||
if (__DEV__) {
|
||||
import('./reactotron').then(() => console.log('Reactotron Configured'));
|
||||
}
|
||||
|
||||
import LBRYApp from './src/index';
|
||||
|
||||
export default LBRYApp;
|
||||
@@ -0,0 +1,247 @@
|
||||
{
|
||||
"Please wait while we get some things ready...": "Please wait while we get some things ready...",
|
||||
"Welcome to LBRY.": "Welcome to LBRY.",
|
||||
"LBRY is a community-controlled content platform where you can find and publish videos, music, books, and more.": "LBRY is a community-controlled content platform where you can find and publish videos, music, books, and more.",
|
||||
"Continue": "Continue",
|
||||
"Setup account": "Setup account",
|
||||
"A lbry.tv account allows you to earn rewards, backup your wallet, and keep everything in sync.": "A lbry.tv account allows you to earn rewards, backup your wallet, and keep everything in sync.",
|
||||
"This information is disclosed only to LBRY, Inc. and not to the LBRY network.": "This information is disclosed only to LBRY, Inc. and not to the LBRY network.",
|
||||
"No, thanks": "No, thanks",
|
||||
"Use LBRY": "Use LBRY",
|
||||
"Are you sure?": "Are you sure?",
|
||||
"Without an account, you will not receive rewards, sync and backup services, or security updates.": "Without an account, you will not receive rewards, sync and backup services, or security updates.",
|
||||
"I understand that by uninstalling LBRY I will lose any balances or published content with no recovery option if it is not backed up manually (see wallet page)": "I understand that by uninstalling LBRY I will lose any balances or published content with no recovery option if it is not backed up manually (see wallet page)",
|
||||
"Starting up": "Starting up",
|
||||
"Connecting": "Connecting",
|
||||
"Testing network": "Testing network",
|
||||
"Waiting for name resolution": "Waiting for name resolution",
|
||||
"Search movies, music, and more": "Search movies, music, and more",
|
||||
"Your Tags": "Your Tags",
|
||||
"Trending": "Trending",
|
||||
"Customize": "Customize",
|
||||
"Sign In": "Sign In",
|
||||
"SIGN IN": "SIGN IN",
|
||||
"Find content": "Find content",
|
||||
"Subscriptions": "Subscriptions",
|
||||
"All Content": "All Content",
|
||||
"Your content": "Your content",
|
||||
"Channels": "Channels",
|
||||
"Library": "Library",
|
||||
"Publishes": "Publishes",
|
||||
"New Publish": "New Publish",
|
||||
"Wallet": "Wallet",
|
||||
"Rewards": "Rewards",
|
||||
"Settings": "Settings",
|
||||
"About": "About",
|
||||
"All tags you follow": "All tags you follow",
|
||||
"More tags you follow": "More tags you follow",
|
||||
"FREE": "FREE",
|
||||
"more": "more",
|
||||
"You have not created a channel.\nStart now by creating a new channel!": "You have not created a channel.\nStart now by creating a new channel!",
|
||||
"Create a channel": "Create a channel",
|
||||
"CONTENT": "CONTENT",
|
||||
"ABOUT": "ABOUT",
|
||||
"Follow": "Follow",
|
||||
"No content to display at this time. Please check back later.": "No content to display at this time. Please check back later.",
|
||||
"New": "New",
|
||||
"Share": "Share",
|
||||
"Tip": "Tip",
|
||||
"Report": "Report",
|
||||
"Fetching cost info...": "Fetching cost info...",
|
||||
"Play": "Play",
|
||||
"Connecting...": "Connecting...",
|
||||
"Related Content": "Related Content",
|
||||
"Loading...": "Loading...",
|
||||
"Content Freedom": "Content Freedom",
|
||||
"LBRY is a free, open, and community-run digital marketplace. It is a decentralized peer-to-peer content distribution platform for creators to upload and share content, and earn LBRY credits for their effort. Users will be able to find a wide selection of videos, music, ebooks and other digital content they are interested in.": "LBRY is a free, open, and community-run digital marketplace. It is a decentralized peer-to-peer content distribution platform for creators to upload and share content, and earn LBRY credits for their effort. Users will be able to find a wide selection of videos, music, ebooks and other digital content they are interested in.",
|
||||
"What is LBRY?": "What is LBRY?",
|
||||
"Android App Basics": "Android App Basics",
|
||||
"Frequently Asked Questions": "Frequently Asked Questions",
|
||||
"Get Social": "Get Social",
|
||||
"You can interact with the LBRY team and members of the community on Discord, Facebook, Instagram, Twitter or Reddit.": "You can interact with the LBRY team and members of the community on Discord, Facebook, Instagram, Twitter or Reddit.",
|
||||
"App info": "App info",
|
||||
"App version": "App version",
|
||||
"LBRY SDK": "LBRY SDK",
|
||||
"Platform": "Platform",
|
||||
"Installation ID": "Installation ID",
|
||||
"Logs": "Logs",
|
||||
"Send log": "Send log",
|
||||
"Account Recommended": "Account Recommended",
|
||||
"Without an account, you assume all responsibility for securing your wallet and LBRY data.": "Without an account, you assume all responsibility for securing your wallet and LBRY data.",
|
||||
"Skip Account": "Skip Account",
|
||||
"Sign Up": "Sign Up",
|
||||
"Blockchain Sync": "Blockchain Sync",
|
||||
"Catching up with the blockchain (%progress%%)": "Catching up with the blockchain (%progress%%)",
|
||||
"Network Loading": "Network Loading",
|
||||
"Initializing LBRY service": "Initializing LBRY service",
|
||||
"%amount% available credits": "%amount% available credits",
|
||||
"LBRY credits allow you to purchase content, publish content, and influence the network.": "LBRY credits allow you to purchase content, publish content, and influence the network.",
|
||||
"You get credits for free for providing an email address and taking other basic actions.": "You get credits for free for providing an email address and taking other basic actions.",
|
||||
"Learn more": "Learn more",
|
||||
"Not interested": "Not interested",
|
||||
"Get started": "Get started",
|
||||
"Get %amount% free credits after creating an account.": "Get %amount% free credits after creating an account.",
|
||||
"Balance": "Balance",
|
||||
"You currently have": "You currently have",
|
||||
"Receive Credits": "Receive Credits",
|
||||
"Use this wallet address to receive credits sent by another user (or yourself).": "Use this wallet address to receive credits sent by another user (or yourself).",
|
||||
"Get new address": "Get new address",
|
||||
"You can generate a new address at any time, and any previous addresses will continue to work. Using multiple addresses can be helpful for keeping track of incoming payments from multiple sources.": "You can generate a new address at any time, and any previous addresses will continue to work. Using multiple addresses can be helpful for keeping track of incoming payments from multiple sources.",
|
||||
"Send Credits": "Send Credits",
|
||||
"Recipient address": "Recipient address",
|
||||
"Amount": "Amount",
|
||||
"Send": "Send",
|
||||
"Recent Transactions": "Recent Transactions",
|
||||
"View All": "View All",
|
||||
"Looks like you don't have any recent transactions.": "Looks like you don't have any recent transactions.",
|
||||
"Wallet Sync": "Wallet Sync",
|
||||
"Sync status": "Sync status",
|
||||
"Off": "Off",
|
||||
"Manual backup": "Manual backup",
|
||||
"Sync FAQ": "Sync FAQ",
|
||||
"Fetching transactions...": "Fetching transactions...",
|
||||
"Anonymous": "Anonymous",
|
||||
"Delete": "Delete",
|
||||
"Title": "Title",
|
||||
"Channel": "Channel",
|
||||
"Deposit": "Deposit",
|
||||
"This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.": "This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.",
|
||||
"Show optional fields": "Show optional fields",
|
||||
"Cancel": "Cancel",
|
||||
"Create": "Create",
|
||||
"Channel creation requires credits.": "Channel creation requires credits.",
|
||||
"Tap here to get some for free.": "Tap here to get some for free.",
|
||||
"%balance% available": "%balance% available",
|
||||
"Bal: %balance%": "Bal: %balance%",
|
||||
"Send a tip": "Send a tip",
|
||||
"Record": "Record",
|
||||
"Take a photo": "Take a photo",
|
||||
"Upload a file": "Upload a file",
|
||||
"Please wait while we load your videos...": "Please wait while we load your videos...",
|
||||
"Description": "Description",
|
||||
"Tags": "Tags",
|
||||
"Price": "Price",
|
||||
"Your content will be free. Press the toggle to set a price.": "Your content will be free. Press the toggle to set a price.",
|
||||
"Content address": "Content address",
|
||||
"The address where people can find your content (ex. lbry://myvideo). ": "The address where people can find your content (ex. lbry://myvideo). ",
|
||||
"This LBC remains yours and the deposit can be undone at any time.": "This LBC remains yours and the deposit can be undone at any time.",
|
||||
"Show extra fields": "Show extra fields",
|
||||
"Publish": "Publish",
|
||||
"Publishing requires credits.": "Publishing requires credits.",
|
||||
"Search for more tags": "Search for more tags",
|
||||
"Mature tags": "Mature tags",
|
||||
"Publish anonymously": "Publish anonymously",
|
||||
"Create a channel...": "Create a channel...",
|
||||
"Uploading thumbnail...": "Uploading thumbnail...",
|
||||
"Channel name": "Channel name",
|
||||
"Deposit cannot be higher than your balance": "Deposit cannot be higher than your balance",
|
||||
"There are no results to display for \"%query%\". Please try a different search term.": "There are no results to display for \"%query%\". Please try a different search term.",
|
||||
"Nothing here. Publish something!": "Nothing here. Publish something!",
|
||||
"Explore content for this tag": "Explore content for this tag",
|
||||
"URL does not include name.": "URL does not include name.",
|
||||
"Loading decentralized data...": "Loading decentralized data...",
|
||||
"View": "View",
|
||||
"Additional Options": "Additional Options",
|
||||
"Language": "Language",
|
||||
"English": "English",
|
||||
"Chinese": "Chinese",
|
||||
"French": "French",
|
||||
"German": "German",
|
||||
"Japanese": "Japanese",
|
||||
"Russian": "Russian",
|
||||
"Spanish": "Spanish",
|
||||
"Indonesian": "Indonesian",
|
||||
"Italian": "Italian",
|
||||
"Dutch": "Dutch",
|
||||
"Turkish": "Turkish",
|
||||
"Polish": "Polish",
|
||||
"Malay": "Malay",
|
||||
"Portuguese": "Portuguese",
|
||||
"Vietnamese": "Vietnamese",
|
||||
"Thai": "Thai",
|
||||
"Arabic": "Arabic",
|
||||
"Czech": "Czech",
|
||||
"Croatian": "Croatian",
|
||||
"Cambodian": "Cambodian",
|
||||
"Korean": "Korean",
|
||||
"Norwegian": "Norwegian",
|
||||
"Romanian": "Romanian",
|
||||
"Hindi": "Hindi",
|
||||
"Greek": "Greek",
|
||||
"License": "License",
|
||||
"None": "None",
|
||||
"Public Domain": "Public Domain",
|
||||
"Copyrighted...": "Copyrighted...",
|
||||
"Other...": "Other...",
|
||||
"Hide extra fields": "Hide extra fields",
|
||||
"Download": "Download",
|
||||
"%progress%% complete": "%progress%% complete",
|
||||
"Email": "Email",
|
||||
"Please provide an email address.": "Please provide an email address.",
|
||||
"An email has been sent to": "An email has been sent to",
|
||||
"Please click the link in the message to complete signing in.": "Please click the link in the message to complete signing in.",
|
||||
"Resend": "Resend",
|
||||
"Edit": "Edit",
|
||||
"Your email address was successfully verified.": "Your email address was successfully verified.",
|
||||
"password": "password",
|
||||
"Please enter a password to secure your account and wallet.": "Please enter a password to secure your account and wallet.",
|
||||
"Retrieving your account information...": "Retrieving your account information...",
|
||||
"Please enter the password you used to secure your wallet.": "Please enter the password you used to secure your wallet.",
|
||||
"Note: for wallet security purposes, LBRY is unable to reset your password.": "Note: for wallet security purposes, LBRY is unable to reset your password.",
|
||||
"On": "On",
|
||||
"Connected email": "Connected email",
|
||||
"Address copied": "Address copied",
|
||||
"Unlocking account": "Unlocking account",
|
||||
"Decrypting wallet": "Decrypting wallet",
|
||||
"used": "used",
|
||||
"Stats": "Stats",
|
||||
"Channels you follow": "Channels you follow",
|
||||
"Suggested": "Suggested",
|
||||
"ALL": "ALL",
|
||||
"Customize your tags": "Customize your tags",
|
||||
"Done": "Done",
|
||||
"Unfollow": "Unfollow",
|
||||
"This content is Not Safe For Work. To view adult content, please change your Settings.": "This content is Not Safe For Work. To view adult content, please change your Settings.",
|
||||
"No views": "No views",
|
||||
"%view% views": "%view% views",
|
||||
"Content": "Content",
|
||||
"Enable background media playback": "Enable background media playback",
|
||||
"Enable this option to play audio or video in the background when the app is suspended.": "Enable this option to play audio or video in the background when the app is suspended.",
|
||||
"Choose language": "Choose language",
|
||||
"Use device language": "Use device language",
|
||||
"Gujarati": "Gujarati",
|
||||
"Show mature content": "Show mature content",
|
||||
"Notifications": "Notifications",
|
||||
"Choose the notifications you would like to receive.": "Choose the notifications you would like to receive.",
|
||||
"Content Interests": "Content Interests",
|
||||
"Search": "Search",
|
||||
"Show URL suggestions": "Show URL suggestions",
|
||||
"Other": "Other",
|
||||
"Keep the SDK background service running after closing the app": "Keep the SDK background service running after closing the app",
|
||||
"Enable this option for quicker app launch and to keep the synchronisation with the blockchain up to date.": "Enable this option for quicker app launch and to keep the synchronisation with the blockchain up to date.",
|
||||
"There's nothing here yet.\nPlease check back later.": "There's nothing here yet.\nPlease check back later.",
|
||||
"%follower% followers": "%follower% followers",
|
||||
"Are you sure you want to tip %amount% credits": "Are you sure you want to tip %amount% credits",
|
||||
"Send tip": "Send tip",
|
||||
"No": "No",
|
||||
"Yes": "Yes",
|
||||
"History": "History",
|
||||
"/wallet": "/wallet",
|
||||
"Are you sure you want to tip %amount% credit": "Are you sure you want to tip %amount% credit",
|
||||
"Enjoying LBRY?": "Enjoying LBRY?",
|
||||
"Are you enjoying your experience with the LBRY app? You can leave a review for us on the Play Store.": "Are you enjoying your experience with the LBRY app? You can leave a review for us on the Play Store.",
|
||||
"Never ask again": "Never ask again",
|
||||
"Maybe later": "Maybe later",
|
||||
"Rate app": "Rate app",
|
||||
"This will appear as a tip for %content%, which will boost its ability to be discovered while active.": "This will appear as a tip for %content%, which will boost its ability to be discovered while active.",
|
||||
"Learn more.": "Learn more.",
|
||||
"Send a tip to %channel%": "Send a tip to %channel%",
|
||||
"The transaction URL could not be opened": "The transaction URL could not be opened",
|
||||
"Show All": "Show All",
|
||||
"Fetching rewards...": "Fetching rewards...",
|
||||
"Custom Code": "Custom Code",
|
||||
"Are you a supermodel or rockstar that received a custom reward code? Claim it here.": "Are you a supermodel or rockstar that received a custom reward code? Claim it here.",
|
||||
"Redeem": "Redeem",
|
||||
"Please confirm that you want to use LBRY without creating an account.": "Please confirm that you want to use LBRY without creating an account.",
|
||||
"You sent %amount% LBC as a tip, Mahalo!": "You sent %amount% LBC as a tip, Mahalo!"
|
||||
}
|
||||
Generated
+3403
-1849
File diff suppressed because it is too large.
Load diff
+23
-19
@@ -12,49 +12,50 @@
|
||||
"base-64": "^0.1.0",
|
||||
"@expo/vector-icons": "^8.1.0",
|
||||
"gfycat-style-urls": "^1.0.3",
|
||||
"lbry-redux": "lbryio/lbry-redux#9b11cfed62af7f0f8eb6fa3c88a1f8d2cce46afc",
|
||||
"lbryinc": "lbryio/lbryinc#9ffb883cc11e36d55a729c65b70c405a4a56d35e",
|
||||
"lbry-redux": "lbryio/lbry-redux#2c569a729bb40d45249ca38150b00922162b7ce3",
|
||||
"lbryinc": "lbryio/lbryinc#053ca52f4f7f9bf8eb62a3581b183671a475ad1c",
|
||||
"lodash": ">=4.17.11",
|
||||
"merge": ">=1.2.1",
|
||||
"moment": "^2.22.1",
|
||||
"react": "16.8.6",
|
||||
"react-native": "0.59.10",
|
||||
"react": "16.9.0",
|
||||
"react-native": "0.61.5",
|
||||
"@react-native-community/async-storage": "^1.5.1",
|
||||
"react-native-camera": "^2.11.1",
|
||||
"react-native-country-picker-modal": "^0.6.2",
|
||||
"react-native-camera": "^3.15.0",
|
||||
"react-native-country-picker-modal": "^1.10.0",
|
||||
"react-native-exception-handler": "2.9.0",
|
||||
"react-native-fast-image": "^6.1.1",
|
||||
"react-native-fast-image": "^7.0.2",
|
||||
"react-native-fs": "^2.13.3",
|
||||
"react-native-gesture-handler": "1.3.0",
|
||||
"react-native-gesture-handler": "1.5.2",
|
||||
"react-native-image-zoom-viewer": "^2.2.5",
|
||||
"react-native-password-strength-meter": "^0.0.2",
|
||||
"react-native-phone-input": "lbryio/react-native-phone-input",
|
||||
"react-native-reanimated": "1.2.0",
|
||||
"react-native-reanimated": "1.4.0",
|
||||
"react-native-snackbar": "2.0.4",
|
||||
"react-native-super-grid": "^3.0.4",
|
||||
"react-native-vector-icons": "^6.6.0",
|
||||
"react-native-video": "lbryio/react-native-video#exoplayer-lbry-android",
|
||||
"react-navigation": "^3.11.0",
|
||||
"react-navigation-drawer": "^1.4.0",
|
||||
"react-native-video": "lbryio/react-native-video#7992ff945872f9bd00a3736d9ff1318f343abf47",
|
||||
"react-navigation": "^3.13.0",
|
||||
"react-navigation-drawer": "^2.3.3",
|
||||
"react-navigation-redux-helpers": "^3.0.2",
|
||||
"react-navigation-stack": "^1.8.1",
|
||||
"react-redux": "^5.0.3",
|
||||
"redux": "^4.0.4",
|
||||
"redux-persist": "^5.10.0",
|
||||
"redux-persist-filesystem-storage": "^1.3.2",
|
||||
"redux-persist": "^6.0.0",
|
||||
"redux-persist-filesystem-storage": "^2.1.0",
|
||||
"redux-persist-transform-compress": "^4.2.0",
|
||||
"redux-persist-transform-filter": "0.0.18",
|
||||
"redux-thunk": "^2.3.0",
|
||||
"rn-fetch-blob": "0.10.15",
|
||||
"rn-fetch-blob": "0.12.0",
|
||||
"seedrandom": "3.0.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.5.4",
|
||||
"@babel/core": "^7.6.2",
|
||||
"babel-eslint": "10.0.2",
|
||||
"@babel/plugin-proposal-object-rest-spread": "^7.5.4",
|
||||
"babel-preset-env": "^1.6.1",
|
||||
"babel-preset-stage-2": "^6.18.0",
|
||||
"babel-plugin-module-resolver": "^3.1.1",
|
||||
"eslint": "^5.16.0",
|
||||
"eslint": "^6.5.1",
|
||||
"eslint-config-standard": "^12.0.0",
|
||||
"eslint-config-standard-jsx": "^6.0.2",
|
||||
"eslint-plugin-flowtype": "^2.46.1",
|
||||
@@ -66,8 +67,11 @@
|
||||
"flow-babel-webpack-plugin": "^1.1.1",
|
||||
"husky": "^0.14.3",
|
||||
"lint-staged": "^7.0.4",
|
||||
"metro-react-native-babel-preset": "^0.55.0",
|
||||
"metro-react-native-babel-preset": "^0.56.0",
|
||||
"prettier": "^1.11.1",
|
||||
"react-devtools": "^3.6.3"
|
||||
"@react-native-community/eslint-config": "^0.0.5",
|
||||
"react-devtools": "^3.6.3",
|
||||
"reactotron-react-native": "4.0.2",
|
||||
"reactotron-redux": "3.1.2"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
import AsyncStorage from '@react-native-community/async-storage';
|
||||
import Reactotron from 'reactotron-react-native'
|
||||
|
||||
Reactotron
|
||||
.setAsyncStorageHandler(AsyncStorage) // AsyncStorage would either come from `react-native` or `@react-native-community/async-storage` depending on where you get it from
|
||||
.configure() // controls connection & communication settings
|
||||
.useReactNative() // add all built-in react native plugins
|
||||
.connect(); // let's connect!
|
||||
@@ -51,6 +51,7 @@ import {
|
||||
selectHashChanged,
|
||||
selectUser,
|
||||
} from 'lbryinc';
|
||||
import { doStartDownload, doUpdateDownload, doCompleteDownload } from 'redux/actions/file';
|
||||
import { makeSelectClientSetting, selectFullscreenMode } from 'redux/selectors/settings';
|
||||
import { decode as atob } from 'base-64';
|
||||
import { dispatchNavigateBack, dispatchNavigateToUri, transformUrl } from 'utils/helper';
|
||||
@@ -62,6 +63,7 @@ import NavigationButton from 'component/navigationButton';
|
||||
import discoverStyle from 'styles/discover';
|
||||
import searchStyle from 'styles/search';
|
||||
import SearchRightHeaderIcon from 'component/searchRightHeaderIcon';
|
||||
import Snackbar from 'react-native-snackbar';
|
||||
|
||||
const SYNC_GET_INTERVAL = 1000 * 60 * 5; // every 5 minutes
|
||||
|
||||
@@ -310,6 +312,10 @@ class AppWithNavigationState extends React.Component {
|
||||
this.emailVerifyCheckInterval = setInterval(() => this.checkEmailVerification(), 5000);
|
||||
Linking.addEventListener('url', this._handleUrl);
|
||||
|
||||
DeviceEventEmitter.addListener('onDownloadStarted', this.handleDownloadStarted);
|
||||
DeviceEventEmitter.addListener('onDownloadUpdated', this.handleDownloadUpdated);
|
||||
DeviceEventEmitter.addListener('onDownloadCompleted', this.handleDownloadCompleted);
|
||||
|
||||
// call /sync/get with interval
|
||||
this.syncGetInterval = setInterval(() => {
|
||||
this.setState({ syncHashChanged: false }); // reset local state
|
||||
@@ -344,7 +350,29 @@ class AppWithNavigationState extends React.Component {
|
||||
);
|
||||
};
|
||||
|
||||
handleDownloadStarted = evt => {
|
||||
const { dispatch } = this.props;
|
||||
const { uri, outpoint, fileInfo } = evt;
|
||||
dispatch(doStartDownload(uri, outpoint, fileInfo));
|
||||
};
|
||||
|
||||
handleDownloadUpdated = evt => {
|
||||
const { dispatch } = this.props;
|
||||
const { uri, outpoint, fileInfo, progress } = evt;
|
||||
dispatch(doUpdateDownload(uri, outpoint, fileInfo, progress));
|
||||
};
|
||||
|
||||
handleDownloadCompleted = evt => {
|
||||
const { dispatch } = this.props;
|
||||
const { uri, outpoint, fileInfo } = evt;
|
||||
dispatch(doCompleteDownload(uri, outpoint, fileInfo));
|
||||
};
|
||||
|
||||
componentWillUnmount() {
|
||||
DeviceEventEmitter.removeListener('onDownloadStarted', this.handleDownloadStarted);
|
||||
DeviceEventEmitter.removeListener('onDownloadUpdated', this.handleDownloadUpdated);
|
||||
DeviceEventEmitter.removeListener('onDownloadCompleted', this.handleDownloadCompleted);
|
||||
|
||||
AppState.removeEventListener('change', this._handleAppStateChange);
|
||||
BackHandler.removeEventListener('hardwareBackPress');
|
||||
Linking.removeEventListener('url', this._handleUrl);
|
||||
@@ -364,7 +392,7 @@ class AppWithNavigationState extends React.Component {
|
||||
this.setState({ verifyPending: false });
|
||||
|
||||
NativeModules.Firebase.track('email_verified', { email: user.primary_email });
|
||||
ToastAndroid.show(__('Your email address was successfully verified.'), ToastAndroid.LONG);
|
||||
Snackbar.show({ title: __('Your email address was successfully verified.'), duration: Snackbar.LENGTH_LONG });
|
||||
|
||||
// get user settings after email verification
|
||||
this.getUserSettings();
|
||||
@@ -381,7 +409,7 @@ class AppWithNavigationState extends React.Component {
|
||||
const { toast, emailToVerify, emailVerifyPending, emailVerifyErrorMessage, user } = nextProps;
|
||||
|
||||
if (toast) {
|
||||
const { message } = toast;
|
||||
const { message, isError } = toast;
|
||||
let currentDisplayType;
|
||||
if (!currentDisplayType && message) {
|
||||
// default to toast if no display type set and there is a message specified
|
||||
@@ -389,7 +417,14 @@ class AppWithNavigationState extends React.Component {
|
||||
}
|
||||
|
||||
if (currentDisplayType === 'toast') {
|
||||
ToastAndroid.show(message, ToastAndroid.LONG);
|
||||
const props = {
|
||||
title: message,
|
||||
duration: Snackbar.LENGTH_LONG,
|
||||
};
|
||||
if (isError) {
|
||||
props.backgroundColor = Colors.Red;
|
||||
}
|
||||
Snackbar.show(props);
|
||||
}
|
||||
|
||||
dispatch(doDismissToast());
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import { CLAIM_VALUES, isNameValid } from 'lbry-redux';
|
||||
import { CLAIM_VALUES, formatCredits, isNameValid } from 'lbry-redux';
|
||||
import { ActivityIndicator, NativeModules, Picker, Text, TextInput, TouchableOpacity, View } from 'react-native';
|
||||
import { logPublish } from 'utils/helper';
|
||||
import Button from 'component/button';
|
||||
@@ -14,6 +14,7 @@ export default class ChannelSelector extends React.PureComponent {
|
||||
super(props);
|
||||
|
||||
this.state = {
|
||||
creditsInputFocused: false,
|
||||
currentSelectedValue: Constants.ITEM_ANONYMOUS,
|
||||
newChannelName: '',
|
||||
newChannelBid: 0.1,
|
||||
@@ -188,7 +189,7 @@ export default class ChannelSelector extends React.PureComponent {
|
||||
|
||||
render() {
|
||||
const channel = this.state.addingChannel ? 'new' : this.props.channel;
|
||||
const { enabled, fetchingChannels, channels = [] } = this.props;
|
||||
const { balance, enabled, fetchingChannels, channels = [] } = this.props;
|
||||
const pickerItems = [Constants.ITEM_ANONYMOUS, Constants.ITEM_CREATE_A_CHANNEL].concat(
|
||||
channels ? channels.map(ch => ch.name) : []
|
||||
);
|
||||
@@ -244,11 +245,19 @@ export default class ChannelSelector extends React.PureComponent {
|
||||
style={channelSelectorStyle.bidAmountInput}
|
||||
value={String(newChannelBid)}
|
||||
onChangeText={this.handleNewChannelBidChange}
|
||||
onFocus={() => this.setState({ creditsInputFocused: true })}
|
||||
onBlur={() => this.setState({ creditsInputFocused: false })}
|
||||
placeholder={'0.00'}
|
||||
keyboardType={'number-pad'}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
/>
|
||||
<Text style={channelSelectorStyle.currency}>LBC</Text>
|
||||
<View style={channelSelectorStyle.balance}>
|
||||
{this.state.creditsInputFocused && <Icon name="coins" size={12} />}
|
||||
{this.state.creditsInputFocused && (
|
||||
<Text style={channelSelectorStyle.balanceText}>{formatCredits(parseFloat(balance), 1, true)}</Text>
|
||||
)}
|
||||
</View>
|
||||
</View>
|
||||
<Text style={channelSelectorStyle.helpText}>
|
||||
{__('This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.')}
|
||||
|
||||
@@ -147,7 +147,7 @@ class ClaimList extends React.PureComponent {
|
||||
renderMorePlaceholder = () => {
|
||||
return (
|
||||
<TouchableOpacity style={discoverStyle.fileItemMore} onPress={this.onMorePressed}>
|
||||
<Text style={discoverStyle.moreText}>more</Text>
|
||||
<Text style={discoverStyle.moreText}>{__('more')}</Text>
|
||||
<Icon style={discoverStyle.moreIcon} name={'angle-double-down'} color={Colors.White} size={16} />
|
||||
</TouchableOpacity>
|
||||
);
|
||||
|
||||
@@ -74,7 +74,7 @@ class CustomRewardCard extends React.PureComponent<Props> {
|
||||
/>
|
||||
<Button
|
||||
style={rewardStyle.redeemButton}
|
||||
text={'Redeem'}
|
||||
text={__('Redeem')}
|
||||
disabled={!this.state.rewardCode || this.state.rewardCode.trim().length === 0 || rewardIsPending}
|
||||
onPress={() => {
|
||||
if (!rewardIsPending) {
|
||||
|
||||
@@ -11,11 +11,6 @@ class FileDownloadButton extends React.PureComponent {
|
||||
}
|
||||
}
|
||||
|
||||
componentWillReceiveProps(nextProps) {
|
||||
// this.checkAvailability(nextProps.uri);
|
||||
// this.restartDownload(nextProps);
|
||||
}
|
||||
|
||||
restartDownload(props) {
|
||||
const { downloading, fileInfo, uri, restartDownload } = props;
|
||||
|
||||
@@ -45,12 +40,13 @@ class FileDownloadButton extends React.PureComponent {
|
||||
doPause,
|
||||
style,
|
||||
openFile,
|
||||
onFileActionPress,
|
||||
onButtonLayout,
|
||||
} = this.props;
|
||||
|
||||
if ((fileInfo && !fileInfo.stopped) || loading || downloading) {
|
||||
const progress = fileInfo && fileInfo.written_bytes ? (fileInfo.written_bytes / fileInfo.total_bytes) * 100 : 0,
|
||||
label = fileInfo ? progress.toFixed(0) + '% complete' : __('Connecting...');
|
||||
label = fileInfo ? __('%progress%% complete', { progress: progress.toFixed(0) }) : __('Connecting...');
|
||||
|
||||
return (
|
||||
<View style={[style, fileDownloadButtonStyle.container]}>
|
||||
@@ -72,21 +68,7 @@ class FileDownloadButton extends React.PureComponent {
|
||||
text={isPlayable ? __('Play') : isViewable ? __('View') : __('Download')}
|
||||
onLayout={onButtonLayout}
|
||||
style={[style, fileDownloadButtonStyle.container]}
|
||||
onPress={() => {
|
||||
if (NativeModules.Firebase) {
|
||||
NativeModules.Firebase.track('purchase_uri', { uri: uri });
|
||||
}
|
||||
purchaseUri(uri, costInfo, !isPlayable);
|
||||
if (NativeModules.UtilityModule) {
|
||||
NativeModules.UtilityModule.checkDownloads();
|
||||
}
|
||||
if (isPlayable && onPlay) {
|
||||
this.props.onPlay();
|
||||
}
|
||||
if (isViewable && onView) {
|
||||
this.props.onView();
|
||||
}
|
||||
}}
|
||||
onPress={onFileActionPress}
|
||||
/>
|
||||
);
|
||||
} else if (fileInfo && fileInfo.download_path) {
|
||||
|
||||
@@ -42,13 +42,15 @@ class FileListItem extends React.PureComponent {
|
||||
componentDidMount() {
|
||||
const { claim, resolveUri, uri, batchResolve } = this.props;
|
||||
if (!claim && !batchResolve) {
|
||||
console.log('resolving on componentDidMount?');
|
||||
resolveUri(uri);
|
||||
}
|
||||
}
|
||||
|
||||
componentDidUpdate() {
|
||||
const { claim, resolveUri, uri } = this.props;
|
||||
if (!claim && uri !== this.state.url) {
|
||||
const { claim, resolveUri, uri, batchResolve } = this.props;
|
||||
if (!claim && uri !== this.state.url && !batchResolve) {
|
||||
console.log('resolving on componentDidUpdate?');
|
||||
this.setState({ url: uri }, () => resolveUri(uri));
|
||||
}
|
||||
}
|
||||
@@ -158,7 +160,13 @@ class FileListItem extends React.PureComponent {
|
||||
</View>
|
||||
)}
|
||||
{fileInfo && fileInfo.completed && fileInfo.download_path && (
|
||||
<Icon style={fileListStyle.downloadedIcon} solid color={Colors.NextLbryGreen} name={'folder'} size={16} />
|
||||
<Icon
|
||||
style={featuredResult ? fileListStyle.featuredDownloadedIcon : fileListStyle.downloadedIcon}
|
||||
solid
|
||||
color={Colors.NextLbryGreen}
|
||||
name={'folder'}
|
||||
size={16}
|
||||
/>
|
||||
)}
|
||||
<View style={fileListStyle.detailsContainer}>
|
||||
{featuredResult && (
|
||||
@@ -172,7 +180,7 @@ class FileListItem extends React.PureComponent {
|
||||
{!title && !name && <Text style={fileListStyle.uri}>{uri}</Text>}
|
||||
{!title && !name && (
|
||||
<View style={fileListStyle.row}>
|
||||
<ActivityIndicator size={'small'} color={featuredResult ? Colors.White : Colors.LbryGreen} />
|
||||
<ActivityIndicator size={'small'} color={featuredResult ? Colors.White : Colors.NextLbryGreen} />
|
||||
</View>
|
||||
)}
|
||||
</View>
|
||||
@@ -203,7 +211,7 @@ class FileListItem extends React.PureComponent {
|
||||
normalizeURI(shortChannelUri || fullChannelUri),
|
||||
null,
|
||||
false,
|
||||
fullChannelUri
|
||||
fullChannelUri,
|
||||
);
|
||||
}}
|
||||
/>
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
import { connect } from 'react-redux';
|
||||
import { doSendTip, doToast, selectBalance } from 'lbry-redux';
|
||||
import ModalTipView from './view';
|
||||
|
||||
const select = state => ({
|
||||
balance: selectBalance(state),
|
||||
});
|
||||
|
||||
const perform = dispatch => ({
|
||||
notify: data => dispatch(doToast(data)),
|
||||
sendTip: (amount, claimId, isSupport, successCallback, errorCallback) =>
|
||||
dispatch(doSendTip(amount, claimId, isSupport, successCallback, errorCallback)),
|
||||
});
|
||||
|
||||
export default connect(
|
||||
select,
|
||||
perform
|
||||
)(ModalTipView);
|
||||
@@ -0,0 +1,148 @@
|
||||
import React from 'react';
|
||||
import { ActivityIndicator, Alert, Text, TextInput, TouchableOpacity, View } from 'react-native';
|
||||
import { formatCredits } from 'lbry-redux';
|
||||
import modalStyle from 'styles/modal';
|
||||
import modalTipStyle from 'styles/modalTip';
|
||||
import Button from 'component/button';
|
||||
import Colors from 'styles/colors';
|
||||
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
||||
import Icon from 'react-native-vector-icons/FontAwesome5';
|
||||
import Link from 'component/link';
|
||||
|
||||
export default class ModalTipView extends React.PureComponent {
|
||||
tipAmountInput = null;
|
||||
|
||||
state = {
|
||||
creditsInputFocused: false,
|
||||
sendTipStarted: false,
|
||||
tipAmount: null,
|
||||
};
|
||||
|
||||
handleSendTip = () => {
|
||||
const { claim, balance, notify, onSendTipFailed, onSendTipSuccessful, sendTip } = this.props;
|
||||
const { tipAmount } = this.state;
|
||||
|
||||
if (tipAmount > balance) {
|
||||
notify({
|
||||
message: 'Insufficient credits',
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const amount = parseInt(tipAmount, 10);
|
||||
const message =
|
||||
amount === 1
|
||||
? __('Please confirm you want to tip %amount% credit', { amount })
|
||||
: __('Please confirm you want to tip %amount% credits', { amount });
|
||||
|
||||
Alert.alert(
|
||||
__('Send Tip'),
|
||||
message,
|
||||
[
|
||||
{ text: __('No') },
|
||||
{
|
||||
text: __('Yes'),
|
||||
onPress: () => {
|
||||
this.setState({ sendTipStarted: true }, () =>
|
||||
sendTip(
|
||||
tipAmount,
|
||||
claim.claim_id,
|
||||
false,
|
||||
() => {
|
||||
// success
|
||||
this.setState({ tipAmount: null, sendTipStarted: false });
|
||||
if (onSendTipSuccessful) onSendTipSuccessful();
|
||||
},
|
||||
() => {
|
||||
// error
|
||||
if (onSendTipFailed) onSendTipFailed();
|
||||
}
|
||||
)
|
||||
);
|
||||
},
|
||||
},
|
||||
],
|
||||
{ cancelable: true }
|
||||
);
|
||||
};
|
||||
|
||||
render() {
|
||||
const { balance, channelName, contentName, onCancelPress, onOverlayPress } = this.props;
|
||||
const canSendTip = this.state.tipAmount > 0;
|
||||
|
||||
return (
|
||||
<TouchableOpacity style={modalStyle.overlay} activeOpacity={1} onPress={onOverlayPress}>
|
||||
<TouchableOpacity style={modalStyle.container} activeOpacity={1}>
|
||||
<View
|
||||
style={modalTipStyle.container}
|
||||
onLayout={() => {
|
||||
if (this.tipAmountInput) {
|
||||
this.tipAmountInput.focus();
|
||||
}
|
||||
}}
|
||||
>
|
||||
<Text style={modalTipStyle.title} numberOfLines={1}>
|
||||
{channelName ? __('Send a tip to %channel%', { channel: channelName }) : __('Send a tip')}
|
||||
</Text>
|
||||
|
||||
<View style={modalTipStyle.row}>
|
||||
<View style={modalTipStyle.amountRow}>
|
||||
<TextInput
|
||||
editable={!this.state.sendTipStarted}
|
||||
ref={ref => (this.tipAmountInput = ref)}
|
||||
onChangeText={value => this.setState({ tipAmount: value })}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
keyboardType={'numeric'}
|
||||
onFocus={() => this.setState({ creditsInputFocused: true })}
|
||||
onBlur={() => this.setState({ creditsInputFocused: false })}
|
||||
placeholder={'0'}
|
||||
value={this.state.tipAmount}
|
||||
selectTextOnFocus
|
||||
style={modalTipStyle.tipAmountInput}
|
||||
/>
|
||||
<Text style={modalTipStyle.currency}>LBC</Text>
|
||||
<View style={modalTipStyle.balance}>
|
||||
{this.state.creditsInputFocused && <Icon name="coins" size={12} />}
|
||||
{this.state.creditsInputFocused && (
|
||||
<Text style={modalTipStyle.balanceText}>{formatCredits(parseFloat(balance), 1, true)}</Text>
|
||||
)}
|
||||
</View>
|
||||
</View>
|
||||
{this.state.sendTipStarted && <ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />}
|
||||
</View>
|
||||
|
||||
<View style={modalTipStyle.info}>
|
||||
<Text style={modalTipStyle.infoText}>
|
||||
{__(
|
||||
'This will appear as a tip for %content%, which will boost its ability to be discovered while active.',
|
||||
{ content: contentName }
|
||||
)}{' '}
|
||||
<Link
|
||||
style={modalTipStyle.learnMoreLink}
|
||||
text={__('Learn more.')}
|
||||
href={'https://lbry.com/faq/tipping'}
|
||||
/>
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
<View style={modalTipStyle.buttonRow}>
|
||||
<Link
|
||||
style={modalTipStyle.cancelTipLink}
|
||||
text={__('Cancel')}
|
||||
onPress={() => {
|
||||
if (onCancelPress) onCancelPress();
|
||||
}}
|
||||
/>
|
||||
<Button
|
||||
text={__('Send')}
|
||||
style={modalTipStyle.button}
|
||||
disabled={!canSendTip || this.state.sendTipStarted}
|
||||
onPress={this.handleSendTip}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
</TouchableOpacity>
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,25 +1,27 @@
|
||||
import { connect } from 'react-redux';
|
||||
import {
|
||||
doResolveUris,
|
||||
doSearch,
|
||||
makeSelectClaimForUri,
|
||||
makeSelectRecommendedContentForUri,
|
||||
makeSelectTitleForUri,
|
||||
selectResolvingUris,
|
||||
selectIsSearching,
|
||||
} from 'lbry-redux';
|
||||
import RelatedContent from './view';
|
||||
|
||||
const select = (state, props) => ({
|
||||
claim: makeSelectClaimForUri(props.uri)(state),
|
||||
recommendedContent: makeSelectRecommendedContentForUri(props.uri)(state),
|
||||
title: makeSelectTitleForUri(props.uri)(state),
|
||||
isSearching: selectIsSearching(state),
|
||||
recommendedContent: makeSelectRecommendedContentForUri(props.uri)(state),
|
||||
resolvingUris: selectResolvingUris(state),
|
||||
});
|
||||
|
||||
const perform = dispatch => ({
|
||||
resolveUris: uris => dispatch(doResolveUris(uris)),
|
||||
searchRecommended: query => dispatch(doSearch(query, 20, undefined, true, false)),
|
||||
});
|
||||
|
||||
export default connect(
|
||||
select,
|
||||
perform
|
||||
perform,
|
||||
)(RelatedContent);
|
||||
@@ -9,26 +9,53 @@ import relatedContentStyle from 'styles/relatedContent';
|
||||
|
||||
export default class RelatedContent extends React.PureComponent {
|
||||
state = {
|
||||
urlsResolved: false,
|
||||
resolveStarted: false,
|
||||
};
|
||||
|
||||
componentDidUpdate(prevProps) {
|
||||
const { resolveUris, recommendedContent } = this.props;
|
||||
componentDidMount() {
|
||||
const { title, searchRecommended } = this.props;
|
||||
if (title) {
|
||||
searchRecommended(title);
|
||||
}
|
||||
}
|
||||
|
||||
if (recommendedContent && recommendedContent.length > 0 && !this.state.urisResolved) {
|
||||
this.setState({ urisResolved: true }, () => {
|
||||
// batch resolve the uris
|
||||
resolveUris(recommendedContent);
|
||||
shouldComponentUpdate(nextProps, nextState) {
|
||||
const { isSearching, recommendedContent } = nextProps;
|
||||
return isSearching || (!isSearching && this.allContentResolved());
|
||||
}
|
||||
|
||||
allContentResolved() {
|
||||
const { recommendedContent, resolvingUris } = this.props;
|
||||
if (recommendedContent) {
|
||||
let allResolved = true;
|
||||
recommendedContent.forEach(uri => {
|
||||
allResolved = allResolved && !resolvingUris.includes(uri);
|
||||
});
|
||||
return allResolved;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
componentDidUpdate() {
|
||||
const { isSearching, resolveUris, recommendedContent } = this.props;
|
||||
if (!isSearching && !this.state.resolveStarted) {
|
||||
this.setState({ resolveStarted: true }, () => {
|
||||
if (recommendedContent && recommendedContent.length > 0) {
|
||||
// batch resolve the uris
|
||||
resolveUris(recommendedContent);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
const { recommendedContent, navigation, uri, fullUri } = this.props;
|
||||
const { isSearching, recommendedContent, navigation, uri, fullUri } = this.props;
|
||||
|
||||
return (
|
||||
<View style={relatedContentStyle.container}>
|
||||
<Text style={relatedContentStyle.title}>Related Content</Text>
|
||||
<Text style={relatedContentStyle.title}>{__('Related Content')}</Text>
|
||||
{isSearching && <ActivityIndicator size={'small'} color={Colors.NextLbryGreen} />}
|
||||
{recommendedContent &&
|
||||
recommendedContent
|
||||
.filter(recommendedUri => recommendedUri !== normalizeURI(fullUri))
|
||||
|
||||
@@ -35,7 +35,10 @@ class RewardEnrolment extends React.Component {
|
||||
<View style={rewardStyle.enrollContainer}>
|
||||
<View style={rewardStyle.summaryRow}>
|
||||
<Icon name="award" size={36} color={Colors.White} />
|
||||
<Text style={rewardStyle.summaryText}>{unclaimedRewardAmount} available credits</Text>
|
||||
<Text style={rewardStyle.summaryText}>
|
||||
{unclaimedRewardAmount === 1 && __('%amount% available credit', { amount: unclaimedRewardAmount })}
|
||||
{unclaimedRewardAmount !== 1 && __('%amount% available credits', { amount: unclaimedRewardAmount })}
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
<View style={rewardStyle.onboarding}>
|
||||
|
||||
@@ -75,10 +75,10 @@ class StorageStatsCard extends React.PureComponent {
|
||||
<View style={[storageStatsStyle.row, storageStatsStyle.totalSizeContainer]}>
|
||||
<View style={storageStatsStyle.summary}>
|
||||
<Text style={storageStatsStyle.totalSize}>{formatBytes(this.state.totalBytes, 2)}</Text>
|
||||
<Text style={storageStatsStyle.annotation}>used</Text>
|
||||
<Text style={storageStatsStyle.annotation}>{__('used')}</Text>
|
||||
</View>
|
||||
<View style={[storageStatsStyle.row, storageStatsStyle.toggleStatsContainer]}>
|
||||
<Text style={storageStatsStyle.statsText}>Stats</Text>
|
||||
<Text style={storageStatsStyle.statsText}>{__('Stats')}</Text>
|
||||
<Switch
|
||||
style={storageStatsStyle.statsToggle}
|
||||
value={this.state.showStats}
|
||||
|
||||
@@ -74,7 +74,7 @@ export default class TagSearch extends React.PureComponent {
|
||||
<TextInput
|
||||
editable={editable}
|
||||
style={tagStyle.searchInput}
|
||||
placeholder={'Search for more tags'}
|
||||
placeholder={__('Search for more tags')}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
value={this.state.tag}
|
||||
numberOfLines={1}
|
||||
|
||||
@@ -26,7 +26,7 @@ class TransactionListRecent extends React.PureComponent<Props> {
|
||||
return (
|
||||
<View style={walletStyle.transactionsCard}>
|
||||
<View style={[walletStyle.row, walletStyle.transactionsHeader]}>
|
||||
<Text style={walletStyle.transactionsTitle}>Recent Transactions</Text>
|
||||
<Text style={walletStyle.transactionsTitle}>{__('Recent Transactions')}</Text>
|
||||
<Link style={walletStyle.link} navigation={navigation} text={__('View All')} href={'#TransactionHistory'} />
|
||||
</View>
|
||||
{fetchingTransactions && <Text style={walletStyle.infoText}>{__('Fetching transactions...')}</Text>}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import { connect } from 'react-redux';
|
||||
import { selectUnclaimedRewardValue } from 'lbryinc';
|
||||
import { selectUnclaimedRewardValue, selectUser } from 'lbryinc';
|
||||
import WalletRewardsDriver from './view';
|
||||
|
||||
const select = state => ({
|
||||
unclaimedRewardAmount: selectUnclaimedRewardValue(state),
|
||||
user: selectUser(state),
|
||||
});
|
||||
|
||||
export default connect(select)(WalletRewardsDriver);
|
||||
@@ -5,15 +5,31 @@ import walletStyle from 'styles/wallet';
|
||||
|
||||
class WalletRewardsDriver extends React.PureComponent<Props> {
|
||||
render() {
|
||||
const { navigation, unclaimedRewardAmount } = this.props;
|
||||
const { navigation, unclaimedRewardAmount, user } = this.props;
|
||||
const signedIn = user && user.has_verified_email;
|
||||
|
||||
return (
|
||||
<TouchableOpacity style={walletStyle.rewardDriverCard} onPress={() => navigation.navigate('Rewards')}>
|
||||
<Icon name="award" size={16} style={walletStyle.rewardIcon} />
|
||||
<Text style={walletStyle.rewardDriverText}>
|
||||
Get {unclaimedRewardAmount > 0 ? unclaimedRewardAmount : ''} free credit
|
||||
{unclaimedRewardAmount === 1 ? '' : 's'} after creating an account.
|
||||
</Text>
|
||||
{signedIn && (
|
||||
<Text style={walletStyle.rewardDriverText}>
|
||||
{unclaimedRewardAmount === 0 && __('Free credits available in rewards.')}
|
||||
{unclaimedRewardAmount === 1 &&
|
||||
__('%amount% free credit available in rewards.', { amount: unclaimedRewardAmount })}
|
||||
{unclaimedRewardAmount > 1 &&
|
||||
__('%amount% free credits available in rewards.', { amount: unclaimedRewardAmount })}{' '}
|
||||
{__('Tap to learn more.')}
|
||||
</Text>
|
||||
)}
|
||||
|
||||
{!signedIn && (
|
||||
<Text style={walletStyle.rewardDriverText}>
|
||||
{unclaimedRewardAmount === 1 &&
|
||||
__('Get %amount% free credit after creating an account.', { amount: unclaimedRewardAmount })}
|
||||
{unclaimedRewardAmount !== 1 &&
|
||||
__('Get %amount% free credits after creating an account.', { amount: unclaimedRewardAmount })}
|
||||
</Text>
|
||||
)}
|
||||
</TouchableOpacity>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
// @flow
|
||||
import React from 'react';
|
||||
import { regexAddress } from 'lbry-redux';
|
||||
import { formatCredits, regexAddress } from 'lbry-redux';
|
||||
import { Alert, Clipboard, TextInput, Text, View } from 'react-native';
|
||||
import Button from 'component/button';
|
||||
import Colors from 'styles/colors';
|
||||
import Icon from 'react-native-vector-icons/FontAwesome5';
|
||||
import walletStyle from 'styles/wallet';
|
||||
|
||||
type DraftTransaction = {
|
||||
@@ -24,6 +25,7 @@ class WalletSend extends React.PureComponent<Props> {
|
||||
address: null,
|
||||
addressChanged: false,
|
||||
addressValid: false,
|
||||
creditsInputFocused: false,
|
||||
};
|
||||
|
||||
componentWillUpdate(nextProps) {
|
||||
@@ -118,6 +120,8 @@ class WalletSend extends React.PureComponent<Props> {
|
||||
<TextInput
|
||||
ref={ref => (this.amountInput = ref)}
|
||||
onChangeText={value => this.setState({ amount: value })}
|
||||
onFocus={() => this.setState({ creditsInputFocused: true })}
|
||||
onBlur={() => this.setState({ creditsInputFocused: false })}
|
||||
keyboardType={'numeric'}
|
||||
placeholder={'0'}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
@@ -125,9 +129,15 @@ class WalletSend extends React.PureComponent<Props> {
|
||||
style={[walletStyle.input, walletStyle.amountInput]}
|
||||
/>
|
||||
<Text style={[walletStyle.text, walletStyle.currency]}>LBC</Text>
|
||||
<View style={walletStyle.balanceFocus}>
|
||||
{this.state.creditsInputFocused && <Icon name="coins" size={12} />}
|
||||
{this.state.creditsInputFocused && (
|
||||
<Text style={walletStyle.balanceText}>{formatCredits(parseFloat(balance), 1, true)}</Text>
|
||||
)}
|
||||
</View>
|
||||
</View>
|
||||
<Button
|
||||
text={'Send'}
|
||||
text={__('Send')}
|
||||
style={[walletStyle.button, walletStyle.sendButton]}
|
||||
disabled={!canSend}
|
||||
onPress={this.handleSend}
|
||||
|
||||
@@ -29,14 +29,12 @@ class WalletSignIn extends React.Component {
|
||||
return (
|
||||
<View style={walletStyle.signInContainer}>
|
||||
<View style={walletStyle.signInSummaryRow}>
|
||||
<Text style={walletStyle.signInTitle}>Account Recommended</Text>
|
||||
<Text style={walletStyle.signInTitle}>{__('Account Recommended')}</Text>
|
||||
</View>
|
||||
|
||||
<View style={walletStyle.onboarding}>
|
||||
<Text style={walletStyle.onboardingText}>
|
||||
{__(
|
||||
'An account with LBRY Inc. allows you to earn rewards, backup your wallet, and keep everything synced.'
|
||||
)}
|
||||
{__('A lbry.tv account allows you to earn rewards, backup your wallet, and keep everything in sync.')}
|
||||
{'\n\n'}
|
||||
{__('Without an account, you assume all responsibility for securing your wallet and LBRY data.')}
|
||||
</Text>
|
||||
|
||||
+6
-1
@@ -95,6 +95,7 @@ const Constants = {
|
||||
FULL_ROUTE_NAME_WALLET: 'WalletStack',
|
||||
|
||||
ROUTE_FILE: 'File',
|
||||
DRAWER_ROUTE_FILE_VIEW: 'FileView',
|
||||
|
||||
ITEM_CREATE_A_CHANNEL: 'Create a channel...',
|
||||
ITEM_ANONYMOUS: 'Publish anonymously',
|
||||
@@ -167,4 +168,8 @@ export const DrawerRoutes = [
|
||||
];
|
||||
|
||||
// sub-pages for main routes
|
||||
export const InnerDrawerRoutes = [Constants.DRAWER_ROUTE_CHANNEL_CREATOR_FORM, Constants.DRAWER_ROUTE_PUBLISH_FORM];
|
||||
export const InnerDrawerRoutes = [
|
||||
Constants.DRAWER_ROUTE_CHANNEL_CREATOR_FORM,
|
||||
Constants.DRAWER_ROUTE_PUBLISH_FORM,
|
||||
Constants.DRAWER_ROUTE_FILE_VIEW,
|
||||
];
|
||||
+4
-3
@@ -52,8 +52,9 @@ function checkMessageAndSave(message, messagesFilePath) {
|
||||
); */
|
||||
})
|
||||
.catch(err => {
|
||||
if (err) {
|
||||
throw err;
|
||||
if (err && !isProduction) {
|
||||
// only do this when not in production
|
||||
console.error(err);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -74,6 +75,6 @@ export function __(message, tokens) {
|
||||
}
|
||||
|
||||
return translatedMessage.replace(/%([^%]+)%/g, function($1, $2) {
|
||||
return tokens[$2] || $2;
|
||||
return tokens.hasOwnProperty($2) ? tokens[$2] : $2;
|
||||
});
|
||||
}
|
||||
+3
-1
@@ -27,6 +27,7 @@ import {
|
||||
homepageReducer,
|
||||
rewardsReducer,
|
||||
selectUserVerifiedEmail,
|
||||
statsReducer,
|
||||
subscriptionsReducer,
|
||||
syncReducer,
|
||||
userReducer,
|
||||
@@ -56,7 +57,7 @@ window.__ = __;
|
||||
|
||||
const globalExceptionHandler = (error, isFatal) => {
|
||||
if (error && NativeModules.Firebase) {
|
||||
NativeModules.Firebase.logException(isFatal, error.message ? error.message : 'No message', JSON.stringify(error));
|
||||
NativeModules.Firebase.logException(!!isFatal, error.message ? error.message : 'No message', JSON.stringify(error));
|
||||
}
|
||||
};
|
||||
setJSExceptionHandler(globalExceptionHandler, true);
|
||||
@@ -140,6 +141,7 @@ const reducers = persistCombineReducers(persistOptions, {
|
||||
rewards: rewardsReducer,
|
||||
settings: settingsReducer,
|
||||
search: searchReducer,
|
||||
stats: statsReducer,
|
||||
subscriptions: subscriptionsReducer,
|
||||
sync: syncReducer,
|
||||
tags: tagsReducer,
|
||||
|
||||
@@ -74,7 +74,7 @@ class AboutPage extends React.PureComponent {
|
||||
<View style={aboutStyle.container}>
|
||||
<PageHeader title={'About LBRY'} onBackPressed={() => navigateBack(navigation, drawerStack, popDrawerStack)} />
|
||||
<ScrollView style={aboutStyle.scrollContainer}>
|
||||
<Text style={aboutStyle.title}>Content Freedom</Text>
|
||||
<Text style={aboutStyle.title}>{__('Content Freedom')}</Text>
|
||||
<Text style={aboutStyle.paragraph}>
|
||||
{__(
|
||||
'LBRY is a free, open, and community-run digital marketplace. It is a decentralized peer-to-peer content distribution platform for creators to upload and share content, and earn LBRY credits for their effort. Users will be able to find a wide selection of videos, music, ebooks and other digital content they are interested in.'
|
||||
@@ -85,7 +85,7 @@ class AboutPage extends React.PureComponent {
|
||||
<Link style={aboutStyle.link} href="https://lbry.com/faq/android-basics" text={__('Android App Basics')} />
|
||||
<Link style={aboutStyle.link} href="https://lbry.com/faq" text={__('Frequently Asked Questions')} />
|
||||
</View>
|
||||
<Text style={aboutStyle.socialTitle}>Get Social</Text>
|
||||
<Text style={aboutStyle.socialTitle}>{__('Get Social')}</Text>
|
||||
<Text style={aboutStyle.paragraph}>
|
||||
{__(
|
||||
'You can interact with the LBRY team and members of the community on Discord, Facebook, Instagram, Twitter or Reddit.'
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { connect } from 'react-redux';
|
||||
import { doAbandonClaim, doFetchChannelListMine, makeSelectClaimForUri, selectMyChannelClaims } from 'lbry-redux';
|
||||
import { doFetchSubCount, makeSelectSubCountForUri } from 'lbryinc';
|
||||
import { doPopDrawerStack } from 'redux/actions/drawer';
|
||||
import { doSetSortByItem, doSetTimeItem } from 'redux/actions/settings';
|
||||
import { selectDrawerStack } from 'redux/selectors/drawer';
|
||||
@@ -11,12 +12,14 @@ const select = (state, props) => ({
|
||||
claim: makeSelectClaimForUri(props.uri)(state),
|
||||
drawerStack: selectDrawerStack(state),
|
||||
sortByItem: selectSortByItem(state),
|
||||
subCount: makeSelectSubCountForUri(props.uri)(state),
|
||||
timeItem: selectTimeItem(state),
|
||||
});
|
||||
|
||||
const perform = dispatch => ({
|
||||
abandonClaim: (txid, nout) => dispatch(doAbandonClaim(txid, nout)),
|
||||
fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
|
||||
fetchSubCount: claimId => dispatch(doFetchSubCount(claimId)),
|
||||
popDrawerStack: () => dispatch(doPopDrawerStack()),
|
||||
setSortByItem: item => dispatch(doSetSortByItem(item)),
|
||||
setTimeItem: item => dispatch(doSetTimeItem(item)),
|
||||
|
||||
+44
-15
@@ -23,6 +23,7 @@ import EmptyStateView from 'component/emptyStateView';
|
||||
import Icon from 'react-native-vector-icons/FontAwesome5';
|
||||
import Link from 'component/link';
|
||||
import ModalPicker from 'component/modalPicker';
|
||||
import ModalTipView from 'component/modalTipView';
|
||||
import PageHeader from 'component/pageHeader';
|
||||
import SubscribeButton from 'component/subscribeButton';
|
||||
import SubscribeNotificationButton from 'component/subscribeNotificationButton';
|
||||
@@ -36,8 +37,10 @@ class ChannelPage extends React.PureComponent {
|
||||
autoStyle: null,
|
||||
showSortPicker: false,
|
||||
showTimePicker: false,
|
||||
showTipView: false,
|
||||
orderBy: ['release_time'], // sort by new by default
|
||||
activeTab: Constants.CONTENT_TAB,
|
||||
currentSortByItem: Constants.CLAIM_SEARCH_SORT_BY_ITEMS[1], // should always default to sorting channel pages by new
|
||||
};
|
||||
|
||||
componentWillMount() {
|
||||
@@ -48,16 +51,17 @@ class ChannelPage extends React.PureComponent {
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
const { fetchChannelListMine, setSortByItem } = this.props;
|
||||
const { claim, fetchChannelListMine, fetchSubCount } = this.props;
|
||||
NativeModules.Firebase.setCurrentScreen('Channel');
|
||||
setSortByItem(Constants.CLAIM_SEARCH_SORT_BY_ITEMS[1]); // sort by newest first
|
||||
fetchChannelListMine();
|
||||
if (claim) {
|
||||
fetchSubCount(claim.claim_id);
|
||||
}
|
||||
}
|
||||
|
||||
handleSortByItemSelected = item => {
|
||||
const { setSortByItem } = this.props;
|
||||
setSortByItem(item);
|
||||
this.setState({ orderBy: getOrderBy(item), showSortPicker: false });
|
||||
// sort by specific only to this component state
|
||||
this.setState({ currentSortByItem: item, orderBy: getOrderBy(item), showSortPicker: false });
|
||||
};
|
||||
|
||||
handleTimeItemSelected = item => {
|
||||
@@ -67,17 +71,18 @@ class ChannelPage extends React.PureComponent {
|
||||
};
|
||||
|
||||
listHeader = () => {
|
||||
const { sortByItem, timeItem } = this.props;
|
||||
const { timeItem } = this.props;
|
||||
const { currentSortByItem } = this.state;
|
||||
|
||||
return (
|
||||
<View style={channelPageStyle.listHeader}>
|
||||
<View style={discoverStyle.pickerRow}>
|
||||
<View style={discoverStyle.leftPickerRow}>
|
||||
<TouchableOpacity style={discoverStyle.tagSortBy} onPress={() => this.setState({ showSortPicker: true })}>
|
||||
<Text style={discoverStyle.tagSortText}>{__(sortByItem.label.split(' ')[0])}</Text>
|
||||
<Text style={discoverStyle.tagSortText}>{__(currentSortByItem.label.split(' ')[0])}</Text>
|
||||
<Icon style={discoverStyle.tagSortIcon} name={'sort-down'} size={14} />
|
||||
</TouchableOpacity>
|
||||
{Constants.SORT_BY_TOP === sortByItem.name && (
|
||||
{Constants.SORT_BY_TOP === currentSortByItem.name && (
|
||||
<TouchableOpacity style={discoverStyle.tagTime} onPress={() => this.setState({ showTimePicker: true })}>
|
||||
<Text style={discoverStyle.tagSortText}>{__(timeItem.label)}</Text>
|
||||
<Icon style={discoverStyle.tagSortIcon} name={'sort-down'} size={14} />
|
||||
@@ -173,6 +178,10 @@ class ChannelPage extends React.PureComponent {
|
||||
}
|
||||
};
|
||||
|
||||
onTipPressed = () => {
|
||||
this.setState({ showTipView: true });
|
||||
};
|
||||
|
||||
onSharePressed = () => {
|
||||
const { claim } = this.props;
|
||||
if (claim) {
|
||||
@@ -207,9 +216,9 @@ class ChannelPage extends React.PureComponent {
|
||||
};
|
||||
|
||||
render() {
|
||||
const { channels, claim, navigation, uri, drawerStack, popDrawerStack, sortByItem, timeItem } = this.props;
|
||||
const { channels, claim, navigation, uri, drawerStack, popDrawerStack, subCount, timeItem } = this.props;
|
||||
const { name, permanent_url: permanentUrl } = claim;
|
||||
const { autoStyle, showSortPicker, showTimePicker } = this.state;
|
||||
const { autoStyle, currentSortByItem, showSortPicker, showTimePicker, showTipView } = this.state;
|
||||
const ownedChannel = channels ? channels.map(channel => channel.permanent_url).includes(permanentUrl) : false;
|
||||
|
||||
let thumbnailUrl,
|
||||
@@ -252,6 +261,10 @@ class ChannelPage extends React.PureComponent {
|
||||
|
||||
<View style={channelPageStyle.channelHeader}>
|
||||
<Text style={channelPageStyle.channelName}>{title && title.trim().length > 0 ? title : name}</Text>
|
||||
<Text style={[channelPageStyle.followerCount, subCount >= 1 ? channelPageStyle.followerCountBg : null]}>
|
||||
{subCount === 1 && __('%follower% follower', { follower: subCount })}
|
||||
{subCount > 1 && __('%follower% followers', { follower: subCount })}
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
<View style={[channelPageStyle.avatarImageContainer, autoStyle]}>
|
||||
@@ -271,7 +284,7 @@ class ChannelPage extends React.PureComponent {
|
||||
style={channelPageStyle.actionButton}
|
||||
theme={'light'}
|
||||
icon={'edit'}
|
||||
text={'Edit'}
|
||||
text={__('Edit')}
|
||||
onPress={this.onEditPressed}
|
||||
/>
|
||||
)}
|
||||
@@ -280,7 +293,7 @@ class ChannelPage extends React.PureComponent {
|
||||
style={[channelPageStyle.actionButton, channelPageStyle.deleteButton]}
|
||||
theme={'light'}
|
||||
icon={'trash-alt'}
|
||||
text={'Delete'}
|
||||
text={__('Delete')}
|
||||
onPress={this.onDeletePressed}
|
||||
/>
|
||||
)}
|
||||
@@ -290,6 +303,12 @@ class ChannelPage extends React.PureComponent {
|
||||
icon={'share-alt'}
|
||||
onPress={this.onSharePressed}
|
||||
/>
|
||||
<Button
|
||||
style={[channelPageStyle.actionButton, channelPageStyle.tipButton]}
|
||||
theme={'light'}
|
||||
icon={'gift'}
|
||||
onPress={this.onTipPressed}
|
||||
/>
|
||||
{!ownedChannel && <SubscribeButton style={channelPageStyle.subscribeButton} uri={fullUri} name={name} />}
|
||||
{false && !ownedChannel && (
|
||||
<SubscribeNotificationButton
|
||||
@@ -306,14 +325,14 @@ class ChannelPage extends React.PureComponent {
|
||||
style={channelPageStyle.tab}
|
||||
onPress={() => this.setState({ activeTab: Constants.CONTENT_TAB })}
|
||||
>
|
||||
<Text style={channelPageStyle.tabTitle}>CONTENT</Text>
|
||||
<Text style={channelPageStyle.tabTitle}>{__('CONTENT')}</Text>
|
||||
{Constants.CONTENT_TAB === this.state.activeTab && <View style={channelPageStyle.activeTabHint} />}
|
||||
</TouchableOpacity>
|
||||
<TouchableOpacity
|
||||
style={channelPageStyle.tab}
|
||||
onPress={() => this.setState({ activeTab: Constants.ABOUT_TAB })}
|
||||
>
|
||||
<Text style={channelPageStyle.tabTitle}>ABOUT</Text>
|
||||
<Text style={channelPageStyle.tabTitle}>{__('ABOUT')}</Text>
|
||||
{Constants.ABOUT_TAB === this.state.activeTab && <View style={channelPageStyle.activeTabHint} />}
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
@@ -327,7 +346,7 @@ class ChannelPage extends React.PureComponent {
|
||||
title={__('Sort content by')}
|
||||
onOverlayPress={() => this.setState({ showSortPicker: false })}
|
||||
onItemSelected={this.handleSortByItemSelected}
|
||||
selectedItem={sortByItem}
|
||||
selectedItem={currentSortByItem}
|
||||
items={Constants.CLAIM_SEARCH_SORT_BY_ITEMS}
|
||||
/>
|
||||
)}
|
||||
@@ -340,6 +359,16 @@ class ChannelPage extends React.PureComponent {
|
||||
items={Constants.CLAIM_SEARCH_TIME_ITEMS}
|
||||
/>
|
||||
)}
|
||||
{showTipView && (
|
||||
<ModalTipView
|
||||
claim={claim}
|
||||
channelName={claim.name}
|
||||
contentName={title}
|
||||
onCancelPress={() => this.setState({ showTipView: false })}
|
||||
onOverlayPress={() => this.setState({ showTipView: false })}
|
||||
onSendTipSuccessful={() => this.setState({ showTipView: false })}
|
||||
/>
|
||||
)}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import React from 'react';
|
||||
import { CLAIM_VALUES, isNameValid, regexInvalidURI } from 'lbry-redux';
|
||||
import { CLAIM_VALUES, formatCredits, isNameValid, regexInvalidURI } from 'lbry-redux';
|
||||
import {
|
||||
ActivityIndicator,
|
||||
Alert,
|
||||
@@ -38,6 +38,7 @@ export default class ChannelCreator extends React.PureComponent {
|
||||
autoStyle: null,
|
||||
canSave: true,
|
||||
claimId: null,
|
||||
creditsInputFocused: false,
|
||||
currentSelectedValue: Constants.ITEM_ANONYMOUS,
|
||||
currentPhase: null,
|
||||
displayName: null,
|
||||
@@ -960,11 +961,19 @@ export default class ChannelCreator extends React.PureComponent {
|
||||
style={channelCreatorStyle.bidAmountInput}
|
||||
value={String(newChannelBid)}
|
||||
onChangeText={this.handleNewChannelBidChange}
|
||||
onFocus={() => this.setState({ creditsInputFocused: true })}
|
||||
onBlur={() => this.setState({ creditsInputFocused: false })}
|
||||
placeholder={'0.00'}
|
||||
keyboardType={'number-pad'}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
/>
|
||||
<Text style={channelCreatorStyle.currency}>LBC</Text>
|
||||
<View style={channelCreatorStyle.balance}>
|
||||
{this.state.creditsInputFocused && <Icon name="coins" size={12} />}
|
||||
{this.state.creditsInputFocused && (
|
||||
<Text style={channelCreatorStyle.balanceText}>{formatCredits(parseFloat(balance), 1, true)}</Text>
|
||||
)}
|
||||
</View>
|
||||
</View>
|
||||
<Text style={channelCreatorStyle.helpText}>
|
||||
{__('This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.')}
|
||||
|
||||
@@ -86,11 +86,9 @@ class DiscoverPage extends React.PureComponent {
|
||||
}
|
||||
|
||||
onComponentFocused = () => {
|
||||
const { fetchSubscriptions, pushDrawerStack } = this.props;
|
||||
const { pushDrawerStack } = this.props;
|
||||
// pushDrawerStack();
|
||||
NativeModules.Firebase.setCurrentScreen('Your tags').then(result => {
|
||||
fetchSubscriptions();
|
||||
});
|
||||
NativeModules.Firebase.setCurrentScreen('Your tags');
|
||||
};
|
||||
|
||||
handleSortByItemSelected = item => {
|
||||
@@ -123,46 +121,6 @@ class DiscoverPage extends React.PureComponent {
|
||||
return null;
|
||||
};
|
||||
|
||||
componentDidUpdate(prevProps, prevState) {
|
||||
const { unreadSubscriptions, enabledChannelNotifications } = this.props;
|
||||
|
||||
const utility = NativeModules.UtilityModule;
|
||||
const hasUnread =
|
||||
prevProps.unreadSubscriptions &&
|
||||
prevProps.unreadSubscriptions.length !== unreadSubscriptions.length &&
|
||||
unreadSubscriptions.length > 0;
|
||||
|
||||
if (hasUnread) {
|
||||
unreadSubscriptions.map(({ channel, uris }) => {
|
||||
const { claimName: channelName } = parseURI(channel);
|
||||
|
||||
// check if notifications are enabled for the channel
|
||||
if (enabledChannelNotifications.includes(channelName)) {
|
||||
uris.forEach(uri => {
|
||||
Lbry.resolve({ urls: uri }).then(result => {
|
||||
const sub = result[uri];
|
||||
|
||||
if (sub && sub.value) {
|
||||
const { source, title, thumbnail } = sub.value;
|
||||
const isPlayable =
|
||||
source && source.media_type && ['audio', 'video'].includes(source.media_type.substring(0, 5));
|
||||
if (title) {
|
||||
utility.showNotificationForContent(
|
||||
uri,
|
||||
title,
|
||||
channelName,
|
||||
thumbnail ? thumbnail.url : null,
|
||||
isPlayable
|
||||
);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
showRatingReminder = () => {
|
||||
const { ratingReminderDisabled, ratingReminderLastShown, setClientSetting } = this.props;
|
||||
|
||||
|
||||
+10
-16
@@ -8,7 +8,7 @@ import {
|
||||
doPurchaseUri,
|
||||
doDeletePurchasedUri,
|
||||
doResolveUri,
|
||||
doSearch,
|
||||
doResolveUris,
|
||||
doSendTip,
|
||||
doToast,
|
||||
makeSelectIsUriResolving,
|
||||
@@ -18,7 +18,6 @@ import {
|
||||
makeSelectContentPositionForUri,
|
||||
makeSelectContentTypeForUri,
|
||||
makeSelectMetadataForUri,
|
||||
makeSelectRecommendedContentForUri,
|
||||
makeSelectStreamingUrlForUri,
|
||||
makeSelectThumbnailForUri,
|
||||
makeSelectTitleForUri,
|
||||
@@ -33,18 +32,14 @@ import {
|
||||
import {
|
||||
doClaimEligiblePurchaseRewards,
|
||||
doFetchCostInfoForUri,
|
||||
doFetchViewCount,
|
||||
makeSelectCostInfoForUri,
|
||||
makeSelectViewCountForUri,
|
||||
selectRewardContentClaimIds,
|
||||
selectBlackListedOutpoints,
|
||||
} from 'lbryinc';
|
||||
import {
|
||||
doStartDownload,
|
||||
doUpdateDownload,
|
||||
doCompleteDownload,
|
||||
doDeleteFile,
|
||||
doStopDownloadingFile,
|
||||
} from 'redux/actions/file';
|
||||
import { doPopDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
|
||||
import { doDeleteFile, doStopDownloadingFile } from 'redux/actions/file';
|
||||
import { doPushDrawerStack, doPopDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
|
||||
import { doToggleFullscreenMode } from 'redux/actions/settings';
|
||||
import { selectDrawerStack } from 'redux/selectors/drawer';
|
||||
import FilePage from './view';
|
||||
@@ -74,8 +69,8 @@ const select = (state, props) => {
|
||||
streamingUrl: makeSelectStreamingUrlForUri(contentUri)(state),
|
||||
thumbnail: makeSelectThumbnailForUri(contentUri)(state),
|
||||
title: makeSelectTitleForUri(contentUri)(state),
|
||||
recommendedContent: makeSelectRecommendedContentForUri(contentUri)(state),
|
||||
isSearchingRecommendContent: selectIsSearching(state),
|
||||
viewCount: makeSelectViewCountForUri(contentUri)(state),
|
||||
};
|
||||
};
|
||||
|
||||
@@ -89,24 +84,23 @@ const perform = dispatch => ({
|
||||
fetchCostInfo: uri => dispatch(doFetchCostInfoForUri(uri)),
|
||||
fetchMyClaims: () => dispatch(doFetchClaimListMine()),
|
||||
fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
|
||||
fetchViewCount: claimId => dispatch(doFetchViewCount(claimId)),
|
||||
fileGet: (uri, saveFile) => dispatch(doFileGet(uri, saveFile)),
|
||||
notify: data => dispatch(doToast(data)),
|
||||
popDrawerStack: () => dispatch(doPopDrawerStack()),
|
||||
pushDrawerStack: (routeName, params) => dispatch(doPushDrawerStack(routeName, params)),
|
||||
purchaseUri: (uri, costInfo, saveFile) => dispatch(doPurchaseUri(uri, costInfo, saveFile)),
|
||||
deletePurchasedUri: uri => dispatch(doDeletePurchasedUri(uri)),
|
||||
resolveUri: uri => dispatch(doResolveUri(uri)),
|
||||
searchRecommended: query => dispatch(doSearch(query, 20, undefined, true)),
|
||||
resolveUris: uris => dispatch(doResolveUris(uris)),
|
||||
sendTip: (amount, claimId, isSupport, successCallback, errorCallback) =>
|
||||
dispatch(doSendTip(amount, claimId, isSupport, successCallback, errorCallback)),
|
||||
setPlayerVisible: () => dispatch(doSetPlayerVisible(true)),
|
||||
stopDownload: (uri, fileInfo) => dispatch(doStopDownloadingFile(uri, fileInfo)),
|
||||
startDownload: (uri, outpoint, fileInfo) => dispatch(doStartDownload(uri, outpoint, fileInfo)),
|
||||
updateDownload: (uri, outpoint, fileInfo, progress) => dispatch(doUpdateDownload(uri, outpoint, fileInfo, progress)),
|
||||
completeDownload: (uri, outpoint, fileInfo) => dispatch(doCompleteDownload(uri, outpoint, fileInfo)),
|
||||
toggleFullscreenMode: mode => dispatch(doToggleFullscreenMode(mode)),
|
||||
});
|
||||
|
||||
export default connect(
|
||||
select,
|
||||
perform
|
||||
perform,
|
||||
)(FilePage);
|
||||
+490
-444
File diff suppressed because it is too large.
Load diff
@@ -8,6 +8,7 @@ import {
|
||||
doUserEmailNew,
|
||||
doUserResendVerificationEmail,
|
||||
selectAuthToken,
|
||||
selectEmailAlreadyExists,
|
||||
selectEmailNewErrorMessage,
|
||||
selectEmailNewIsPending,
|
||||
selectEmailToVerify,
|
||||
@@ -28,6 +29,7 @@ const select = state => ({
|
||||
authenticating: selectAuthenticationIsPending(state),
|
||||
authToken: selectAuthToken(state),
|
||||
emailToVerify: selectEmailToVerify(state),
|
||||
emailAlreadyExists: selectEmailAlreadyExists(state),
|
||||
emailNewErrorMessage: selectEmailNewErrorMessage(state),
|
||||
emailNewPending: selectEmailNewIsPending(state),
|
||||
hasSyncedWallet: selectHasSyncedWallet(state),
|
||||
|
||||
@@ -64,7 +64,7 @@ class EmailCollectPage extends React.PureComponent {
|
||||
}}
|
||||
/>
|
||||
<Text style={firstRunStyle.paragraph}>
|
||||
{__('An account will allow you to earn rewards and keep your account and settings synced.')}
|
||||
{__('A lbry.tv account allows you to earn rewards, backup your wallet, and keep everything in sync.')}
|
||||
</Text>
|
||||
<Text style={firstRunStyle.infoParagraph}>
|
||||
{__('This information is disclosed only to LBRY, Inc. and not to the LBRY network.')}
|
||||
|
||||
@@ -17,24 +17,26 @@ class EmailVerifyPage extends React.PureComponent {
|
||||
};
|
||||
|
||||
render() {
|
||||
const { onEmailViewLayout, email } = this.props;
|
||||
const { onEmailViewLayout, email, emailAlreadyExists } = this.props;
|
||||
|
||||
const content = (
|
||||
<View onLayout={() => onEmailViewLayout('verify')}>
|
||||
<Text style={firstRunStyle.title}>Verify Email</Text>
|
||||
<Text style={firstRunStyle.title}>{emailAlreadyExists ? __('Sign In') : __('Verify Email')}</Text>
|
||||
|
||||
<Text style={firstRunStyle.paragraph}>
|
||||
An email has been sent to{' '}
|
||||
<Text style={firstRunStyle.nowrap} numberOfLines={1}>
|
||||
{email}
|
||||
</Text>
|
||||
. Please follow the instructions in the message to verify your email address.
|
||||
{__('An email has been sent to')}
|
||||
{'\n\n'}
|
||||
{email}
|
||||
{'\n\n'}
|
||||
{emailAlreadyExists && __('Please click the link in the message to complete signing in')}
|
||||
{!emailAlreadyExists && __('Please click the link in the message to verify your email address')}.
|
||||
</Text>
|
||||
|
||||
<View style={firstRunStyle.buttonContainer}>
|
||||
<Button
|
||||
style={firstRunStyle.verificationButton}
|
||||
theme={'light'}
|
||||
text={'Resend'}
|
||||
text={__('Resend')}
|
||||
onPress={this.onResendPressed}
|
||||
/>
|
||||
</View>
|
||||
|
||||
@@ -113,7 +113,7 @@ class WalletPage extends React.PureComponent {
|
||||
// only display this view if it's not a new user (or auto-login has been attempted once)
|
||||
content = (
|
||||
<View onLayout={onWalletViewLayout}>
|
||||
<Text style={firstRunStyle.title}>Password</Text>
|
||||
<Text style={firstRunStyle.title}>{__('Password')}</Text>
|
||||
<Text style={firstRunStyle.paragraph}>
|
||||
{hasSyncedWallet
|
||||
? __('Please enter the password you used to secure your wallet.')
|
||||
@@ -146,15 +146,6 @@ class WalletPage extends React.PureComponent {
|
||||
<Icon name={this.state.revealPassword ? 'eye-slash' : 'eye'} size={16} style={firstRunStyle.revealIcon} />
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
{(!this.state.password || this.state.password.trim().length === 0) && (
|
||||
<View style={firstRunStyle.passwordWarning}>
|
||||
<Text style={firstRunStyle.passwordWarningText}>
|
||||
{hasSyncedWallet
|
||||
? __('If you did not provide a password, please press Use LBRY to continue.')
|
||||
: __('You can proceed without a password, but this is not recommended.')}
|
||||
</Text>
|
||||
</View>
|
||||
)}
|
||||
|
||||
{(!hasSyncedWallet && this.state.password && this.state.password.trim().length) > 0 && (
|
||||
<View style={firstRunStyle.passwordStrength}>
|
||||
|
||||
@@ -103,7 +103,7 @@ class WelcomePage extends React.PureComponent {
|
||||
} else {
|
||||
content = (
|
||||
<View onLayout={onWelcomePageLayout}>
|
||||
<Text style={firstRunStyle.title}>Welcome to LBRY.</Text>
|
||||
<Text style={firstRunStyle.title}>{__('Welcome to LBRY.')}</Text>
|
||||
<Text style={firstRunStyle.paragraph}>
|
||||
{__(
|
||||
'LBRY is a community-controlled content platform where you can find and publish videos, music, books, and more.'
|
||||
|
||||
@@ -28,6 +28,7 @@ class FirstRunScreen extends React.PureComponent {
|
||||
emailCollectTracked: false,
|
||||
emailSubmitted: false,
|
||||
enterPasswordTracked: false,
|
||||
autoLoginTried: false,
|
||||
isFirstRun: false,
|
||||
launchUrl: null,
|
||||
languageLoaded: false,
|
||||
@@ -38,7 +39,6 @@ class FirstRunScreen extends React.PureComponent {
|
||||
walletPassword: '',
|
||||
syncApplyStarted: false,
|
||||
syncApplyCompleted: false,
|
||||
language: null,
|
||||
};
|
||||
|
||||
componentDidMount() {
|
||||
@@ -126,8 +126,16 @@ class FirstRunScreen extends React.PureComponent {
|
||||
|
||||
if (this.state.syncApplyStarted && !syncApplyIsPending) {
|
||||
if (syncApplyErrorMessage && syncApplyErrorMessage.trim().length > 0) {
|
||||
notify({ message: __(syncApplyErrorMessage), isError: true });
|
||||
this.setState({ showBottomContainer: true, syncApplyStarted: false, syncApplyCompleted: false });
|
||||
if (this.state.autoLoginTried) {
|
||||
// don't show the error message for auto-login if it fails
|
||||
notify({ message: __(syncApplyErrorMessage), isError: true });
|
||||
}
|
||||
this.setState({
|
||||
autoLoginTried: true,
|
||||
showBottomContainer: true,
|
||||
syncApplyStarted: false,
|
||||
syncApplyCompleted: false,
|
||||
});
|
||||
} else {
|
||||
this.setState({ syncApplyCompleted: true });
|
||||
// password successfully verified
|
||||
@@ -220,7 +228,13 @@ class FirstRunScreen extends React.PureComponent {
|
||||
handleContinuePressed = () => {
|
||||
const { notify, user, hasSyncedWallet } = this.props;
|
||||
const pageIndex = FirstRunScreen.pages.indexOf(this.state.currentPage);
|
||||
if (Constants.FIRST_RUN_PAGE_WALLET === this.state.currentPage) {
|
||||
|
||||
if (Constants.FIRST_RUN_PAGE_WELCOME === this.state.currentPage) {
|
||||
// only show the welcome screen on first run
|
||||
this.closeFinalPage();
|
||||
}
|
||||
|
||||
/* if (Constants.FIRST_RUN_PAGE_WALLET === this.state.currentPage) {
|
||||
// do apply sync to check if the password is valid
|
||||
if (hasSyncedWallet) {
|
||||
this.checkWalletPassword();
|
||||
@@ -248,7 +262,7 @@ class FirstRunScreen extends React.PureComponent {
|
||||
} else {
|
||||
this.showNextPage();
|
||||
}
|
||||
}
|
||||
} */
|
||||
};
|
||||
|
||||
handleEmailCollectPageContinue() {
|
||||
@@ -301,7 +315,7 @@ class FirstRunScreen extends React.PureComponent {
|
||||
onEmailChanged = email => {
|
||||
this.setState({ email });
|
||||
if (Constants.FIRST_RUN_PAGE_EMAIL_COLLECT === this.state.currentPage) {
|
||||
this.setState({ showSkip: !email || email.trim().length === 0 });
|
||||
this.setState({ showSkip: !email || typeof email !== 'string' || email.trim().length === 0 });
|
||||
} else {
|
||||
this.setState({ showSkip: false });
|
||||
}
|
||||
@@ -379,6 +393,7 @@ class FirstRunScreen extends React.PureComponent {
|
||||
authenticating,
|
||||
authToken,
|
||||
checkSync,
|
||||
emailAlreadyExists,
|
||||
emailNewErrorMessage,
|
||||
emailNewPending,
|
||||
emailToVerify,
|
||||
@@ -420,6 +435,7 @@ class FirstRunScreen extends React.PureComponent {
|
||||
<EmailVerifyPage
|
||||
onEmailViewLayout={this.onEmailViewLayout}
|
||||
email={this.state.email}
|
||||
emailAlreadyExists={emailAlreadyExists}
|
||||
notify={notify}
|
||||
resendVerificationEmail={resendVerificationEmail}
|
||||
/>
|
||||
@@ -490,7 +506,12 @@ class FirstRunScreen extends React.PureComponent {
|
||||
{Constants.FIRST_RUN_PAGE_SKIP_ACCOUNT !== this.state.currentPage &&
|
||||
Constants.FIRST_RUN_PAGE_EMAIL_VERIFY !== this.state.currentPage && (
|
||||
<Text style={firstRunStyle.buttonText}>
|
||||
{Constants.FIRST_RUN_PAGE_WALLET === this.state.currentPage ? __('Use LBRY') : __('Continue')} »
|
||||
{[Constants.FIRST_RUN_PAGE_WALLET, Constants.FIRST_RUN_PAGE_WELCOME].includes(
|
||||
this.state.currentPage
|
||||
)
|
||||
? __('Use LBRY')
|
||||
: __('Continue')}{' '}
|
||||
»
|
||||
</Text>
|
||||
)}
|
||||
</TouchableOpacity>
|
||||
|
||||
@@ -19,6 +19,7 @@ import {
|
||||
isNameValid,
|
||||
batchActions,
|
||||
buildURI,
|
||||
formatCredits,
|
||||
normalizeURI,
|
||||
parseURI,
|
||||
regexInvalidURI,
|
||||
@@ -83,6 +84,7 @@ class PublishPage extends React.PureComponent {
|
||||
state = {
|
||||
canPublish: true,
|
||||
canUseCamera: false,
|
||||
creditsInputFocused: false,
|
||||
documentPickerOpen: false,
|
||||
editMode: false,
|
||||
titleFocused: false,
|
||||
@@ -1133,8 +1135,16 @@ class PublishPage extends React.PureComponent {
|
||||
keyboardType={'numeric'}
|
||||
value={String(this.state.bid)}
|
||||
onChangeText={this.handleBidChange}
|
||||
onFocus={() => this.setState({ creditsInputFocused: true })}
|
||||
onBlur={() => this.setState({ creditsInputFocused: false })}
|
||||
/>
|
||||
<Text style={publishStyle.currency}>LBC</Text>
|
||||
<View style={publishStyle.balance}>
|
||||
{this.state.creditsInputFocused && <Icon name="coins" size={12} />}
|
||||
{this.state.creditsInputFocused && (
|
||||
<Text style={publishStyle.balanceText}>{formatCredits(parseFloat(balance), 1, true)}</Text>
|
||||
)}
|
||||
</View>
|
||||
</View>
|
||||
<Text style={publishStyle.helpText}>
|
||||
{__('This LBC remains yours and the deposit can be undone at any time.')}
|
||||
|
||||
@@ -104,7 +104,7 @@ class RewardsPage extends React.PureComponent {
|
||||
if (this.state.isEmailVerified && this.state.isIdentityVerified && !this.state.isRewardApproved) {
|
||||
return (
|
||||
<View style={[rewardStyle.card, rewardStyle.verification]}>
|
||||
<Text style={rewardStyle.title}>Manual Reward Verification</Text>
|
||||
<Text style={rewardStyle.title}>{__('Manual Reward Verification')}</Text>
|
||||
<Text style={rewardStyle.text}>
|
||||
__('You need to be manually verified before you can start claiming rewards.') Please request to be verified
|
||||
on the{' '}
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
import { connect } from 'react-redux';
|
||||
import {
|
||||
doClaimSearch,
|
||||
doResolveUris,
|
||||
doSearch,
|
||||
doUpdateSearchQuery,
|
||||
makeSelectSearchUris,
|
||||
selectClaimSearchByQuery,
|
||||
selectIsSearching,
|
||||
selectResolvingUris,
|
||||
selectSearchValue,
|
||||
makeSelectQueryWithOptions,
|
||||
selectSearchUrisByQuery,
|
||||
} from 'lbry-redux';
|
||||
import { doPushDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
|
||||
import { selectCurrentRoute } from 'redux/selectors/drawer';
|
||||
@@ -22,19 +23,20 @@ const select = state => ({
|
||||
currentRoute: selectCurrentRoute(state),
|
||||
isSearching: selectIsSearching(state),
|
||||
query: selectSearchValue(state),
|
||||
resolvingUris: selectResolvingUris(state),
|
||||
uris: makeSelectSearchUris(makeSelectQueryWithOptions(null, numSearchResults)(state))(state),
|
||||
urisByQuery: selectSearchUrisByQuery(state),
|
||||
});
|
||||
|
||||
const perform = dispatch => ({
|
||||
search: query => dispatch(doSearch(query, numSearchResults)),
|
||||
search: query => dispatch(doSearch(query, numSearchResults, null, false, false)),
|
||||
claimSearch: options => dispatch(doClaimSearch(options)),
|
||||
updateSearchQuery: query => dispatch(doUpdateSearchQuery(query)),
|
||||
pushDrawerStack: () => dispatch(doPushDrawerStack(Constants.DRAWER_ROUTE_SEARCH)),
|
||||
resolveUris: uris => dispatch(doResolveUris(uris)),
|
||||
setPlayerVisible: () => dispatch(doSetPlayerVisible(false)),
|
||||
});
|
||||
|
||||
export default connect(
|
||||
select,
|
||||
perform
|
||||
perform,
|
||||
)(SearchPage);
|
||||
+57
-21
@@ -26,6 +26,7 @@ class SearchPage extends React.PureComponent {
|
||||
showTagResult: false,
|
||||
claimSearchRun: false,
|
||||
claimSearchOptions: null,
|
||||
resultsResolved: false,
|
||||
};
|
||||
|
||||
static navigationOptions = {
|
||||
@@ -58,6 +59,7 @@ class SearchPage extends React.PureComponent {
|
||||
claimSearchOptions: null,
|
||||
claimSearchRun: false,
|
||||
showTagResult: false,
|
||||
resultsResolved: false,
|
||||
});
|
||||
search(searchQuery);
|
||||
}
|
||||
@@ -80,11 +82,44 @@ class SearchPage extends React.PureComponent {
|
||||
this.setState({
|
||||
currentQuery: query,
|
||||
currentUri: isURIValid(query) ? normalizeURI(query) : null,
|
||||
resultsResolved: false,
|
||||
});
|
||||
search(query);
|
||||
}
|
||||
}
|
||||
|
||||
allContentResolved() {
|
||||
const { uris, resolvingUris } = this.props;
|
||||
if (!this.state.resultsResolved) {
|
||||
return false;
|
||||
}
|
||||
if (uris) {
|
||||
let allResolved = true;
|
||||
uris.forEach(uri => {
|
||||
allResolved = allResolved && !resolvingUris.includes(uri);
|
||||
});
|
||||
return allResolved;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
shouldComponentUpdate() {
|
||||
const { isSearching, uris } = this.props;
|
||||
return (isSearching && (!uris || uris.length === 0)) || (!isSearching && this.allContentResolved());
|
||||
}
|
||||
|
||||
componentDidUpdate() {
|
||||
const { isSearching, resolveUris, uris } = this.props;
|
||||
if (!isSearching && !this.state.resultsResolved) {
|
||||
this.setState({ resultsResolved: true }, () => {
|
||||
if (uris && uris.length > 0) {
|
||||
resolveUris(uris);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
getSearchQuery() {
|
||||
const { navigation } = this.props;
|
||||
if (navigation && navigation.state && navigation.state.params) {
|
||||
@@ -109,8 +144,7 @@ class SearchPage extends React.PureComponent {
|
||||
return (
|
||||
<View style={searchStyle.noResults}>
|
||||
<Text style={searchStyle.noResultsText}>
|
||||
There are no results to display for <Text style={searchStyle.boldText}>{query}</Text>. Please try a different
|
||||
search term.
|
||||
{__('There are no results to display for "%query%". Please try a different search term.', { query })}
|
||||
</Text>
|
||||
</View>
|
||||
);
|
||||
@@ -131,11 +165,11 @@ class SearchPage extends React.PureComponent {
|
||||
this.setState({ claimSearchOptions: options, claimSearchRun: true }, () => claimSearch(options));
|
||||
}
|
||||
|
||||
if (this.state.claimSearchRun && this.state.claimSearchOptions) {
|
||||
/* if (this.state.claimSearchRun && this.state.claimSearchOptions) {
|
||||
const claimSearchKey = createNormalizedClaimSearchKey(this.state.claimSearchOptions);
|
||||
const claimSearchUris = claimSearchByQuery[claimSearchKey];
|
||||
this.setState({ showTagResult: claimSearchUris && claimSearchUris.length > 0 });
|
||||
}
|
||||
} */
|
||||
|
||||
return (
|
||||
<View>
|
||||
@@ -156,7 +190,7 @@ class SearchPage extends React.PureComponent {
|
||||
};
|
||||
|
||||
render() {
|
||||
const { isSearching, navigation, query, uris, urisByQuery } = this.props;
|
||||
const { isSearching, navigation, query, uris } = this.props;
|
||||
|
||||
return (
|
||||
<View style={searchStyle.container}>
|
||||
@@ -168,22 +202,24 @@ class SearchPage extends React.PureComponent {
|
||||
</View>
|
||||
)}
|
||||
|
||||
<FlatList
|
||||
extraData={this.state}
|
||||
style={searchStyle.scrollContainer}
|
||||
contentContainerStyle={searchStyle.scrollPadding}
|
||||
keyboardShouldPersistTaps={'handled'}
|
||||
data={uris}
|
||||
keyExtractor={(item, index) => item}
|
||||
initialNumToRender={10}
|
||||
maxToRenderPerBatch={20}
|
||||
removeClippedSubviews
|
||||
ListEmptyComponent={!isSearching ? this.listEmptyComponent() : null}
|
||||
ListHeaderComponent={this.state.currentUri ? this.listHeaderComponent(this.state.showTagResult) : null}
|
||||
renderItem={({ item }) => (
|
||||
<FileListItem key={item} uri={item} style={searchStyle.resultItem} navigation={navigation} />
|
||||
)}
|
||||
/>
|
||||
{!isSearching && (
|
||||
<FlatList
|
||||
extraData={this.state}
|
||||
style={searchStyle.scrollContainer}
|
||||
contentContainerStyle={searchStyle.scrollPadding}
|
||||
keyboardShouldPersistTaps={'handled'}
|
||||
data={uris}
|
||||
keyExtractor={(item, index) => item}
|
||||
initialNumToRender={8}
|
||||
maxToRenderPerBatch={20}
|
||||
removeClippedSubviews
|
||||
ListEmptyComponent={!isSearching ? this.listEmptyComponent() : null}
|
||||
ListHeaderComponent={this.state.currentUri ? this.listHeaderComponent(this.state.showTagResult) : null}
|
||||
renderItem={({ item }) => (
|
||||
<FileListItem key={item} uri={item} style={searchStyle.resultItem} batchResolve navigation={navigation} />
|
||||
)}
|
||||
/>
|
||||
)}
|
||||
<FloatingWalletBalance navigation={navigation} />
|
||||
</View>
|
||||
);
|
||||
|
||||
+30
-22
@@ -89,33 +89,41 @@ class SettingsPage extends React.PureComponent {
|
||||
}
|
||||
|
||||
// check the local filesystem for the language first? Or download remote strings first?
|
||||
if (language === 'en') {
|
||||
// don't attempt to download English
|
||||
NativeModules.UtilityModule.setNativeStringSetting(SETTINGS.LANGUAGE, language);
|
||||
|
||||
// download and save the language file
|
||||
this.setState({ downloadingLanguage: true }, () => {
|
||||
fetch('https://lbry.com/i18n/get/lbry-mobile/app-strings/' + language + '.json')
|
||||
.then(r => r.json())
|
||||
.then(j => {
|
||||
window.i18n_messages[language] = j;
|
||||
// update state and client setting
|
||||
window.language = language;
|
||||
setClientSetting(SETTINGS.LANGUAGE, value);
|
||||
} else {
|
||||
// download and save the language file
|
||||
this.setState({ downloadingLanguage: true }, () => {
|
||||
fetch('https://lbry.com/i18n/get/lbry-mobile/app-strings/' + language + '.json')
|
||||
.then(r => r.json())
|
||||
.then(j => {
|
||||
window.i18n_messages[language] = j;
|
||||
|
||||
// write the language file to the filesystem
|
||||
const langFilePath = RNFS.ExternalDirectoryPath + '/' + language + '.json';
|
||||
RNFS.writeFile(langFilePath, JSON.stringify(j), 'utf8');
|
||||
// write the language file to the filesystem
|
||||
const langFilePath = RNFS.ExternalDirectoryPath + '/' + language + '.json';
|
||||
RNFS.writeFile(langFilePath, JSON.stringify(j), 'utf8');
|
||||
|
||||
// save the setting outside redux because when the first component mounts, the redux value isn't loaded yet
|
||||
// so we have to load it from native settings
|
||||
NativeModules.UtilityModule.setNativeStringSetting(SETTINGS.LANGUAGE, value);
|
||||
// save the setting outside redux because when the first component mounts, the redux value isn't loaded yet
|
||||
// so we have to load it from native settings
|
||||
NativeModules.UtilityModule.setNativeStringSetting(SETTINGS.LANGUAGE, language);
|
||||
|
||||
// update state and client setting
|
||||
window.language = language;
|
||||
setClientSetting(SETTINGS.LANGUAGE, value);
|
||||
// update state and client setting
|
||||
window.language = language;
|
||||
setClientSetting(SETTINGS.LANGUAGE, value);
|
||||
|
||||
this.setState({ downloadingLanguage: false });
|
||||
})
|
||||
.catch(e => {
|
||||
notify({ message: __('Failed to load %language% translations.', { language: language }), isError: true });
|
||||
this.setState({ downloadingLanguage: false });
|
||||
});
|
||||
});
|
||||
this.setState({ downloadingLanguage: false });
|
||||
})
|
||||
.catch(e => {
|
||||
notify({ message: __('Failed to load %language% translations.', { language: language }), isError: true });
|
||||
this.setState({ downloadingLanguage: false });
|
||||
});
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
handleBackPressed = () => {
|
||||
|
||||
+14
-13
@@ -115,7 +115,7 @@ class SplashScreen extends React.PureComponent {
|
||||
},
|
||||
error => {
|
||||
/* failed */
|
||||
}
|
||||
},
|
||||
);
|
||||
};
|
||||
|
||||
@@ -171,7 +171,6 @@ class SplashScreen extends React.PureComponent {
|
||||
|
||||
_updateStatusCallback(status) {
|
||||
const { fetchSubscriptions, getSync, setClientSetting } = this.props;
|
||||
const blockchainHeaders = status.blockchain_headers;
|
||||
const startupStatus = status.startup_status;
|
||||
const walletStatus = status.wallet;
|
||||
|
||||
@@ -222,10 +221,11 @@ class SplashScreen extends React.PureComponent {
|
||||
return;
|
||||
}
|
||||
|
||||
if (blockchainHeaders) {
|
||||
const headerSyncProgress = walletStatus ? walletStatus.headers_synchronization_progress : null;
|
||||
if (headerSyncProgress && headerSyncProgress < 100) {
|
||||
this.setState({
|
||||
isDownloadingHeaders: blockchainHeaders.downloading_headers,
|
||||
headersDownloadProgress: blockchainHeaders.download_progress,
|
||||
isDownloadingHeaders: true,
|
||||
headersDownloadProgress: headerSyncProgress,
|
||||
});
|
||||
} else {
|
||||
// set downloading flag to false if blockchain_headers isn't in the status response
|
||||
@@ -234,15 +234,16 @@ class SplashScreen extends React.PureComponent {
|
||||
});
|
||||
}
|
||||
|
||||
if (blockchainHeaders && blockchainHeaders.downloading_headers) {
|
||||
const downloadProgress = blockchainHeaders.download_progress ? blockchainHeaders.download_progress : 0;
|
||||
if (headerSyncProgress < 100) {
|
||||
const downloadProgress = isNaN(parseInt(headerSyncProgress, 10)) ? '0' : headerSyncProgress || '0';
|
||||
this.setState({
|
||||
message: __('Blockchain Sync'),
|
||||
details: `Catching up with the blockchain (${downloadProgress}%)`, // TODO: i18n tokenization
|
||||
details: __('Catching up with the blockchain (%progress%%)', { progress: downloadProgress }),
|
||||
});
|
||||
} else if (walletStatus && walletStatus.blocks_behind > 0) {
|
||||
const behind = walletStatus.blocks_behind;
|
||||
const behindText = behind + ' block' + (behind === 1 ? '' : 's') + ' behind'; // TODO: i18n tokenization
|
||||
const behindText =
|
||||
behind === 1 ? __('%num% block behind', { num: behind }) : __('%num% blocks behind', { num: behind });
|
||||
this.setState({
|
||||
message: __('Blockchain Sync'),
|
||||
details: behindText,
|
||||
@@ -292,7 +293,7 @@ class SplashScreen extends React.PureComponent {
|
||||
isLagging: true,
|
||||
message: __('Connection Failure'),
|
||||
details: __(
|
||||
'We could not establish a connection to the SDK. Your data connection may be preventing LBRY from connecting. Contact hello@lbry.com if you think this is a software bug.'
|
||||
'We could not establish a connection to the SDK. Your data connection may be preventing LBRY from connecting. Contact hello@lbry.com if you think this is a software bug.',
|
||||
),
|
||||
});
|
||||
});
|
||||
@@ -317,7 +318,7 @@ class SplashScreen extends React.PureComponent {
|
||||
message: __('Testing network'),
|
||||
details: __('Waiting for name resolution'),
|
||||
},
|
||||
() => this.finishSplashScreen()
|
||||
() => this.finishSplashScreen(),
|
||||
);
|
||||
};
|
||||
|
||||
@@ -330,12 +331,12 @@ class SplashScreen extends React.PureComponent {
|
||||
<Text style={splashStyle.errorTitle}>{__('Oops! Something went wrong.')}</Text>
|
||||
<Text style={splashStyle.paragraph}>
|
||||
{__(
|
||||
'Your wallet failed to unlock, which means you may not be able to play any videos or access your funds.'
|
||||
'Your wallet failed to unlock, which means you may not be able to play any videos or access your funds.',
|
||||
)}
|
||||
</Text>
|
||||
<Text style={splashStyle.paragraph}>
|
||||
{__(
|
||||
'You can try to fix this by tapping Stop on the LBRY service notification and starting the app again. If the problem continues, you may have to reinstall the app and restore your account.'
|
||||
'You can try to fix this by tapping Stop on the LBRY service notification and starting the app again. If the problem continues, you may have to reinstall the app and restore your account.',
|
||||
)}
|
||||
</Text>
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { connect } from 'react-redux';
|
||||
import {
|
||||
doChannelUnsubscribe,
|
||||
doFetchMySubscriptions,
|
||||
doSetViewMode,
|
||||
doFetchRecommendedSubscriptions,
|
||||
@@ -36,6 +37,7 @@ const select = state => ({
|
||||
});
|
||||
|
||||
const perform = dispatch => ({
|
||||
channelUnsubscribe: subscription => dispatch(doChannelUnsubscribe(subscription)),
|
||||
doFetchMySubscriptions: () => dispatch(doFetchMySubscriptions()),
|
||||
doFetchRecommendedSubscriptions: () => dispatch(doFetchRecommendedSubscriptions()),
|
||||
doSetViewMode: viewMode => dispatch(doSetViewMode(viewMode)),
|
||||
|
||||
@@ -82,6 +82,8 @@ class SubscriptionsPage extends React.PureComponent {
|
||||
if (Constants.DRAWER_ROUTE_SUBSCRIPTIONS === currentRoute && currentRoute !== prevRoute) {
|
||||
this.onComponentFocused();
|
||||
}
|
||||
|
||||
this.unsubscribeShortChannelUrls();
|
||||
}
|
||||
|
||||
handleSortByItemSelected = item => {
|
||||
@@ -109,6 +111,16 @@ class SubscriptionsPage extends React.PureComponent {
|
||||
return [Constants.ALL_PLACEHOLDER].concat(channelUris);
|
||||
};
|
||||
|
||||
// Added in 0.12.1. Can be dropped on or after 1 Feb 2020.
|
||||
unsubscribeShortChannelUrls = () => {
|
||||
// this should only have to happen once
|
||||
const { subscribedChannels, channelUnsubscribe } = this.props;
|
||||
const badSubs = subscribedChannels.filter(sub => sub.uri.split('#')[1].length < 5);
|
||||
if (badSubs.length > 0) {
|
||||
badSubs.forEach(sub => channelUnsubscribe(sub));
|
||||
}
|
||||
};
|
||||
|
||||
render() {
|
||||
const {
|
||||
suggestedChannels,
|
||||
@@ -243,7 +255,7 @@ class SubscriptionsPage extends React.PureComponent {
|
||||
title={__('Sort content by')}
|
||||
onOverlayPress={() => this.setState({ showSortPicker: false })}
|
||||
onItemSelected={this.handleSortByItemSelected}
|
||||
selectedItem={this.state.currentSortByItem}
|
||||
selectedItem={currentSortByItem}
|
||||
items={Constants.CLAIM_SEARCH_SORT_BY_ITEMS}
|
||||
/>
|
||||
)}
|
||||
|
||||
@@ -14,6 +14,7 @@ import {
|
||||
selectPhoneToVerify,
|
||||
selectPhoneVerifyIsPending,
|
||||
selectPhoneVerifyErrorMessage,
|
||||
selectEmailAlreadyExists,
|
||||
selectEmailNewErrorMessage,
|
||||
selectEmailNewIsPending,
|
||||
selectEmailToVerify,
|
||||
@@ -32,6 +33,7 @@ import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
|
||||
import Verification from './view';
|
||||
|
||||
const select = state => ({
|
||||
emailAlreadyExists: selectEmailAlreadyExists(state),
|
||||
emailToVerify: selectEmailToVerify(state),
|
||||
emailNewErrorMessage: selectEmailNewErrorMessage(state),
|
||||
emailNewPending: selectEmailNewIsPending(state),
|
||||
|
||||
@@ -105,16 +105,20 @@ class EmailVerifyPage extends React.PureComponent {
|
||||
};
|
||||
|
||||
render() {
|
||||
const { emailNewPending } = this.props;
|
||||
const { emailAlreadyExists, emailNewPending } = this.props;
|
||||
|
||||
return (
|
||||
<View style={firstRunStyle.container}>
|
||||
<Text style={rewardStyle.verificationTitle}>
|
||||
{Constants.PHASE_COLLECTION === this.state.phase ? __('Email') : __('Verify Email')}
|
||||
{Constants.PHASE_COLLECTION === this.state.phase
|
||||
? __('Email')
|
||||
: emailAlreadyExists
|
||||
? __('Sign In')
|
||||
: __('Verify Email')}
|
||||
</Text>
|
||||
{Constants.PHASE_COLLECTION === this.state.phase && (
|
||||
<View>
|
||||
<Text style={firstRunStyle.paragraph}>Please provide an email address.</Text>
|
||||
<Text style={firstRunStyle.paragraph}>{__('Please provide an email address.')}</Text>
|
||||
<TextInput
|
||||
style={firstRunStyle.emailInput}
|
||||
placeholder={this.state.placeholder}
|
||||
@@ -138,7 +142,7 @@ class EmailVerifyPage extends React.PureComponent {
|
||||
<Button
|
||||
style={rewardStyle.verificationButton}
|
||||
theme={'light'}
|
||||
text={__('Send verification email')}
|
||||
text={__('Continue')}
|
||||
onPress={this.onSendVerificationPressed}
|
||||
/>
|
||||
)}
|
||||
@@ -154,8 +158,12 @@ class EmailVerifyPage extends React.PureComponent {
|
||||
{Constants.PHASE_VERIFICATION === this.state.phase && (
|
||||
<View>
|
||||
<Text style={firstRunStyle.paragraph}>
|
||||
An email has been sent to <Text style={firstRunStyle.nowrap}>{this.state.email}</Text>. Please follow the
|
||||
instructions in the message to verify your email address.
|
||||
{__('An email has been sent to')}
|
||||
{'\n\n'}
|
||||
{this.state.email}
|
||||
{'\n\n'}
|
||||
{emailAlreadyExists && __('Please click the link in the message to complete signing in.')}
|
||||
{!emailAlreadyExists && __('Please click the link in the message to verify your email address')}
|
||||
</Text>
|
||||
|
||||
<View style={rewardStyle.buttonContainer}>
|
||||
|
||||
@@ -20,22 +20,22 @@ class ManualVerifyPage extends React.PureComponent {
|
||||
render() {
|
||||
return (
|
||||
<View style={firstRunStyle.container}>
|
||||
<Text style={rewardStyle.verificationTitle}>Manual Reward Verification</Text>
|
||||
<Text style={rewardStyle.verificationTitle}>{__('Manual Reward Verification')}</Text>
|
||||
<Text style={firstRunStyle.spacedParagraph}>
|
||||
{__(
|
||||
'This account must undergo review before you can participate in the rewards program. This can take anywhere from several minutes to several days.'
|
||||
)}
|
||||
</Text>
|
||||
<Text style={firstRunStyle.spacedParagraph}>
|
||||
If you continue to see this message, please request to be verified on the{' '}
|
||||
{__('If you continue to see this message, please request to be verified on the')}{' '}
|
||||
<Link
|
||||
style={rewardStyle.underlinedTextLink}
|
||||
href="https://discordapp.com/invite/Z3bERWA"
|
||||
text="LBRY Discord server"
|
||||
text={__('LBRY Discord server')}
|
||||
/>
|
||||
.
|
||||
</Text>
|
||||
<Text style={firstRunStyle.spacedParagraph}>Please enjoy free content in the meantime!</Text>
|
||||
<Text style={firstRunStyle.spacedParagraph}>{__('Please enjoy free content in the meantime!')}</Text>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@ class PhoneVerifyPage extends React.PureComponent {
|
||||
notify({ message: String(phoneVerifyErrorMessage) });
|
||||
this.setState({ codeVerifyStarted: false, phoneVerifyFailed: true });
|
||||
} else {
|
||||
notify({ message: 'Your phone number was successfully verified.' });
|
||||
notify({ message: __('Your phone number was successfully verified.') });
|
||||
this.setState({ codeVerifySuccessful: true, phoneVerifyFailed: false });
|
||||
if (onPhoneVerifySuccessful) {
|
||||
onPhoneVerifySuccessful();
|
||||
@@ -103,7 +103,7 @@ class PhoneVerifyPage extends React.PureComponent {
|
||||
|
||||
if (!this.phoneInput.isValidNumber()) {
|
||||
return notify({
|
||||
message: 'Please provide a valid telephone number.',
|
||||
message: __('Please provide a valid telephone number.'),
|
||||
});
|
||||
}
|
||||
|
||||
@@ -145,7 +145,7 @@ class PhoneVerifyPage extends React.PureComponent {
|
||||
return (
|
||||
<View style={firstRunStyle.container}>
|
||||
<Text style={rewardStyle.verificationTitle}>
|
||||
{this.state.phase === Constants.PHASE_VERIFICATION ? 'Verify ' : ''}Phone Number
|
||||
{this.state.phase === Constants.PHASE_VERIFICATION ? __('Verify Phone Number') : __('Phone Number')}
|
||||
</Text>
|
||||
|
||||
<View style={rewardStyle.phoneVerificationContainer}>
|
||||
@@ -169,7 +169,7 @@ class PhoneVerifyPage extends React.PureComponent {
|
||||
<Button
|
||||
style={[rewardStyle.verificationButton, rewardStyle.topMarginMedium]}
|
||||
theme={'light'}
|
||||
text={'Send verification text'}
|
||||
text={__('Send verification text')}
|
||||
onPress={this.onSendTextPressed}
|
||||
/>
|
||||
)}
|
||||
@@ -187,7 +187,7 @@ class PhoneVerifyPage extends React.PureComponent {
|
||||
{!phoneVerifyIsPending && !this.codeVerifyStarted && (
|
||||
<View>
|
||||
<Text style={[rewardStyle.bottomMarginSmall, firstRunStyle.paragraph]}>
|
||||
Please enter the verification code sent to {phone}.
|
||||
{__('Please enter the verification code sent to %phone%', { phone })}.
|
||||
</Text>
|
||||
<TextInput
|
||||
style={rewardStyle.verificationCodeInput}
|
||||
@@ -202,16 +202,16 @@ class PhoneVerifyPage extends React.PureComponent {
|
||||
<Button
|
||||
style={[rewardStyle.verificationButton, rewardStyle.topMarginSmall]}
|
||||
theme={'light'}
|
||||
text={'Verify'}
|
||||
text={__('Verify')}
|
||||
onPress={this.onVerifyPressed}
|
||||
/>
|
||||
<Link style={rewardStyle.verificationLink} text={'Edit'} onPress={this.onEditPressed} />
|
||||
<Link style={rewardStyle.verificationLink} text={__('Edit')} onPress={this.onEditPressed} />
|
||||
</View>
|
||||
</View>
|
||||
)}
|
||||
{phoneVerifyIsPending && (
|
||||
<View style={firstRunStyle.centered}>
|
||||
<Text style={firstRunStyle.paragraph}>Verifying your phone number...</Text>
|
||||
<Text style={firstRunStyle.paragraph}>{__('Verifying your phone number...')}</Text>
|
||||
<ActivityIndicator
|
||||
color={Colors.White}
|
||||
size="small"
|
||||
|
||||
@@ -14,13 +14,14 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
state = {
|
||||
checkSyncStarted: false,
|
||||
password: null,
|
||||
placeholder: 'password',
|
||||
placeholder: __('password'),
|
||||
syncApplyStarted: false,
|
||||
syncApplyCompleted: false,
|
||||
syncChecked: false,
|
||||
revealPassword: false,
|
||||
autoPassword: false,
|
||||
autoLoginAttempted: false,
|
||||
autoLoginTried: false,
|
||||
autoLoginFlow: true,
|
||||
};
|
||||
|
||||
@@ -67,8 +68,10 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
|
||||
if (this.state.syncApplyStarted && !syncApplyIsPending) {
|
||||
if (syncApplyErrorMessage && syncApplyErrorMessage.trim().length > 0) {
|
||||
notify({ message: __(syncApplyErrorMessage), isError: true });
|
||||
this.setState({ syncApplyStarted: false, autoLoginFlow: false });
|
||||
if (this.state.autoLoginTried) {
|
||||
notify({ message: __(syncApplyErrorMessage), isError: true });
|
||||
}
|
||||
this.setState({ autoLoginTried: true, syncApplyStarted: false, autoLoginFlow: false });
|
||||
} else {
|
||||
// password successfully verified
|
||||
this.setState({ syncApplyCompleted: true });
|
||||
@@ -182,7 +185,7 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
}}
|
||||
onBlur={() => {
|
||||
if (!this.state.password || this.state.password.length === 0) {
|
||||
this.setState({ placeholder: 'password' });
|
||||
this.setState({ placeholder: __('password') });
|
||||
}
|
||||
}}
|
||||
/>
|
||||
@@ -194,16 +197,6 @@ class SyncVerifyPage extends React.PureComponent {
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
|
||||
{(!this.state.password || this.state.password.trim().length === 0) && (
|
||||
<View style={firstRunStyle.passwordWarning}>
|
||||
<Text style={firstRunStyle.passwordWarningText}>
|
||||
{hasSyncedWallet
|
||||
? __('If you did not provide a password, please press Use LBRY to continue.')
|
||||
: __('You can proceed without a password, but this is not recommended.')}
|
||||
</Text>
|
||||
</View>
|
||||
)}
|
||||
|
||||
{(!hasSyncedWallet && this.state.password && this.state.password.trim().length) > 0 && (
|
||||
<View style={firstRunStyle.passwordStrength}>
|
||||
<BarPasswordStrengthDisplay
|
||||
|
||||
@@ -118,6 +118,7 @@ class VerificationScreen extends React.PureComponent {
|
||||
addUserEmail,
|
||||
checkSync,
|
||||
emailNewErrorMessage,
|
||||
emailAlreadyExists,
|
||||
emailNewPending,
|
||||
emailToVerify,
|
||||
getSync,
|
||||
@@ -148,6 +149,7 @@ class VerificationScreen extends React.PureComponent {
|
||||
page = (
|
||||
<EmailVerifyPage
|
||||
addUserEmail={addUserEmail}
|
||||
emailAlreadyExists={emailAlreadyExists}
|
||||
emailNewErrorMessage={emailNewErrorMessage}
|
||||
emailNewPending={emailNewPending}
|
||||
emailToVerify={emailToVerify}
|
||||
|
||||
@@ -30,6 +30,16 @@ const channelCreatorStyle = StyleSheet.create({
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 16,
|
||||
},
|
||||
balance: {
|
||||
alignItems: 'center',
|
||||
flexDirection: 'row',
|
||||
marginLeft: 24,
|
||||
},
|
||||
balanceText: {
|
||||
fontFamily: 'Inter-UI-SemiBold',
|
||||
fontSize: 14,
|
||||
marginLeft: 4,
|
||||
},
|
||||
channelNameInput: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 16,
|
||||
|
||||
@@ -64,6 +64,8 @@ const channelPageStyle = StyleSheet.create({
|
||||
color: Colors.White,
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 18,
|
||||
padding: 2,
|
||||
backgroundColor: '#000000aa',
|
||||
},
|
||||
subscribeButtonContainer: {
|
||||
position: 'absolute',
|
||||
@@ -145,7 +147,7 @@ const channelPageStyle = StyleSheet.create({
|
||||
position: 'absolute',
|
||||
overflow: 'hidden',
|
||||
left: 24,
|
||||
bottom: -40,
|
||||
bottom: -24,
|
||||
zIndex: 100,
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
@@ -176,6 +178,20 @@ const channelPageStyle = StyleSheet.create({
|
||||
marginLeft: 8,
|
||||
marginRight: 8,
|
||||
},
|
||||
tipButton: {
|
||||
marginRight: 8,
|
||||
},
|
||||
followerCount: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 12,
|
||||
color: Colors.White,
|
||||
marginTop: 2,
|
||||
padding: 2,
|
||||
flexWrap: 'wrap',
|
||||
},
|
||||
followerCountBg: {
|
||||
backgroundColor: '#000000aa',
|
||||
},
|
||||
});
|
||||
|
||||
export default channelPageStyle;
|
||||
@@ -24,6 +24,16 @@ const channelSelectorStyle = StyleSheet.create({
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 16,
|
||||
},
|
||||
balance: {
|
||||
alignItems: 'center',
|
||||
flexDirection: 'row',
|
||||
marginLeft: 24,
|
||||
},
|
||||
balanceText: {
|
||||
fontFamily: 'Inter-UI-SemiBold',
|
||||
fontSize: 14,
|
||||
marginLeft: 4,
|
||||
},
|
||||
channelNameInput: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 16,
|
||||
|
||||
@@ -94,6 +94,11 @@ const fileListStyle = StyleSheet.create({
|
||||
top: 8,
|
||||
left: 8,
|
||||
},
|
||||
featuredDownloadedIcon: {
|
||||
position: 'absolute',
|
||||
left: 16,
|
||||
top: 16,
|
||||
},
|
||||
fileItem: {
|
||||
marginLeft: 24,
|
||||
marginRight: 24,
|
||||
|
||||
+30
-5
@@ -277,6 +277,7 @@ const filePageStyle = StyleSheet.create({
|
||||
amountRow: {
|
||||
flexDirection: 'row',
|
||||
flex: 0.75,
|
||||
alignItems: 'center',
|
||||
},
|
||||
button: {
|
||||
backgroundColor: Colors.LbryGreen,
|
||||
@@ -299,9 +300,7 @@ const filePageStyle = StyleSheet.create({
|
||||
letterSpacing: 1,
|
||||
},
|
||||
currency: {
|
||||
alignSelf: 'flex-start',
|
||||
fontSize: 12,
|
||||
marginTop: 15,
|
||||
marginLeft: 4,
|
||||
},
|
||||
descriptionToggle: {
|
||||
@@ -381,10 +380,19 @@ const filePageStyle = StyleSheet.create({
|
||||
backButtonIcon: {
|
||||
color: Colors.White,
|
||||
},
|
||||
sharedLargeButton: {
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
flex: 0.2,
|
||||
},
|
||||
innerLargeButton: {
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
},
|
||||
largeButton: {
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
marginRight: 48,
|
||||
flex: 0.2,
|
||||
},
|
||||
largeButtonIcon: {
|
||||
color: Colors.DescriptionGrey,
|
||||
@@ -397,8 +405,8 @@ const filePageStyle = StyleSheet.create({
|
||||
largeButtonsRow: {
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
marginLeft: 20,
|
||||
marginRight: 20,
|
||||
marginLeft: 16,
|
||||
marginRight: 16,
|
||||
marginTop: 12,
|
||||
marginBottom: 12,
|
||||
},
|
||||
@@ -438,6 +446,23 @@ const filePageStyle = StyleSheet.create({
|
||||
relatedLoading: {
|
||||
marginTop: 16,
|
||||
},
|
||||
viewCount: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 12,
|
||||
color: Colors.DescriptionGrey,
|
||||
marginLeft: 12,
|
||||
marginRight: 12,
|
||||
},
|
||||
balance: {
|
||||
alignItems: 'center',
|
||||
flexDirection: 'row',
|
||||
marginLeft: 24,
|
||||
},
|
||||
balanceText: {
|
||||
fontFamily: 'Inter-UI-SemiBold',
|
||||
fontSize: 14,
|
||||
marginLeft: 4,
|
||||
},
|
||||
});
|
||||
|
||||
export default filePageStyle;
|
||||
@@ -0,0 +1,71 @@
|
||||
import { StyleSheet } from 'react-native';
|
||||
import Colors from './colors';
|
||||
|
||||
const modalTipStyle = StyleSheet.create({
|
||||
container: {
|
||||
padding: 16,
|
||||
},
|
||||
title: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 24,
|
||||
},
|
||||
row: {
|
||||
flexDirection: 'row',
|
||||
flex: 1,
|
||||
},
|
||||
amountRow: {
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
marginRight: 24,
|
||||
},
|
||||
tipAmountInput: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 14,
|
||||
alignSelf: 'flex-start',
|
||||
textAlign: 'right',
|
||||
width: 80,
|
||||
letterSpacing: 1,
|
||||
},
|
||||
currency: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 12,
|
||||
marginLeft: 4,
|
||||
},
|
||||
buttonRow: {
|
||||
alignItems: 'center',
|
||||
flexDirection: 'row',
|
||||
justifyContent: 'space-between',
|
||||
marginTop: 16,
|
||||
},
|
||||
button: {
|
||||
backgroundColor: Colors.LbryGreen,
|
||||
},
|
||||
cancelTipLink: {
|
||||
color: Colors.Grey,
|
||||
},
|
||||
balance: {
|
||||
alignItems: 'center',
|
||||
flexDirection: 'row',
|
||||
marginLeft: 24,
|
||||
},
|
||||
balanceText: {
|
||||
fontFamily: 'Inter-UI-SemiBold',
|
||||
fontSize: 14,
|
||||
marginLeft: 4,
|
||||
},
|
||||
info: {
|
||||
marginTop: 4,
|
||||
},
|
||||
infoText: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 14,
|
||||
color: Colors.DescriptionGrey,
|
||||
},
|
||||
learnMoreLink: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 14,
|
||||
color: Colors.LbryGreen,
|
||||
},
|
||||
});
|
||||
|
||||
export default modalTipStyle;
|
||||
@@ -466,6 +466,16 @@ const publishStyle = StyleSheet.create({
|
||||
fontFamily: 'Inter-UI-SemiBold',
|
||||
fontSize: 12,
|
||||
},
|
||||
balance: {
|
||||
alignItems: 'center',
|
||||
flexDirection: 'row',
|
||||
marginLeft: 24,
|
||||
},
|
||||
balanceText: {
|
||||
fontFamily: 'Inter-UI-SemiBold',
|
||||
fontSize: 14,
|
||||
marginLeft: 4,
|
||||
},
|
||||
});
|
||||
|
||||
export default publishStyle;
|
||||
@@ -126,6 +126,16 @@ const walletStyle = StyleSheet.create({
|
||||
marginLeft: 16,
|
||||
marginBottom: 16,
|
||||
},
|
||||
balanceFocus: {
|
||||
alignItems: 'center',
|
||||
flexDirection: 'row',
|
||||
marginLeft: 24,
|
||||
},
|
||||
balanceText: {
|
||||
fontFamily: 'Inter-UI-SemiBold',
|
||||
fontSize: 14,
|
||||
marginLeft: 4,
|
||||
},
|
||||
infoText: {
|
||||
color: '#aaaaaa',
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
|
||||
@@ -155,6 +155,14 @@ export function navigateToUri(navigation, uri, additionalParams, isNavigatingBac
|
||||
}
|
||||
|
||||
export function navigateBack(navigation, drawerStack, popDrawerStack) {
|
||||
if (drawerStack[drawerStack.length - 1].route === Constants.DRAWER_ROUTE_FILE_VIEW) {
|
||||
// inner file_view (web / image view) is handled differently
|
||||
if (popDrawerStack) {
|
||||
popDrawerStack();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (popDrawerStack) {
|
||||
popDrawerStack();
|
||||
}
|
||||
@@ -186,6 +194,12 @@ export function navigateBack(navigation, drawerStack, popDrawerStack) {
|
||||
}
|
||||
|
||||
export function dispatchNavigateBack(dispatch, nav, drawerStack) {
|
||||
if (drawerStack[drawerStack.length - 1].route === Constants.DRAWER_ROUTE_FILE_VIEW) {
|
||||
// inner file_view (web / image view) is handled differently
|
||||
dispatch(doPopDrawerStack());
|
||||
return;
|
||||
}
|
||||
|
||||
dispatch(doPopDrawerStack());
|
||||
|
||||
const target = drawerStack[drawerStack.length > 1 ? drawerStack.length - 2 : 0];
|
||||
|
||||
Reference in new issue
Block a user