Compare commits

...
21 Commits
Author SHA1 Message Date
Akinwale Ariwodola 5681630e4c updates for patch release 2020-01-03 18:51:39 +01:00
Akinwale Ariwodola 1eecae469d rename Subscriptions -> Following. fix bad subs. 2019-12-29 14:56:15 +01:00
Akinwale Ariwodola f7c8bf3949 fix subsequent searches on search page. 2019-12-29 11:10:33 +01:00
Akinwale Ariwodola d538838921 hook reactotron into redux. more search page tweaks. 2019-12-29 11:02:11 +01:00
Akinwale Ariwodola b5abddb69a Merge pull request #105 from lbryio/reactotron
add reactotron. fix batch resolve functionality for search results.
2019-12-29 10:35:13 +01:00
Akinwale Ariwodola 15cbdcfaca add reactotron. fix batch resolve functionality for search results. 2019-12-29 10:34:00 +01:00
Akinwale Ariwodola 30246a189c remove console.log 2019-12-29 07:23:42 +01:00
Akinwale Ariwodola f77f0a7aa2 search tweaks and package updates 2019-12-29 06:48:13 +01:00
Akinwale Ariwodola 36d4bd7e99 Merge pull request #104 from lbryio/navigation-drawer-test
update react-navigation-drawer package
2019-12-29 06:45:47 +01:00
Akinwale Ariwodola b8f2a9e24f tweak related content view for perf. fix displayed dates. 2019-12-28 21:02:29 +01:00
Akinwale Ariwodola d7edbf55b5 react-navigation-drawer 2.3.3 2019-12-28 19:36:17 +01:00
Akinwale Ariwodola d362d9e8dd remove console.log 2019-12-28 15:56:37 +01:00
Akinwale Ariwodola f47693fb35 First run changes (#103)
* streamlined first run
* download button tweaks
* fix downloads. file page tweaks.
2019-12-28 15:45:12 +01:00
Akinwale Ariwodola 54b10c818e Merge pull request #102 from lbryio/react-native-0.61
update to RN 0.61.5
2019-12-28 15:16:56 +01:00
Akinwale Ariwodola 4b283e6606 update to RN 0.61.5 2019-12-28 15:14:37 +01:00
Akinwale Ariwodola 67723813cc add semi-transparent background to channel name and follower count 2019-12-20 18:53:53 +01:00
Akinwale Ariwodola 80b12a2cc8 updates to modal tip view 2019-12-20 09:01:26 +01:00
Akinwale Ariwodola 48ce7e9d9e pin lbry-redux and lbryinc commits 2019-12-20 08:46:44 +01:00
Akinwale Ariwodola 696ff616f7 Merge pull request #101 from lbryio/snackbars
use snackbars instead of toasts
2019-12-18 16:49:18 +01:00
Akinwale Ariwodola 94050e5e6d fix i18n and update app strings 2019-12-18 12:34:33 +01:00
Akinwale Ariwodola d52436e8d4 fix possible trim error on first run email entry 2019-12-18 12:16:34 +01:00
29 changed files with 4321 additions and 2531 deletions

No files matched your search

+4
View File
@@ -1,3 +1,7 @@
if (__DEV__) {
import('./reactotron').then(() => console.log('Reactotron Configured'));
}
import LBRYApp from './src/index'; import LBRYApp from './src/index';
export default LBRYApp; export default LBRYApp;
+202 -197
View File
@@ -1,64 +1,86 @@
{ {
"Waiting for name resolution": "Waiting for name resolution", "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", "Starting up": "Starting up",
"Connecting": "Connecting", "Connecting": "Connecting",
"Unlocking account": "Unlocking account", "Testing network": "Testing network",
"Decrypting wallet": "Decrypting wallet", "Waiting for name resolution": "Waiting for name resolution",
"Search movies, music, and more": "Search movies, music, and more",
"Your Tags": "Your Tags", "Your Tags": "Your Tags",
"Trending": "Trending",
"Customize": "Customize", "Customize": "Customize",
"Sign In": "Sign In",
"SIGN IN": "SIGN IN",
"Find content": "Find content", "Find content": "Find content",
"Subscriptions": "Subscriptions",
"All Content": "All Content",
"Your content": "Your content", "Your content": "Your content",
"Channels": "Channels",
"Library": "Library",
"Publishes": "Publishes",
"New Publish": "New Publish",
"Wallet": "Wallet", "Wallet": "Wallet",
"Rewards": "Rewards",
"Settings": "Settings",
"About": "About",
"All tags you follow": "All tags you follow", "All tags you follow": "All tags you follow",
"More tags you follow": "More tags you follow",
"FREE": "FREE", "FREE": "FREE",
"Delete": "Delete", "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", "Share": "Share",
"Tip": "Tip", "Tip": "Tip",
"Report": "Report", "Report": "Report",
"View": "View",
"Follow": "Follow",
"Fetching cost info...": "Fetching cost info...", "Fetching cost info...": "Fetching cost info...",
"Play": "Play", "Play": "Play",
"Channels you follow": "Channels you follow", "Connecting...": "Connecting...",
"Suggested": "Suggested", "Related Content": "Related Content",
"ALL": "ALL", "Loading...": "Loading...",
"No content to display at this time. Please check back later.": "No content to display at this time. Please check back later.", "Content Freedom": "Content Freedom",
"All Content": "All Content", "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.",
"Create a channel": "Create a channel", "What is LBRY?": "What is LBRY?",
"Title": "Title", "Android App Basics": "Android App Basics",
"Channel": "Channel", "Frequently Asked Questions": "Frequently Asked Questions",
"Deposit": "Deposit", "Get Social": "Get Social",
"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.", "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.",
"Show optional fields": "Show optional fields", "App info": "App info",
"Cancel": "Cancel", "App version": "App version",
"Create": "Create", "LBRY SDK": "LBRY SDK",
"Description": "Description", "Platform": "Platform",
"Website": "Website", "Installation ID": "Installation ID",
"Email": "Email", "Logs": "Logs",
"Tags": "Tags", "Send log": "Send log",
"Hide optional fields": "Hide optional fields", "Account Recommended": "Account Recommended",
"Mature tags": "Mature tags", "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.",
"Other": "Other", "Skip Account": "Skip Account",
"Publish something new": "Publish something new", "Sign Up": "Sign Up",
"Record": "Record", "Blockchain Sync": "Blockchain Sync",
"Take a photo": "Take a photo", "Catching up with the blockchain (%progress%%)": "Catching up with the blockchain (%progress%%)",
"Upload a file": "Upload a file", "Network Loading": "Network Loading",
"Please wait while we load your videos...": "Please wait while we load your videos...", "Initializing LBRY service": "Initializing LBRY service",
"Price": "Price", "%amount% available credits": "%amount% available credits",
"Your content will be free. Press the toggle to set a price.": "Your content will be free. Press the toggle to set a price.", "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.",
"Content address": "Content address", "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.",
"The address where people can find your content (ex. lbry://myvideo). ": "The address where people can find your content (ex. lbry://myvideo). ", "Learn more": "Learn more",
"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.", "Not interested": "Not interested",
"Show extra fields": "Show extra fields", "Get started": "Get started",
"Publish": "Publish", "Get %amount% free credits after creating an account.": "Get %amount% free credits after creating an account.",
"Additional Options": "Additional Options",
"Language": "Language",
"License": "License",
"None": "None",
"Public Domain": "Public Domain",
"Copyrighted...": "Copyrighted...",
"Other...": "Other...",
"Hide extra fields": "Hide extra fields",
"Balance": "Balance", "Balance": "Balance",
"You currently have": "You currently have", "You currently have": "You currently have",
"Receive Credits": "Receive Credits", "Receive Credits": "Receive Credits",
@@ -68,175 +90,158 @@
"Send Credits": "Send Credits", "Send Credits": "Send Credits",
"Recipient address": "Recipient address", "Recipient address": "Recipient address",
"Amount": "Amount", "Amount": "Amount",
"Send": "Send",
"Recent Transactions": "Recent Transactions",
"View All": "View All", "View All": "View All",
"Looks like you don't have any recent transactions.": "Looks like you don't have any recent transactions.", "Looks like you don't have any recent transactions.": "Looks like you don't have any recent transactions.",
"Wallet Sync": "Wallet Sync", "Wallet Sync": "Wallet Sync",
"Sync status": "Sync status", "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", "On": "On",
"Connected email": "Connected email", "Connected email": "Connected email",
"Manual backup": "Manual backup", "Address copied": "Address copied",
"Fetching transactions...": "Fetching transactions...", "Unlocking account": "Unlocking account",
"Loading transactions...": "Loading transactions...", "Decrypting wallet": "Decrypting wallet",
"The transaction URL could not be opened": "The transaction URL could not be opened", "used": "used",
"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.", "Stats": "Stats",
"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.", "Channels you follow": "Channels you follow",
"Learn more": "Learn more", "Suggested": "Suggested",
"Not interested": "Not interested", "ALL": "ALL",
"Get started": "Get started", "Customize your tags": "Customize your tags",
"Fetching rewards...": "Fetching rewards...", "Done": "Done",
"Custom Code": "Custom Code", "Unfollow": "Unfollow",
"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.", "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.",
"Settings": "Settings", "No views": "No views",
"%view% views": "%view% views",
"Content": "Content", "Content": "Content",
"Enable background media playback": "Enable background media playback", "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.", "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", "Choose language": "Choose language",
"Use device language": "Use device language",
"Gujarati": "Gujarati",
"Show mature content": "Show mature content", "Show mature content": "Show mature content",
"Notifications": "Notifications", "Notifications": "Notifications",
"Choose the notifications you would like to receive.": "Choose the notifications you would like to receive.", "Choose the notifications you would like to receive.": "Choose the notifications you would like to receive.",
"Subscriptions": "Subscriptions",
"Rewards": "Rewards",
"Content Interests": "Content Interests", "Content Interests": "Content Interests",
"Search": "Search", "Search": "Search",
"Show URL suggestions": "Show URL suggestions", "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", "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.", "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.",
"Loading...": "Loading...", "There's nothing here yet.\nPlease check back later.": "There's nothing here yet.\nPlease check back later.",
"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.", "%follower% followers": "%follower% followers",
"What is LBRY?": "What is LBRY?", "Are you sure you want to tip %amount% credits": "Are you sure you want to tip %amount% credits",
"Android App Basics": "Android App Basics", "Send tip": "Send tip",
"Frequently Asked Questions": "Frequently Asked Questions",
"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",
"Update mailing preferences": "Update mailing preferences",
"App version": "App version",
"LBRY SDK": "LBRY SDK",
"Platform": "Platform",
"Installation ID": "Installation ID",
"Logs": "Logs",
"Send log": "Send log",
"Testing network": "Testing network",
"Spanish": "Spanish",
"Portuguese": "Portuguese",
"Polish": "Polish",
"Malay": "Malay",
"Please wait while we get some things ready...": "Please wait while we get some things ready...",
"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",
"An account will allow you to earn rewards and keep your account and settings synced.": "An account will allow you to earn rewards and keep your account and settings synced.",
"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)",
"Change email": "Change email",
"Your email address was successfully verified.": "Your email address was successfully verified.",
"Retrieving your account information...": "Retrieving your account information...",
"Synchronizing": "Synchronizing",
"Validating password": "Validating password",
"Invalid password specified. Please enter the password for your previously synchronised wallet.": "Invalid password specified. Please enter the password for your previously synchronised wallet.",
"Please enter the password you used to secure your wallet.": "Please enter the password you used to secure your wallet.",
"If you did not provide a password, please press Use LBRY to continue.": "If you did not provide a password, please press Use LBRY to continue.",
"Note: for wallet security purposes, LBRY is unable to reset your password.": "Note: for wallet security purposes, LBRY is unable to reset your password.",
"More tags you follow": "More tags you follow",
"Blockchain Sync": "Blockchain Sync",
"Network Loading": "Network Loading",
"Initializing LBRY service": "Initializing LBRY service",
"Sign In": "Sign In",
"SIGN IN": "SIGN IN",
"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!",
"Send verification email": "Send verification email",
"You do not have any\ndownloaded content on this device.": "You do not have any\ndownloaded content on this device.",
"It looks like you have not\npublished any content to LBRY yet.": "It looks like you have not\npublished any content to LBRY yet.",
"An account with LBRY Inc. allows you to earn rewards, backup your wallet, and keep everything synced.": "An account with LBRY Inc. allows you to earn rewards, backup your wallet, and keep everything synced.",
"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",
"Indonesian": "Indonesian",
"Hindi": "Hindi",
"Verify Email": "Verify Email",
"Resend": "Resend",
"Edit": "Edit",
"Please follow the instructions in the email sent to your address to continue.": "Please follow the instructions in the email sent to your address to continue.",
"Please enter a password to secure your account and wallet.": "Please enter a password to secure your account and wallet.",
"Anonymous": "Anonymous",
"Connecting...": "Connecting...",
"Gujarati": "Gujarati",
"Turkish": "Turkish",
"Italian": "Italian",
"English": "English",
"Use device language": "Use device language",
"Tags you follow": "Tags you follow",
"Everyone": "Everyone",
"Greek": "Greek",
"Romanian": "Romanian",
"Norwegian": "Norwegian",
"Korean": "Korean",
"Cambodian": "Cambodian",
"Croatian": "Croatian",
"Czech": "Czech",
"Arabic": "Arabic",
"Thai": "Thai",
"Vietnamese": "Vietnamese",
"Dutch": "Dutch",
"Russian": "Russian",
"Japanese": "Japanese",
"German": "German",
"Trending": "Trending",
"Channels": "Channels",
"Library": "Library",
"Publishes": "Publishes",
"New Publish": "New Publish",
"About": "About",
"Sort content by": "Sort content by",
"Trending content": "Trending content",
"New content": "New content",
"Top content": "Top content",
"Search movies, music, and more": "Search movies, music, and more",
"Please provide a valid email address to continue.": "Please provide a valid email address to continue.",
"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.",
"%num% blocks behind": "%num% blocks behind",
"Catching up with the blockchain ($%progress%%)": "Catching up with the blockchain ($%progress%%)",
"Catching up with the blockchain (%progress%%)": "Catching up with the blockchain (%progress%%)",
"Get %amount% free credits after creating an account.": "Get %amount% free credits after creating an account.",
"Off": "Off",
"Sync FAQ": "Sync FAQ",
"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.",
"%amount% free credits available in rewards.": "%amount% free credits available in rewards.",
"Tap to learn more.": "Tap to learn more.",
"password": "password",
"Enable sync": "Enable sync",
"Disable wallet sync": "Disable wallet sync",
"Are you sure you want to turn off wallet sync?": "Are you sure you want to turn off wallet sync?",
"No": "No", "No": "No",
"Yes": "Yes", "Yes": "Yes",
"Wallet sync was successfully disabled.": "Wallet sync was successfully disabled.", "History": "History",
"more": "more", "/wallet": "/wallet",
"Related Content": "Related Content", "Are you sure you want to tip %amount% credit": "Are you sure you want to tip %amount% credit",
"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.", "Enjoying LBRY?": "Enjoying LBRY?",
"Download": "Download", "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.",
"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.", "Never ask again": "Never ask again",
"Stop": "Stop", "Maybe later": "Maybe later",
"%progress%% complete": "%progress%% complete", "Rate app": "Rate app",
"Customize your tags": "Customize your tags", "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.",
"Done": "Done", "Learn more.": "Learn more.",
"Search for more tags": "Search for more tags", "Send a tip to %channel%": "Send a tip to %channel%",
"Send": "Send", "The transaction URL could not be opened": "The transaction URL could not be opened",
"Recent Transactions": "Recent Transactions", "Show All": "Show All",
"Nothing here. Publish something!": "Nothing here. Publish something!", "Fetching rewards...": "Fetching rewards...",
"CONTENT": "CONTENT", "Custom Code": "Custom Code",
"ABOUT": "ABOUT", "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.",
"New": "New", "Redeem": "Redeem",
"Content Freedom": "Content Freedom", "Please confirm that you want to use LBRY without creating an account.": "Please confirm that you want to use LBRY without creating an account.",
"Get Social": "Get Social", "You sent %amount% LBC as a tip, Mahalo!": "You sent %amount% LBC as a tip, Mahalo!"
"used": "used",
"Stats": "Stats",
"Welcome to LBRY.": "Welcome to LBRY.",
"Account Recommended": "Account Recommended",
"%amount% available credits": "%amount% available credits",
"%amount% available credit": "%amount% available credit"
} }
+3401 -1852
View File
File diff suppressed because it is too large. Load diff
+23 -20
View File
@@ -12,50 +12,50 @@
"base-64": "^0.1.0", "base-64": "^0.1.0",
"@expo/vector-icons": "^8.1.0", "@expo/vector-icons": "^8.1.0",
"gfycat-style-urls": "^1.0.3", "gfycat-style-urls": "^1.0.3",
"lbry-redux": "lbryio/lbry-redux#9b11cfed62af7f0f8eb6fa3c88a1f8d2cce46afc", "lbry-redux": "lbryio/lbry-redux#2c569a729bb40d45249ca38150b00922162b7ce3",
"lbryinc": "lbryio/lbryinc#9ffb883cc11e36d55a729c65b70c405a4a56d35e", "lbryinc": "lbryio/lbryinc#053ca52f4f7f9bf8eb62a3581b183671a475ad1c",
"lodash": ">=4.17.11", "lodash": ">=4.17.11",
"merge": ">=1.2.1", "merge": ">=1.2.1",
"moment": "^2.22.1", "moment": "^2.22.1",
"react": "16.8.6", "react": "16.9.0",
"react-native": "0.59.10", "react-native": "0.61.5",
"@react-native-community/async-storage": "^1.5.1", "@react-native-community/async-storage": "^1.5.1",
"react-native-camera": "^2.11.1", "react-native-camera": "^3.15.0",
"react-native-country-picker-modal": "^0.6.2", "react-native-country-picker-modal": "^1.10.0",
"react-native-exception-handler": "2.9.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-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-image-zoom-viewer": "^2.2.5",
"react-native-password-strength-meter": "^0.0.2", "react-native-password-strength-meter": "^0.0.2",
"react-native-phone-input": "lbryio/react-native-phone-input", "react-native-phone-input": "lbryio/react-native-phone-input",
"react-native-reanimated": "1.2.0", "react-native-reanimated": "1.4.0",
"react-native-snackbar": "1.0.2", "react-native-snackbar": "2.0.4",
"react-native-super-grid": "^3.0.4", "react-native-super-grid": "^3.0.4",
"react-native-vector-icons": "^6.6.0", "react-native-vector-icons": "^6.6.0",
"react-native-video": "lbryio/react-native-video#exoplayer-lbry-android", "react-native-video": "lbryio/react-native-video#7992ff945872f9bd00a3736d9ff1318f343abf47",
"react-navigation": "^3.11.0", "react-navigation": "^3.13.0",
"react-navigation-drawer": "^1.4.0", "react-navigation-drawer": "^2.3.3",
"react-navigation-redux-helpers": "^3.0.2", "react-navigation-redux-helpers": "^3.0.2",
"react-navigation-stack": "^1.8.1", "react-navigation-stack": "^1.8.1",
"react-redux": "^5.0.3", "react-redux": "^5.0.3",
"redux": "^4.0.4", "redux": "^4.0.4",
"redux-persist": "^5.10.0", "redux-persist": "^6.0.0",
"redux-persist-filesystem-storage": "^1.3.2", "redux-persist-filesystem-storage": "^2.1.0",
"redux-persist-transform-compress": "^4.2.0", "redux-persist-transform-compress": "^4.2.0",
"redux-persist-transform-filter": "0.0.18", "redux-persist-transform-filter": "0.0.18",
"redux-thunk": "^2.3.0", "redux-thunk": "^2.3.0",
"rn-fetch-blob": "0.10.15", "rn-fetch-blob": "0.12.0",
"seedrandom": "3.0.3" "seedrandom": "3.0.3"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.5.4", "@babel/core": "^7.6.2",
"babel-eslint": "10.0.2", "babel-eslint": "10.0.2",
"@babel/plugin-proposal-object-rest-spread": "^7.5.4", "@babel/plugin-proposal-object-rest-spread": "^7.5.4",
"babel-preset-env": "^1.6.1", "babel-preset-env": "^1.6.1",
"babel-preset-stage-2": "^6.18.0", "babel-preset-stage-2": "^6.18.0",
"babel-plugin-module-resolver": "^3.1.1", "babel-plugin-module-resolver": "^3.1.1",
"eslint": "^5.16.0", "eslint": "^6.5.1",
"eslint-config-standard": "^12.0.0", "eslint-config-standard": "^12.0.0",
"eslint-config-standard-jsx": "^6.0.2", "eslint-config-standard-jsx": "^6.0.2",
"eslint-plugin-flowtype": "^2.46.1", "eslint-plugin-flowtype": "^2.46.1",
@@ -67,8 +67,11 @@
"flow-babel-webpack-plugin": "^1.1.1", "flow-babel-webpack-plugin": "^1.1.1",
"husky": "^0.14.3", "husky": "^0.14.3",
"lint-staged": "^7.0.4", "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", "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"
} }
} }
+12
View File
@@ -0,0 +1,12 @@
import AsyncStorage from '@react-native-community/async-storage';
import Reactotron from 'reactotron-react-native';
import { reactotronRedux } from 'reactotron-redux';
const reactotron = 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
.use(reactotronRedux())
.connect();
export default reactotron;
+27
View File
@@ -51,6 +51,7 @@ import {
selectHashChanged, selectHashChanged,
selectUser, selectUser,
} from 'lbryinc'; } from 'lbryinc';
import { doStartDownload, doUpdateDownload, doCompleteDownload } from 'redux/actions/file';
import { makeSelectClientSetting, selectFullscreenMode } from 'redux/selectors/settings'; import { makeSelectClientSetting, selectFullscreenMode } from 'redux/selectors/settings';
import { decode as atob } from 'base-64'; import { decode as atob } from 'base-64';
import { dispatchNavigateBack, dispatchNavigateToUri, transformUrl } from 'utils/helper'; import { dispatchNavigateBack, dispatchNavigateToUri, transformUrl } from 'utils/helper';
@@ -311,6 +312,10 @@ class AppWithNavigationState extends React.Component {
this.emailVerifyCheckInterval = setInterval(() => this.checkEmailVerification(), 5000); this.emailVerifyCheckInterval = setInterval(() => this.checkEmailVerification(), 5000);
Linking.addEventListener('url', this._handleUrl); 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 // call /sync/get with interval
this.syncGetInterval = setInterval(() => { this.syncGetInterval = setInterval(() => {
this.setState({ syncHashChanged: false }); // reset local state this.setState({ syncHashChanged: false }); // reset local state
@@ -345,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() { componentWillUnmount() {
DeviceEventEmitter.removeListener('onDownloadStarted', this.handleDownloadStarted);
DeviceEventEmitter.removeListener('onDownloadUpdated', this.handleDownloadUpdated);
DeviceEventEmitter.removeListener('onDownloadCompleted', this.handleDownloadCompleted);
AppState.removeEventListener('change', this._handleAppStateChange); AppState.removeEventListener('change', this._handleAppStateChange);
BackHandler.removeEventListener('hardwareBackPress'); BackHandler.removeEventListener('hardwareBackPress');
Linking.removeEventListener('url', this._handleUrl); Linking.removeEventListener('url', this._handleUrl);
+1 -1
View File
@@ -10,7 +10,7 @@ import discoverStyle from 'styles/discover';
const groupedMenuItems = { const groupedMenuItems = {
'Find content': [ 'Find content': [
{ icon: 'hashtag', label: 'Your Tags', route: Constants.DRAWER_ROUTE_DISCOVER }, { icon: 'hashtag', label: 'Your Tags', route: Constants.DRAWER_ROUTE_DISCOVER },
{ icon: 'heart', solid: true, label: 'Subscriptions', route: Constants.DRAWER_ROUTE_SUBSCRIPTIONS }, { icon: 'heart', solid: true, label: 'Following', route: Constants.DRAWER_ROUTE_SUBSCRIPTIONS },
{ icon: 'globe-americas', label: 'All Content', route: Constants.DRAWER_ROUTE_TRENDING }, { icon: 'globe-americas', label: 'All Content', route: Constants.DRAWER_ROUTE_TRENDING },
], ],
'Your content': [ 'Your content': [
+2 -19
View File
@@ -11,11 +11,6 @@ class FileDownloadButton extends React.PureComponent {
} }
} }
componentWillReceiveProps(nextProps) {
// this.checkAvailability(nextProps.uri);
// this.restartDownload(nextProps);
}
restartDownload(props) { restartDownload(props) {
const { downloading, fileInfo, uri, restartDownload } = props; const { downloading, fileInfo, uri, restartDownload } = props;
@@ -35,7 +30,6 @@ class FileDownloadButton extends React.PureComponent {
fileInfo, fileInfo,
downloading, downloading,
uri, uri,
purchaseUri,
costInfo, costInfo,
isPlayable, isPlayable,
isViewable, isViewable,
@@ -45,6 +39,7 @@ class FileDownloadButton extends React.PureComponent {
doPause, doPause,
style, style,
openFile, openFile,
onFileActionPress,
onButtonLayout, onButtonLayout,
} = this.props; } = this.props;
@@ -72,19 +67,7 @@ class FileDownloadButton extends React.PureComponent {
text={isPlayable ? __('Play') : isViewable ? __('View') : __('Download')} text={isPlayable ? __('Play') : isViewable ? __('View') : __('Download')}
onLayout={onButtonLayout} onLayout={onButtonLayout}
style={[style, fileDownloadButtonStyle.container]} style={[style, fileDownloadButtonStyle.container]}
onPress={() => { onPress={onFileActionPress}
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();
}
}}
/> />
); );
} else if (fileInfo && fileInfo.download_path) { } else if (fileInfo && fileInfo.download_path) {
+1 -1
View File
@@ -36,5 +36,5 @@ const perform = dispatch => ({
export default connect( export default connect(
select, select,
perform perform,
)(FileListItem); )(FileListItem);
+13 -5
View File
@@ -6,6 +6,7 @@ import Colors from 'styles/colors';
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
import DateTime from 'component/dateTime'; import DateTime from 'component/dateTime';
import FileItemMedia from 'component/fileItemMedia'; import FileItemMedia from 'component/fileItemMedia';
import FilePrice from 'component/filePrice';
import Icon from 'react-native-vector-icons/FontAwesome5'; import Icon from 'react-native-vector-icons/FontAwesome5';
import Link from 'component/link'; import Link from 'component/link';
import NsfwOverlay from 'component/nsfwOverlay'; import NsfwOverlay from 'component/nsfwOverlay';
@@ -47,8 +48,8 @@ class FileListItem extends React.PureComponent {
} }
componentDidUpdate() { componentDidUpdate() {
const { claim, resolveUri, uri } = this.props; const { claim, resolveUri, uri, batchResolve } = this.props;
if (!claim && uri !== this.state.url) { if (!claim && uri !== this.state.url && !batchResolve) {
this.setState({ url: uri }, () => resolveUri(uri)); this.setState({ url: uri }, () => resolveUri(uri));
} }
} }
@@ -158,8 +159,15 @@ class FileListItem extends React.PureComponent {
</View> </View>
)} )}
{fileInfo && fileInfo.completed && fileInfo.download_path && ( {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}
/>
)} )}
<FilePrice uri={uri} style={fileListStyle.filePriceContainer} textStyle={fileListStyle.filePriceText} />
<View style={fileListStyle.detailsContainer}> <View style={fileListStyle.detailsContainer}>
{featuredResult && ( {featuredResult && (
<Text style={fileListStyle.featuredUri} numberOfLines={1}> <Text style={fileListStyle.featuredUri} numberOfLines={1}>
@@ -172,7 +180,7 @@ class FileListItem extends React.PureComponent {
{!title && !name && <Text style={fileListStyle.uri}>{uri}</Text>} {!title && !name && <Text style={fileListStyle.uri}>{uri}</Text>}
{!title && !name && ( {!title && !name && (
<View style={fileListStyle.row}> <View style={fileListStyle.row}>
<ActivityIndicator size={'small'} color={featuredResult ? Colors.White : Colors.LbryGreen} /> <ActivityIndicator size={'small'} color={featuredResult ? Colors.White : Colors.NextLbryGreen} />
</View> </View>
)} )}
</View> </View>
@@ -203,7 +211,7 @@ class FileListItem extends React.PureComponent {
normalizeURI(shortChannelUri || fullChannelUri), normalizeURI(shortChannelUri || fullChannelUri),
null, null,
false, false,
fullChannelUri fullChannelUri,
); );
}} }}
/> />
+19 -10
View File
@@ -10,6 +10,8 @@ import Icon from 'react-native-vector-icons/FontAwesome5';
import Link from 'component/link'; import Link from 'component/link';
export default class ModalTipView extends React.PureComponent { export default class ModalTipView extends React.PureComponent {
tipAmountInput = null;
state = { state = {
creditsInputFocused: false, creditsInputFocused: false,
sendTipStarted: false, sendTipStarted: false,
@@ -30,11 +32,11 @@ export default class ModalTipView extends React.PureComponent {
const amount = parseInt(tipAmount, 10); const amount = parseInt(tipAmount, 10);
const message = const message =
amount === 1 amount === 1
? __('Are you sure you want to tip %amount% credit', { amount }) ? __('Please confirm you want to tip %amount% credit', { amount })
: __('Are you sure you want to tip %amount% credits', { amount }); : __('Please confirm you want to tip %amount% credits', { amount });
Alert.alert( Alert.alert(
__('Send tip'), __('Send Tip'),
message, message,
[ [
{ text: __('No') }, { text: __('No') },
@@ -71,7 +73,14 @@ export default class ModalTipView extends React.PureComponent {
return ( return (
<TouchableOpacity style={modalStyle.overlay} activeOpacity={1} onPress={onOverlayPress}> <TouchableOpacity style={modalStyle.overlay} activeOpacity={1} onPress={onOverlayPress}>
<TouchableOpacity style={modalStyle.container} activeOpacity={1}> <TouchableOpacity style={modalStyle.container} activeOpacity={1}>
<View style={modalTipStyle.container}> <View
style={modalTipStyle.container}
onLayout={() => {
if (this.tipAmountInput) {
this.tipAmountInput.focus();
}
}}
>
<Text style={modalTipStyle.title} numberOfLines={1}> <Text style={modalTipStyle.title} numberOfLines={1}>
{channelName ? __('Send a tip to %channel%', { channel: channelName }) : __('Send a tip')} {channelName ? __('Send a tip to %channel%', { channel: channelName }) : __('Send a tip')}
</Text> </Text>
@@ -107,13 +116,13 @@ export default class ModalTipView extends React.PureComponent {
{__( {__(
'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.',
{ content: contentName } { content: contentName }
)} )}{' '}
<Link
style={modalTipStyle.learnMoreLink}
text={__('Learn more.')}
href={'https://lbry.com/faq/tipping'}
/>
</Text> </Text>
<Link
style={modalTipStyle.learnMoreLink}
text={__('Learn more.')}
href={'https://lbry.com/faq/tipping'}
/>
</View> </View>
<View style={modalTipStyle.buttonRow}> <View style={modalTipStyle.buttonRow}>
+6 -4
View File
@@ -1,25 +1,27 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { import {
doResolveUris, doResolveUris,
doSearch,
makeSelectClaimForUri, makeSelectClaimForUri,
makeSelectRecommendedContentForUri, makeSelectRecommendedContentForUri,
makeSelectTitleForUri, selectResolvingUris,
selectIsSearching, selectIsSearching,
} from 'lbry-redux'; } from 'lbry-redux';
import RelatedContent from './view'; import RelatedContent from './view';
const select = (state, props) => ({ const select = (state, props) => ({
claim: makeSelectClaimForUri(props.uri)(state), claim: makeSelectClaimForUri(props.uri)(state),
recommendedContent: makeSelectRecommendedContentForUri(props.uri)(state),
title: makeSelectTitleForUri(props.uri)(state),
isSearching: selectIsSearching(state), isSearching: selectIsSearching(state),
recommendedContent: makeSelectRecommendedContentForUri(props.uri)(state),
resolvingUris: selectResolvingUris(state),
}); });
const perform = dispatch => ({ const perform = dispatch => ({
resolveUris: uris => dispatch(doResolveUris(uris)), resolveUris: uris => dispatch(doResolveUris(uris)),
searchRecommended: query => dispatch(doSearch(query, 20, undefined, true, false)),
}); });
export default connect( export default connect(
select, select,
perform perform,
)(RelatedContent); )(RelatedContent);
+35 -8
View File
@@ -9,26 +9,53 @@ import relatedContentStyle from 'styles/relatedContent';
export default class RelatedContent extends React.PureComponent { export default class RelatedContent extends React.PureComponent {
state = { state = {
urlsResolved: false, resolveStarted: false,
}; };
componentDidUpdate(prevProps) { componentDidMount() {
const { resolveUris, recommendedContent } = this.props; const { title, searchRecommended } = this.props;
if (title) {
searchRecommended(title);
}
}
if (recommendedContent && recommendedContent.length > 0 && !this.state.urisResolved) { shouldComponentUpdate(nextProps, nextState) {
this.setState({ urisResolved: true }, () => { const { isSearching, recommendedContent } = nextProps;
// batch resolve the uris return isSearching || (!isSearching && this.allContentResolved());
resolveUris(recommendedContent); }
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() { render() {
const { recommendedContent, navigation, uri, fullUri } = this.props; const { isSearching, recommendedContent, navigation, uri, fullUri } = this.props;
return ( return (
<View style={relatedContentStyle.container}> <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 &&
recommendedContent recommendedContent
.filter(recommendedUri => recommendedUri !== normalizeURI(fullUri)) .filter(recommendedUri => recommendedUri !== normalizeURI(fullUri))
+15 -5
View File
@@ -46,7 +46,7 @@ class UriBar extends React.PureComponent {
const { currentRoute: prevRoute } = this.props; const { currentRoute: prevRoute } = this.props;
if (Constants.DRAWER_ROUTE_SEARCH === currentRoute && currentRoute !== prevRoute) { if (Constants.DRAWER_ROUTE_SEARCH === currentRoute && currentRoute !== prevRoute) {
this.setState({ currentValue: query, inputText: query }); this.setState({ currentValue: query, inputText: query }, () => this.setCaretPosition(query));
} }
} }
@@ -75,7 +75,9 @@ class UriBar extends React.PureComponent {
} }
}, UriBar.INPUT_TIMEOUT); }, UriBar.INPUT_TIMEOUT);
} }
this.setState({ inputText: newValue, currentValue: newValue, changeTextTimeout: timeout }); this.setState({ inputText: newValue, currentValue: newValue, changeTextTimeout: timeout }, () =>
this.setCaretPosition(newValue),
);
}; };
handleItemPress = item => { handleItemPress = item => {
@@ -85,7 +87,7 @@ class UriBar extends React.PureComponent {
Keyboard.dismiss(); Keyboard.dismiss();
if (SEARCH_TYPES.SEARCH === type) { if (SEARCH_TYPES.SEARCH === type) {
this.setState({ currentValue: value }); this.setState({ currentValue: value }, () => this.setCaretPosition(value));
updateSearchQuery(value); updateSearchQuery(value);
if (onSearchSubmitted) { if (onSearchSubmitted) {
@@ -129,6 +131,12 @@ class UriBar extends React.PureComponent {
} }
} }
setCaretPosition(text) {
if (this.textInput && text && text.length > 0) {
this.textInput.setNativeProps({ selection: { start: text.length, end: text.length } });
}
}
handleSubmitEditing = () => { handleSubmitEditing = () => {
const { navigation, onSearchSubmitted, updateSearchQuery } = this.props; const { navigation, onSearchSubmitted, updateSearchQuery } = this.props;
if (this.state.inputText) { if (this.state.inputText) {
@@ -179,7 +187,7 @@ class UriBar extends React.PureComponent {
value, value,
} = this.props; } = this.props;
if (this.state.currentValue === null) { if (this.state.currentValue === null) {
this.setState({ currentValue: value }); this.setState({ currentValue: value }, () => this.setCaretPosition(value));
} }
let style = [ let style = [
@@ -253,7 +261,9 @@ class UriBar extends React.PureComponent {
autoCorrect={false} autoCorrect={false}
style={uriBarStyle.uriText} style={uriBarStyle.uriText}
onLayout={() => { onLayout={() => {
this.setSelection(); if (!this.state.focused) {
this.setSelection();
}
}} }}
selectTextOnFocus selectTextOnFocus
placeholder={__('Search movies, music, and more')} placeholder={__('Search movies, music, and more')}
+6 -2
View File
@@ -38,9 +38,10 @@ class WalletSend extends React.PureComponent<Props> {
handleSend = () => { handleSend = () => {
const { balance, sendToAddress, notify } = this.props; const { balance, sendToAddress, notify } = this.props;
const { address, amount } = this.state; const { address, amount } = this.state;
if (address && !regexAddress.test(address)) { if (address && (!regexAddress.test(address) || address.substring(0, 1) === 'r')) {
notify({ notify({
message: __('The recipient address is not a valid LBRY address.'), message: __('The recipient address is not a valid LBRY address.'),
isError: true,
}); });
return; return;
} }
@@ -48,6 +49,7 @@ class WalletSend extends React.PureComponent<Props> {
if (amount > balance) { if (amount > balance) {
notify({ notify({
message: __('Insufficient credits'), message: __('Insufficient credits'),
isError: true,
}); });
return; return;
} }
@@ -72,6 +74,7 @@ class WalletSend extends React.PureComponent<Props> {
const { notify } = this.props; const { notify } = this.props;
notify({ notify({
message: __('The recipient address is not a valid LBRY address.'), message: __('The recipient address is not a valid LBRY address.'),
isError: true,
}); });
} }
}; };
@@ -97,9 +100,10 @@ class WalletSend extends React.PureComponent<Props> {
this.setState({ this.setState({
address: value, address: value,
addressChanged: true, addressChanged: true,
addressValid: value.trim().length === 0 || regexAddress.test(value), addressValid: value.trim().length === 0 || (regexAddress.test(value) && !value.startsWith('r')),
}) })
} }
numberOfLines={1}
onBlur={this.handleAddressInputBlur} onBlur={this.handleAddressInputBlur}
onSubmitEditing={this.handleAddressInputSubmit} onSubmitEditing={this.handleAddressInputSubmit}
placeholder={'bbFxRyXXXXXXXXXXXZD8nE7XTLUxYnddTs'} placeholder={'bbFxRyXXXXXXXXXXXZD8nE7XTLUxYnddTs'}
+4 -3
View File
@@ -52,8 +52,9 @@ function checkMessageAndSave(message, messagesFilePath) {
); */ ); */
}) })
.catch(err => { .catch(err => {
if (err) { if (err && !isProduction) {
throw err; // 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 translatedMessage.replace(/%([^%]+)%/g, function($1, $2) {
return tokens[$2] || $2; return tokens.hasOwnProperty($2) ? tokens[$2] : $2;
}); });
} }
+4 -3
View File
@@ -42,6 +42,7 @@ import AppWithNavigationState, {
} from 'component/AppNavigator'; } from 'component/AppNavigator';
import { REHYDRATE, PURGE, persistCombineReducers, persistStore } from 'redux-persist'; import { REHYDRATE, PURGE, persistCombineReducers, persistStore } from 'redux-persist';
import { __ } from 'i18n'; import { __ } from 'i18n';
import reactotron from '../reactotron';
import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
import getStoredStateMigrateV4 from 'redux-persist/lib/integration/getStoredStateMigrateV4'; import getStoredStateMigrateV4 from 'redux-persist/lib/integration/getStoredStateMigrateV4';
import FilesystemStorage from 'redux-persist-filesystem-storage'; import FilesystemStorage from 'redux-persist-filesystem-storage';
@@ -57,7 +58,7 @@ window.__ = __;
const globalExceptionHandler = (error, isFatal) => { const globalExceptionHandler = (error, isFatal) => {
if (error && NativeModules.Firebase) { 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); setJSExceptionHandler(globalExceptionHandler, true);
@@ -179,7 +180,7 @@ const sharedStateCallback = ({ dispatch, getState }) => {
const emailVerified = selectUserVerifiedEmail(state); const emailVerified = selectUserVerifiedEmail(state);
if (syncEnabled && emailVerified) { if (syncEnabled && emailVerified) {
NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(password => NativeModules.UtilityModule.getSecureValue(Constants.KEY_WALLET_PASSWORD).then(password =>
dispatch(doGetSync(password)) dispatch(doGetSync(password)),
); );
} }
}; };
@@ -195,7 +196,7 @@ const composeEnhancers = compose;
const store = createStore( const store = createStore(
enableBatching(reducers), enableBatching(reducers),
{}, // initial state, {}, // initial state,
composeEnhancers(applyMiddleware(...middleware)) composeEnhancers(applyMiddleware(...middleware), reactotron.createEnhancer()),
); );
window.store = store; window.store = store;
+1 -1
View File
@@ -261,7 +261,7 @@ class ChannelPage extends React.PureComponent {
<View style={channelPageStyle.channelHeader}> <View style={channelPageStyle.channelHeader}>
<Text style={channelPageStyle.channelName}>{title && title.trim().length > 0 ? title : name}</Text> <Text style={channelPageStyle.channelName}>{title && title.trim().length > 0 ? title : name}</Text>
<Text style={channelPageStyle.followerCount}> <Text style={[channelPageStyle.followerCount, subCount >= 1 ? channelPageStyle.followerCountBg : null]}>
{subCount === 1 && __('%follower% follower', { follower: subCount })} {subCount === 1 && __('%follower% follower', { follower: subCount })}
{subCount > 1 && __('%follower% followers', { follower: subCount })} {subCount > 1 && __('%follower% followers', { follower: subCount })}
</Text> </Text>
+4 -15
View File
@@ -8,7 +8,7 @@ import {
doPurchaseUri, doPurchaseUri,
doDeletePurchasedUri, doDeletePurchasedUri,
doResolveUri, doResolveUri,
doSearch, doResolveUris,
doSendTip, doSendTip,
doToast, doToast,
makeSelectIsUriResolving, makeSelectIsUriResolving,
@@ -18,7 +18,6 @@ import {
makeSelectContentPositionForUri, makeSelectContentPositionForUri,
makeSelectContentTypeForUri, makeSelectContentTypeForUri,
makeSelectMetadataForUri, makeSelectMetadataForUri,
makeSelectRecommendedContentForUri,
makeSelectStreamingUrlForUri, makeSelectStreamingUrlForUri,
makeSelectThumbnailForUri, makeSelectThumbnailForUri,
makeSelectTitleForUri, makeSelectTitleForUri,
@@ -39,13 +38,7 @@ import {
selectRewardContentClaimIds, selectRewardContentClaimIds,
selectBlackListedOutpoints, selectBlackListedOutpoints,
} from 'lbryinc'; } from 'lbryinc';
import { import { doDeleteFile, doStopDownloadingFile } from 'redux/actions/file';
doStartDownload,
doUpdateDownload,
doCompleteDownload,
doDeleteFile,
doStopDownloadingFile,
} from 'redux/actions/file';
import { doPushDrawerStack, doPopDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer'; import { doPushDrawerStack, doPopDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
import { doToggleFullscreenMode } from 'redux/actions/settings'; import { doToggleFullscreenMode } from 'redux/actions/settings';
import { selectDrawerStack } from 'redux/selectors/drawer'; import { selectDrawerStack } from 'redux/selectors/drawer';
@@ -76,7 +69,6 @@ const select = (state, props) => {
streamingUrl: makeSelectStreamingUrlForUri(contentUri)(state), streamingUrl: makeSelectStreamingUrlForUri(contentUri)(state),
thumbnail: makeSelectThumbnailForUri(contentUri)(state), thumbnail: makeSelectThumbnailForUri(contentUri)(state),
title: makeSelectTitleForUri(contentUri)(state), title: makeSelectTitleForUri(contentUri)(state),
recommendedContent: makeSelectRecommendedContentForUri(contentUri)(state),
isSearchingRecommendContent: selectIsSearching(state), isSearchingRecommendContent: selectIsSearching(state),
viewCount: makeSelectViewCountForUri(contentUri)(state), viewCount: makeSelectViewCountForUri(contentUri)(state),
}; };
@@ -100,18 +92,15 @@ const perform = dispatch => ({
purchaseUri: (uri, costInfo, saveFile) => dispatch(doPurchaseUri(uri, costInfo, saveFile)), purchaseUri: (uri, costInfo, saveFile) => dispatch(doPurchaseUri(uri, costInfo, saveFile)),
deletePurchasedUri: uri => dispatch(doDeletePurchasedUri(uri)), deletePurchasedUri: uri => dispatch(doDeletePurchasedUri(uri)),
resolveUri: uri => dispatch(doResolveUri(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) => sendTip: (amount, claimId, isSupport, successCallback, errorCallback) =>
dispatch(doSendTip(amount, claimId, isSupport, successCallback, errorCallback)), dispatch(doSendTip(amount, claimId, isSupport, successCallback, errorCallback)),
setPlayerVisible: () => dispatch(doSetPlayerVisible(true)), setPlayerVisible: () => dispatch(doSetPlayerVisible(true)),
stopDownload: (uri, fileInfo) => dispatch(doStopDownloadingFile(uri, fileInfo)), 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)), toggleFullscreenMode: mode => dispatch(doToggleFullscreenMode(mode)),
}); });
export default connect( export default connect(
select, select,
perform perform,
)(FilePage); )(FilePage);
+390 -329
View File
@@ -72,6 +72,7 @@ class FilePage extends React.PureComponent {
fileViewLogged: false, fileViewLogged: false,
fullscreenMode: false, fullscreenMode: false,
fileGetStarted: false, fileGetStarted: false,
hasCheckedAllResolved: false,
imageUrls: null, imageUrls: null,
isLandscape: false, isLandscape: false,
mediaLoaded: false, mediaLoaded: false,
@@ -86,6 +87,7 @@ class FilePage extends React.PureComponent {
playerHeight: 0, playerHeight: 0,
uri: null, uri: null,
uriVars: null, uriVars: null,
showRecommended: false,
stopDownloadConfirmed: false, stopDownloadConfirmed: false,
streamingMode: false, streamingMode: false,
viewCountFetched: false, viewCountFetched: false,
@@ -101,29 +103,24 @@ class FilePage extends React.PureComponent {
onComponentFocused = () => { onComponentFocused = () => {
StatusBar.setHidden(false); StatusBar.setHidden(false);
NativeModules.Firebase.setCurrentScreen('File'); NativeModules.Firebase.setCurrentScreen('File').then(result => {
DeviceEventEmitter.addListener('onStoragePermissionGranted', this.handleStoragePermissionGranted);
DeviceEventEmitter.addListener('onStoragePermissionRefused', this.handleStoragePermissionRefused);
DeviceEventEmitter.addListener('onDownloadStarted', this.handleDownloadStarted); const { claim, fetchMyClaims, fileInfo, isResolvingUri, resolveUri, navigation } = this.props;
DeviceEventEmitter.addListener('onDownloadUpdated', this.handleDownloadUpdated); const { uri, uriVars } = navigation.state.params;
DeviceEventEmitter.addListener('onDownloadCompleted', this.handleDownloadCompleted); this.setState({ uri, uriVars });
const { fetchMyClaims, fileInfo, isResolvingUri, resolveUri, navigation } = this.props; if (!isResolvingUri && !claim) resolveUri(uri);
const { uri, uriVars } = navigation.state.params;
this.setState({ uri, uriVars });
if (!isResolvingUri) resolveUri(uri); this.fetchFileInfo(uri, this.props);
this.fetchCostInfo(uri, this.props);
this.fetchFileInfo(this.props); fetchMyClaims();
this.fetchCostInfo(this.props);
fetchMyClaims();
if (NativeModules.Firebase) {
NativeModules.Firebase.track('open_file_page', { uri: uri }); NativeModules.Firebase.track('open_file_page', { uri: uri });
}
if (NativeModules.UtilityModule) {
NativeModules.UtilityModule.keepAwakeOn(); NativeModules.UtilityModule.keepAwakeOn();
} });
}; };
componentDidMount() { componentDidMount() {
@@ -151,6 +148,7 @@ class FilePage extends React.PureComponent {
navigation, navigation,
contentType, contentType,
notify, notify,
recommendedContent: prevRecommendedContent,
drawerStack: prevDrawerStack, drawerStack: prevDrawerStack,
} = this.props; } = this.props;
const { uri } = navigation.state.params; const { uri } = navigation.state.params;
@@ -162,6 +160,8 @@ class FilePage extends React.PureComponent {
purchaseUriErrorMessage, purchaseUriErrorMessage,
streamingUrl, streamingUrl,
drawerStack, drawerStack,
recommendedContent,
resolveUris,
} = nextProps; } = nextProps;
if (Constants.ROUTE_FILE === currentRoute && currentRoute !== prevRoute) { if (Constants.ROUTE_FILE === currentRoute && currentRoute !== prevRoute) {
@@ -177,11 +177,9 @@ class FilePage extends React.PureComponent {
const mediaType = Lbry.getMediaType(contentType); const mediaType = Lbry.getMediaType(contentType);
const isPlayable = mediaType === 'video' || mediaType === 'audio'; const isPlayable = mediaType === 'video' || mediaType === 'audio';
if ( if (this.state.fileGetStarted || prevPurchasedUris.length !== purchasedUris.length) {
(this.state.fileGetStarted || prevPurchasedUris.length !== purchasedUris.length) && const { permanent_url: permanentUrl } = claim;
NativeModules.UtilityModule if (purchasedUris.includes(uri) || purchasedUris.includes(permanentUrl)) {
) {
if (purchasedUris.includes(uri)) {
const { nout, txid } = claim; const { nout, txid } = claim;
const outpoint = `${txid}:${nout}`; const outpoint = `${txid}:${nout}`;
NativeModules.UtilityModule.queueDownload(outpoint); NativeModules.UtilityModule.queueDownload(outpoint);
@@ -216,9 +214,23 @@ class FilePage extends React.PureComponent {
if (claim && !this.state.viewCountFetched) { if (claim && !this.state.viewCountFetched) {
this.setState({ viewCountFetched: true }, () => fetchViewCount(claim.claim_id)); this.setState({ viewCountFetched: true }, () => fetchViewCount(claim.claim_id));
} }
if (
(!prevRecommendedContent && recommendedContent) ||
(recommendedContent && prevRecommendedContent && recommendedContent.length !== prevRecommendedContent.length)
) {
resolveUris(recommendedContent);
}
} }
componentDidUpdate(prevProps) { shouldComponentUpdate(nextProps, nextState) {
return (
Object.keys(this.difference(nextProps, this.props)).length > 0 ||
Object.keys(this.difference(nextState, this.state)).length > 0
);
}
componentDidUpdate(prevProps, prevState) {
const { const {
claim, claim,
contentType, contentType,
@@ -228,7 +240,6 @@ class FilePage extends React.PureComponent {
resolveUri, resolveUri,
navigation, navigation,
purchaseUri, purchaseUri,
searchRecommended,
title, title,
} = this.props; } = this.props;
const { uri } = this.state; const { uri } = this.state;
@@ -236,10 +247,6 @@ class FilePage extends React.PureComponent {
resolveUri(uri); resolveUri(uri);
} }
if (title && !this.state.didSearchRecommended) {
this.setState({ didSearchRecommended: true }, () => searchRecommended(title));
}
// Returned to the page. If mediaLoaded, and currentMediaInfo is different, update // Returned to the page. If mediaLoaded, and currentMediaInfo is different, update
if (this.state.mediaLoaded && window.currentMediaInfo && window.currentMediaInfo.uri !== this.state.uri) { if (this.state.mediaLoaded && window.currentMediaInfo && window.currentMediaInfo.uri !== this.state.uri) {
const { metadata } = this.props; const { metadata } = this.props;
@@ -252,29 +259,26 @@ class FilePage extends React.PureComponent {
// attempt to retrieve images and html/text automatically once the claim is loaded, and it's free // attempt to retrieve images and html/text automatically once the claim is loaded, and it's free
const mediaType = Lbry.getMediaType(contentType); const mediaType = Lbry.getMediaType(contentType);
const isPlayable = mediaType === 'video' || mediaType === 'audio';
const isViewable = mediaType === 'image' || mediaType === 'text'; const isViewable = mediaType === 'image' || mediaType === 'text';
if (claim && costInfo && costInfo.cost === 0 && !this.state.autoGetAttempted && isViewable) { if (claim && costInfo && costInfo.cost === 0 && !this.state.autoGetAttempted && isViewable) {
this.setState( this.setState({ autoGetAttempted: true }, () => this.checkStoragePermissionForDownload());
{ }
autoGetAttempted: true,
downloadPressed: true, if (((costInfo && costInfo.cost > 0) || !isPlayable) && !this.state.showRecommended) {
autoPlayMedia: true, this.setState({ showRecommended: true });
stopDownloadConfirmed: false,
},
() => purchaseUri(claim.permanent_url, costInfo, true)
);
} }
} }
fetchFileInfo(props) { fetchFileInfo(uri, props) {
if (props.fileInfo === undefined) { if (props.fileInfo === undefined) {
props.fetchFileInfo(props.navigation.state.params.uri); props.fetchFileInfo(uri);
} }
} }
fetchCostInfo(props) { fetchCostInfo(uri, props) {
if (props.costInfo === undefined) { if (props.costInfo === undefined) {
props.fetchCostInfo(props.navigation.state.params.uri); props.fetchCostInfo(uri);
} }
} }
@@ -309,12 +313,12 @@ class FilePage extends React.PureComponent {
const { abandonClaim, claim, deleteFile, deletePurchasedUri, myClaimUris, fileInfo, navigation } = this.props; const { abandonClaim, claim, deleteFile, deletePurchasedUri, myClaimUris, fileInfo, navigation } = this.props;
Alert.alert( Alert.alert(
'Delete file', __('Delete file'),
'Are you sure you want to remove this file from your device?', __('Are you sure you want to remove this file from your device?'),
[ [
{ text: 'No' }, { text: __('No') },
{ {
text: 'Yes', text: __('Yes'),
onPress: () => { onPress: () => {
const { uri } = navigation.state.params; const { uri } = navigation.state.params;
@@ -341,7 +345,7 @@ class FilePage extends React.PureComponent {
}, },
}, },
], ],
{ cancelable: true } { cancelable: true },
); );
}; };
@@ -377,7 +381,7 @@ class FilePage extends React.PureComponent {
}, },
}, },
], ],
{ cancelable: true } { cancelable: true },
); );
}; };
@@ -399,27 +403,34 @@ class FilePage extends React.PureComponent {
} }
window.player = null; window.player = null;
DeviceEventEmitter.removeListener('onDownloadStarted', this.handleDownloadStarted); DeviceEventEmitter.removeListener('onStoragePermissionGranted', this.handleStoragePermissionGranted);
DeviceEventEmitter.removeListener('onDownloadUpdated', this.handleDownloadUpdated); DeviceEventEmitter.removeListener('onStoragePermissionRefused', this.handleStoragePermissionRefused);
DeviceEventEmitter.removeListener('onDownloadCompleted', this.handleDownloadCompleted);
} }
handleDownloadStarted = evt => { handleStoragePermissionGranted = () => {
const { startDownload } = this.props; // permission was allowed. proceed to download
const { uri, outpoint, fileInfo } = evt; const { notify } = this.props;
startDownload(uri, outpoint, fileInfo);
// update the configured download folder and then download
NativeModules.UtilityModule.getDownloadDirectory().then(downloadDirectory => {
Lbry.settings_set({
key: 'download_dir',
value: downloadDirectory,
})
.then(() => this.performDownload())
.catch(() => {
notify({ message: 'The file could not be downloaded to the default download directory.', isError: true });
});
});
}; };
handleDownloadUpdated = evt => { handleStoragePermissionRefused = () => {
const { updateDownload } = this.props; const { notify } = this.props;
const { uri, outpoint, fileInfo, progress } = evt; this.setState({ downloadPressed: false });
updateDownload(uri, outpoint, fileInfo, progress); notify({
}; message: __('The file could not be downloaded because the permission to write to storage was not granted.'),
isError: true,
handleDownloadCompleted = evt => { });
const { completeDownload } = this.props;
const { uri, outpoint, fileInfo } = evt;
completeDownload(uri, outpoint, fileInfo);
}; };
localUriForFileInfo = fileInfo => { localUriForFileInfo = fileInfo => {
@@ -536,6 +547,9 @@ class FilePage extends React.PureComponent {
payload['time_to_start_ms'] = timeToStartMillis; payload['time_to_start_ms'] = timeToStartMillis;
} }
NativeModules.Firebase.track('play', payload); NativeModules.Firebase.track('play', payload);
// only fetch recommended content after playback has started
this.setState({ showRecommended: true });
}; };
onPlaybackFinished = () => { onPlaybackFinished = () => {
@@ -589,14 +603,80 @@ class FilePage extends React.PureComponent {
)); ));
}; };
onFileDownloadButtonPlayed = () => { confirmPurchaseUri = (uri, costInfo, download) => {
const { setPlayerVisible } = this.props; const { notify, purchaseUri, title } = this.props;
this.startTime = Date.now(); const { cost } = costInfo;
this.setState({ downloadPressed: true, autoPlayMedia: true, stopDownloadConfirmed: false });
setPlayerVisible(); if (!costInfo) {
notify({ message: __('This content cannot be viewed at this time. Please try again in a bit.'), isError: true });
return;
}
if (costInfo.cost > 0) {
Alert.alert(
__('Confirm Purchase'),
__(
cost === 1
? 'This will purchase "%title%" for %amount% credit'
: 'This will purchase "%title%" for %amount% credits',
{ title, amount: cost },
),
[
{
text: __('OK'),
onPress: () => purchaseUri(uri, costInfo, download),
},
{ text: __('Cancel') },
],
);
} else {
// Free content. Just call purchaseUri directly.
purchaseUri(uri, costInfo, download);
}
};
onFileDownloadButtonPressed = () => {
const { claim, costInfo, contentType, purchaseUri, setPlayerVisible } = this.props;
const mediaType = Lbry.getMediaType(contentType);
const isPlayable = mediaType === 'video' || mediaType === 'audio';
const isViewable = mediaType === 'image' || mediaType === 'text';
const { permanent_url: uri } = claim;
NativeModules.Firebase.track('purchase_uri', { uri: uri });
if (!isPlayable) {
this.checkStoragePermissionForDownload();
} else {
this.confirmPurchaseUri(uri, costInfo, !isPlayable);
}
if (isPlayable) {
this.startTime = Date.now();
this.setState({ downloadPressed: true, autoPlayMedia: true, stopDownloadConfirmed: false });
setPlayerVisible();
}
if (isViewable) {
this.setState({ downloadPressed: true });
}
}; };
onDownloadPressed = () => { onDownloadPressed = () => {
this.checkStoragePermissionForDownload();
};
checkStoragePermissionForDownload = () => {
// check if we the permission to write to external storage has been granted
NativeModules.UtilityModule.canReadWriteStorage().then(canReadWrite => {
if (!canReadWrite) {
// request permission
NativeModules.UtilityModule.requestStoragePermission();
} else {
this.performDownload();
}
});
};
performDownload = () => {
const { claim, costInfo, purchaseUri } = this.props; const { claim, costInfo, purchaseUri } = this.props;
this.setState( this.setState(
{ {
@@ -604,7 +684,10 @@ class FilePage extends React.PureComponent {
autoPlayMedia: false, autoPlayMedia: false,
stopDownloadConfirmed: false, stopDownloadConfirmed: false,
}, },
() => purchaseUri(claim.permanent_url, costInfo, true) () => {
this.confirmPurchaseUri(claim.permanent_url, costInfo, true);
NativeModules.UtilityModule.checkDownloads();
},
); );
}; };
@@ -621,14 +704,7 @@ class FilePage extends React.PureComponent {
// file already in library or URI already purchased, use fileGet directly // file already in library or URI already purchased, use fileGet directly
this.setState({ fileGetStarted: true }, () => fileGet(uri, true)); this.setState({ fileGetStarted: true }, () => fileGet(uri, true));
} else { } else {
this.setState( this.checkStoragePermissionForDownload();
{
downloadPressed: true,
autoPlayMedia: false,
stopDownloadConfirmed: false,
},
() => purchaseUri(uri, costInfo, true)
);
} }
}; };
@@ -648,7 +724,7 @@ class FilePage extends React.PureComponent {
], ],
showImageViewer: true, showImageViewer: true,
}, },
() => pushDrawerStack(Constants.DRAWER_ROUTE_FILE_VIEW) () => pushDrawerStack(Constants.DRAWER_ROUTE_FILE_VIEW),
); );
} }
} }
@@ -659,23 +735,12 @@ class FilePage extends React.PureComponent {
{ {
showWebView: true, showWebView: true,
}, },
() => pushDrawerStack(Constants.DRAWER_ROUTE_FILE_VIEW) () => pushDrawerStack(Constants.DRAWER_ROUTE_FILE_VIEW),
); );
} }
} }
}; };
onMediaContainerPressed = () => {
const { costInfo, contentType, purchaseUri } = this.props;
const { uri } = this.state;
const mediaType = Lbry.getMediaType(contentType);
const isPlayable = mediaType === 'video' || mediaType === 'audio';
purchaseUri(uri, costInfo, isPlayable);
if (isPlayable) {
this.onFileDownloadButtonPlayed();
}
};
render() { render() {
const { const {
balance, balance,
@@ -710,7 +775,7 @@ class FilePage extends React.PureComponent {
let innerContent = null; let innerContent = null;
if ((isResolvingUri && !claim) || !claim) { if ((isResolvingUri && !claim) || !claim) {
return ( return (
<View style={filePageStyle.container}> <View style={filePageStyle.pageContainer}>
<UriBar value={uri} navigation={navigation} /> <UriBar value={uri} navigation={navigation} />
{isResolvingUri && ( {isResolvingUri && (
<View style={filePageStyle.busyContainer}> <View style={filePageStyle.busyContainer}>
@@ -748,232 +813,233 @@ class FilePage extends React.PureComponent {
); );
} }
if (claim) { let isClaimBlackListed = false;
if (isChannel) { if (blackListedOutpoints) {
return <ChannelPage uri={uri} navigation={navigation} />; for (let i = 0; i < blackListedOutpoints.length; i += 1) {
} const outpoint = blackListedOutpoints[i];
if (outpoint.txid === claim.txid && outpoint.nout === claim.nout) {
let isClaimBlackListed = false; isClaimBlackListed = true;
break;
if (blackListedOutpoints) {
for (let i = 0; i < blackListedOutpoints.length; i += 1) {
const outpoint = blackListedOutpoints[i];
if (outpoint.txid === claim.txid && outpoint.nout === claim.nout) {
isClaimBlackListed = true;
break;
}
} }
} }
}
if (isClaimBlackListed) { if (isClaimBlackListed) {
return ( innerContent = (
<View style={filePageStyle.pageContainer}> <View style={filePageStyle.dmcaContainer}>
<View style={filePageStyle.dmcaContainer}> <Text style={filePageStyle.dmcaText}>
<Text style={filePageStyle.dmcaText}> {__(
{__( 'In response to a complaint we received under the US Digital Millennium Copyright Act, we have blocked access to this content from our applications.',
'In response to a complaint we received under the US Digital Millennium Copyright Act, we have blocked access to this content from our applications.' )}
)} </Text>
</Text> <Link style={filePageStyle.dmcaLink} href="https://lbry.com/faq/dmca" text={__('Read More')} />
<Link style={filePageStyle.dmcaLink} href="https://lbry.com/faq/dmca" text={__('Read More')} /> </View>
</View> );
<UriBar value={uri} navigation={navigation} /> }
</View>
);
}
let tags = []; let tags = [];
if (claim && claim.value && claim.value.tags) { if (claim && claim.value && claim.value.tags) {
tags = claim.value.tags; tags = claim.value.tags;
} }
const completed = fileInfo && fileInfo.completed; const completed = fileInfo && fileInfo.completed;
const isRewardContent = rewardedContentClaimIds.includes(claim.claim_id); const isRewardContent = rewardedContentClaimIds.includes(claim.claim_id);
const description = metadata.description ? metadata.description : null; const description = metadata.description ? metadata.description : null;
const mediaType = Lbry.getMediaType(contentType); const mediaType = Lbry.getMediaType(contentType);
const isPlayable = mediaType === 'video' || mediaType === 'audio'; const isPlayable = mediaType === 'video' || mediaType === 'audio';
const isWebViewable = mediaType === 'text'; const isWebViewable = mediaType === 'text';
const { height, signing_channel: signingChannel, value } = claim; const { height, signing_channel: signingChannel, value } = claim;
const channelName = signingChannel && signingChannel.name; const channelName = signingChannel && signingChannel.name;
const channelClaimId = claim && claim.signing_channel && claim.signing_channel.claim_id; const channelClaimId = claim && claim.signing_channel && claim.signing_channel.claim_id;
const fullUri = `${claim.name}#${claim.claim_id}`; const fullUri = `${claim.name}#${claim.claim_id}`;
const canEdit = myClaimUris.includes(normalizeURI(fullUri)); const canEdit = myClaimUris.includes(normalizeURI(fullUri));
const showActions = const showActions =
(canEdit || (fileInfo && fileInfo.download_path)) && (canEdit || (fileInfo && fileInfo.download_path)) &&
!this.state.fullscreenMode && !this.state.fullscreenMode &&
!this.state.showImageViewer && !this.state.showImageViewer &&
!this.state.showWebView; !this.state.showWebView;
const showFileActions = const showFileActions =
canEdit || canEdit ||
(fileInfo && (fileInfo &&
fileInfo.download_path && fileInfo.download_path &&
(completed || (fileInfo && !fileInfo.stopped && fileInfo.written_bytes < fileInfo.total_bytes))); (completed || (fileInfo && !fileInfo.stopped && fileInfo.written_bytes < fileInfo.total_bytes)));
const fullChannelUri = const fullChannelUri =
channelClaimId && channelClaimId.trim().length > 0 channelClaimId && channelClaimId.trim().length > 0
? normalizeURI(`${channelName}#${channelClaimId}`) ? normalizeURI(`${channelName}#${channelClaimId}`)
: normalizeURI(channelName); : normalizeURI(channelName);
const shortChannelUri = signingChannel ? signingChannel.short_url : null; const shortChannelUri = signingChannel ? signingChannel.short_url : null;
const playerStyle = [ const playerStyle = [
filePageStyle.player, filePageStyle.player,
this.state.isLandscape this.state.isLandscape
? filePageStyle.containedPlayerLandscape ? filePageStyle.containedPlayerLandscape
: this.state.fullscreenMode : this.state.fullscreenMode
? filePageStyle.fullscreenPlayer ? filePageStyle.fullscreenPlayer
: filePageStyle.containedPlayer, : filePageStyle.containedPlayer,
]; ];
const playerBgStyle = [filePageStyle.playerBackground, filePageStyle.containedPlayerBackground]; const playerBgStyle = [filePageStyle.playerBackground, filePageStyle.containedPlayerBackground];
const fsPlayerBgStyle = [filePageStyle.playerBackground, filePageStyle.fullscreenPlayerBackground]; const fsPlayerBgStyle = [filePageStyle.playerBackground, filePageStyle.fullscreenPlayerBackground];
// at least 2MB (or the full download) before media can be loaded // at least 2MB (or the full download) before media can be loaded
const canLoadMedia = const canLoadMedia =
this.state.streamingMode || this.state.streamingMode ||
(fileInfo && (fileInfo.written_bytes >= 2097152 || fileInfo.written_bytes === fileInfo.total_bytes)); // 2MB = 1024*1024*2 (fileInfo && (fileInfo.written_bytes >= 2097152 || fileInfo.written_bytes === fileInfo.total_bytes)); // 2MB = 1024*1024*2
const duration = claim && claim.value && claim.value.video ? claim.value.video.duration : null; const duration = claim && claim.value && claim.value.video ? claim.value.video.duration : null;
const isViewable = mediaType === 'image' || mediaType === 'text'; const isViewable = mediaType === 'image' || mediaType === 'text';
const canOpen = isViewable && completed; const canOpen = isViewable && completed;
const localFileUri = this.localUriForFileInfo(fileInfo); const localFileUri = this.localUriForFileInfo(fileInfo);
const unsupported = !isPlayable && !canOpen; const unsupported = !isPlayable && !canOpen;
if (fileInfo && !this.state.autoDownloadStarted && this.state.uriVars && this.state.uriVars.download === 'true') { if (
this.setState({ autoDownloadStarted: true }, () => { !this.state.autoDownloadStarted &&
purchaseUri(uri, costInfo, !isPlayable); claim &&
if (NativeModules.UtilityModule) { costInfo &&
NativeModules.UtilityModule.checkDownloads(); ((isPlayable && costInfo.cost === 0) || (this.state.uriVars && this.state.uriVars.download === 'true'))
} ) {
}); this.setState({ autoDownloadStarted: true }, () => {
} if (!isPlayable) {
this.checkStoragePermissionForDownload();
} else {
this.confirmPurchaseUri(claim.permanent_url, costInfo, !isPlayable);
}
NativeModules.UtilityModule.checkDownloads();
});
}
if (this.state.downloadPressed && canOpen && !this.state.autoOpened) { if (this.state.downloadPressed && canOpen && !this.state.autoOpened) {
// automatically open a web viewable or image file after the download button is pressed // automatically open a web viewable or image file after the download button is pressed
this.setState({ autoOpened: true }, () => this.openFile(localFileUri, mediaType)); this.setState({ autoOpened: true }, () => this.openFile(localFileUri, mediaType));
} }
return ( if (isChannel) {
<View style={filePageStyle.pageContainer}> return <ChannelPage uri={uri} navigation={navigation} />;
{!this.state.fullscreenMode && <UriBar value={uri} navigation={navigation} />} }
{this.state.showWebView && isWebViewable && (
<WebView allowFileAccess source={{ uri: localFileUri }} style={filePageStyle.viewer} />
)}
{this.state.showImageViewer && ( return (
<ImageViewer <View style={filePageStyle.pageContainer}>
style={StyleSheet.flatten(filePageStyle.viewer)} {!this.state.fullscreenMode && <UriBar value={uri} navigation={navigation} />}
imageUrls={this.state.imageUrls} {innerContent}
renderIndicator={() => null}
/>
)}
{!this.state.showWebView && ( {this.state.showWebView && isWebViewable && (
<View <WebView allowFileAccess source={{ uri: localFileUri }} style={filePageStyle.viewer} />
style={ )}
this.state.fullscreenMode ? filePageStyle.innerPageContainerFsMode : filePageStyle.innerPageContainer {this.state.showImageViewer && (
} <ImageViewer
onLayout={this.checkOrientation} style={StyleSheet.flatten(filePageStyle.viewer)}
imageUrls={this.state.imageUrls}
renderIndicator={() => null}
/>
)}
{!innerContent && !this.state.showWebView && (
<View
style={
this.state.fullscreenMode ? filePageStyle.innerPageContainerFsMode : filePageStyle.innerPageContainer
}
onLayout={this.checkOrientation}
>
<TouchableOpacity
activeOpacity={0.5}
style={filePageStyle.mediaContainer}
onPress={this.onFileDownloadButtonPressed}
> >
<TouchableOpacity {(canOpen || (!fileInfo || (isPlayable && !canLoadMedia)) || (!canOpen && fileInfo)) && (
activeOpacity={0.5} <FileItemMedia
style={filePageStyle.mediaContainer} duration={duration}
onPress={this.onMediaContainerPressed} style={filePageStyle.thumbnail}
> title={title}
{(canOpen || (!fileInfo || (isPlayable && !canLoadMedia)) || (!canOpen && fileInfo)) && (
<FileItemMedia
duration={duration}
style={filePageStyle.thumbnail}
title={title}
thumbnail={thumbnail}
/>
)}
{!unsupported &&
(!this.state.downloadButtonShown || this.state.downloadPressed) &&
!this.state.mediaLoaded && (
<ActivityIndicator size="large" color={Colors.NextLbryGreen} style={filePageStyle.loading} />
)}
{unsupported && fileInfo && completed && (
<View style={filePageStyle.unsupportedContent}>
<Image
style={filePageStyle.unsupportedContentImage}
resizeMode={'stretch'}
source={require('../../assets/gerbil-happy.png')}
/>
<View style={filePageStyle.unspportedContentTextContainer}>
<Text style={filePageStyle.unsupportedContentTitle}>{__('Unsupported Content')}</Text>
<Text style={filePageStyle.unsupportedContentText}>
Sorry, we are unable to display this content in the app. You can find the file named{' '}
<Text style={filePageStyle.unsupportedContentFilename}>{fileInfo.file_name}</Text> in your
downloads folder.
</Text>
</View>
</View>
)}
{((isPlayable && !completed && !canLoadMedia) ||
canOpen ||
(!completed && !this.state.streamingMode)) &&
!this.state.downloadPressed && (
<FileDownloadButton
uri={claim && claim.permanent_url ? claim.permanent_url : uri}
style={filePageStyle.downloadButton}
openFile={() => this.openFile(localFileUri, mediaType)}
isPlayable={isPlayable}
isViewable={isViewable}
onPlay={this.onFileDownloadButtonPlayed}
onView={() => this.setState({ downloadPressed: true })}
onButtonLayout={() => this.setState({ downloadButtonShown: true })}
/>
)}
{!fileInfo && (
<FilePrice
uri={uri}
style={filePageStyle.filePriceContainer}
textStyle={filePageStyle.filePriceText}
/>
)}
<TouchableOpacity style={filePageStyle.backButton} onPress={this.onBackButtonPressed}>
<Icon name={'arrow-left'} size={18} style={filePageStyle.backButtonIcon} />
</TouchableOpacity>
</TouchableOpacity>
{(this.state.streamingMode || (canLoadMedia && fileInfo && isPlayable)) && (
<View
style={playerBgStyle}
ref={ref => {
this.playerBackground = ref;
}}
onLayout={evt => {
if (!this.state.playerBgHeight) {
this.setState({ playerBgHeight: evt.nativeEvent.layout.height });
}
}}
/>
)}
{(this.state.streamingMode || (canLoadMedia && fileInfo && isPlayable)) && this.state.fullscreenMode && (
<View style={fsPlayerBgStyle} />
)}
{(this.state.streamingMode || (canLoadMedia && fileInfo && isPlayable)) && (
<MediaPlayer
claim={claim}
assignPlayer={ref => {
this.player = ref;
}}
uri={uri}
source={this.playerUriForFileInfo(fileInfo)}
style={playerStyle}
autoPlay={autoplay || this.state.autoPlayMedia}
onFullscreenToggled={this.handleFullscreenToggle}
onLayout={evt => {
if (!this.state.playerHeight) {
this.setState({ playerHeight: evt.nativeEvent.layout.height });
}
}}
onMediaLoaded={() => this.onMediaLoaded(channelName, title, uri)}
onBackButtonPressed={this.onBackButtonPressed}
onPlaybackStarted={this.onPlaybackStarted}
onPlaybackFinished={this.onPlaybackFinished}
thumbnail={thumbnail} thumbnail={thumbnail}
position={position} />
)}
{!unsupported &&
(!this.state.downloadButtonShown || this.state.downloadPressed) &&
!this.state.mediaLoaded && (
<ActivityIndicator size="large" color={Colors.NextLbryGreen} style={filePageStyle.loading} />
)}
{unsupported && fileInfo && completed && (
<View style={filePageStyle.unsupportedContent}>
<Image
style={filePageStyle.unsupportedContentImage}
resizeMode={'stretch'}
source={require('../../assets/gerbil-happy.png')}
/>
<View style={filePageStyle.unspportedContentTextContainer}>
<Text style={filePageStyle.unsupportedContentTitle}>{__('Unsupported Content')}</Text>
<Text style={filePageStyle.unsupportedContentText}>
Sorry, we are unable to display this content in the app. You can find the file named{' '}
<Text style={filePageStyle.unsupportedContentFilename}>{fileInfo.file_name}</Text> in your
downloads folder.
</Text>
</View>
</View>
)}
{((isPlayable && !completed && !canLoadMedia) ||
canOpen ||
(!completed && !this.state.streamingMode)) && (
<FileDownloadButton
uri={claim && claim.permanent_url ? claim.permanent_url : uri}
style={filePageStyle.downloadButton}
openFile={() => this.openFile(localFileUri, mediaType)}
isPlayable={isPlayable}
isViewable={isViewable}
onFileActionPress={this.onFileDownloadButtonPressed}
onButtonLayout={() => this.setState({ downloadButtonShown: true })}
/>
)}
{!fileInfo && (
<FilePrice
uri={claim && claim.permanent_url ? claim.permanent_url : uri}
style={filePageStyle.filePriceContainer}
textStyle={filePageStyle.filePriceText}
/> />
)} )}
<TouchableOpacity style={filePageStyle.backButton} onPress={this.onBackButtonPressed}>
<Icon name={'arrow-left'} size={18} style={filePageStyle.backButtonIcon} />
</TouchableOpacity>
</TouchableOpacity>
{!innerContent && (this.state.streamingMode || (canLoadMedia && fileInfo && isPlayable)) && (
<View
style={playerBgStyle}
ref={ref => {
this.playerBackground = ref;
}}
onLayout={evt => {
if (!this.state.playerBgHeight) {
this.setState({ playerBgHeight: evt.nativeEvent.layout.height });
}
}}
/>
)}
{!innerContent &&
(this.state.streamingMode || (canLoadMedia && fileInfo && isPlayable)) &&
this.state.fullscreenMode && <View style={fsPlayerBgStyle} />}
{!innerContent && (this.state.streamingMode || (canLoadMedia && fileInfo && isPlayable)) && (
<MediaPlayer
claim={claim}
assignPlayer={ref => {
this.player = ref;
}}
uri={uri}
source={this.playerUriForFileInfo(fileInfo)}
style={playerStyle}
autoPlay
onFullscreenToggled={this.handleFullscreenToggle}
onLayout={evt => {
if (!this.state.playerHeight) {
this.setState({ playerHeight: evt.nativeEvent.layout.height });
}
}}
onMediaLoaded={() => this.onMediaLoaded(channelName, title, uri)}
onBackButtonPressed={this.onBackButtonPressed}
onPlaybackStarted={this.onPlaybackStarted}
onPlaybackFinished={this.onPlaybackFinished}
thumbnail={thumbnail}
position={position}
/>
)}
{!innerContent && (
<ScrollView <ScrollView
style={filePageStyle.scrollContainer} style={filePageStyle.scrollContainer}
contentContainerstyle={showActions ? null : filePageStyle.scrollContent} contentContainerstyle={showActions ? null : filePageStyle.scrollContent}
@@ -1088,7 +1154,7 @@ class FilePage extends React.PureComponent {
normalizeURI(shortChannelUri || fullChannelUri), normalizeURI(shortChannelUri || fullChannelUri),
null, null,
false, false,
fullChannelUri fullChannelUri,
); );
}} }}
/> />
@@ -1101,7 +1167,7 @@ class FilePage extends React.PureComponent {
<DateTime <DateTime
style={filePageStyle.publishDate} style={filePageStyle.publishDate}
textStyle={filePageStyle.publishDateText} textStyle={filePageStyle.publishDateText}
uri={uri} uri={fullUri}
formatOptions={{ day: 'numeric', month: 'long', year: 'numeric' }} formatOptions={{ day: 'numeric', month: 'long', year: 'numeric' }}
show={DateTime.SHOW_DATE} show={DateTime.SHOW_DATE}
/> />
@@ -1156,34 +1222,29 @@ class FilePage extends React.PureComponent {
<View onLayout={this.setRelatedContentPosition} /> <View onLayout={this.setRelatedContentPosition} />
{isSearchingRecommendContent && ( {this.state.showRecommended && (
<ActivityIndicator size="small" color={Colors.NextLbryGreen} style={filePageStyle.relatedLoading} /> <RelatedContent navigation={navigation} title={title} uri={fullUri} fullUri={fullUri} />
)}
{!isSearchingRecommendContent && recommendedContent && recommendedContent.length > 0 && (
<RelatedContent navigation={navigation} uri={uri} fullUri={fullUri} />
)} )}
</ScrollView> </ScrollView>
</View> )}
)} </View>
{this.state.showTipView && ( )}
<ModalTipView {this.state.showTipView && (
claim={claim} <ModalTipView
channelName={channelName} claim={claim}
contentName={title} channelName={channelName}
onCancelPress={() => this.setState({ showTipView: false })} contentName={title}
onOverlayPress={() => this.setState({ showTipView: false })} onCancelPress={() => this.setState({ showTipView: false })}
onSendTipSuccessful={() => this.setState({ showTipView: false })} onOverlayPress={() => this.setState({ showTipView: false })}
/> onSendTipSuccessful={() => this.setState({ showTipView: false })}
)} />
{!this.state.fullscreenMode && )}
!this.state.showTipView && {!this.state.fullscreenMode &&
!this.state.showImageViewer && !this.state.showTipView &&
!this.state.showWebView && <FloatingWalletBalance navigation={navigation} />} !this.state.showImageViewer &&
</View> !this.state.showWebView && <FloatingWalletBalance navigation={navigation} />}
); </View>
} );
return null;
} }
} }
+15 -4
View File
@@ -228,7 +228,13 @@ class FirstRunScreen extends React.PureComponent {
handleContinuePressed = () => { handleContinuePressed = () => {
const { notify, user, hasSyncedWallet } = this.props; const { notify, user, hasSyncedWallet } = this.props;
const pageIndex = FirstRunScreen.pages.indexOf(this.state.currentPage); 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 // do apply sync to check if the password is valid
if (hasSyncedWallet) { if (hasSyncedWallet) {
this.checkWalletPassword(); this.checkWalletPassword();
@@ -256,7 +262,7 @@ class FirstRunScreen extends React.PureComponent {
} else { } else {
this.showNextPage(); this.showNextPage();
} }
} } */
}; };
handleEmailCollectPageContinue() { handleEmailCollectPageContinue() {
@@ -309,7 +315,7 @@ class FirstRunScreen extends React.PureComponent {
onEmailChanged = email => { onEmailChanged = email => {
this.setState({ email }); this.setState({ email });
if (Constants.FIRST_RUN_PAGE_EMAIL_COLLECT === this.state.currentPage) { 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 { } else {
this.setState({ showSkip: false }); this.setState({ showSkip: false });
} }
@@ -500,7 +506,12 @@ class FirstRunScreen extends React.PureComponent {
{Constants.FIRST_RUN_PAGE_SKIP_ACCOUNT !== this.state.currentPage && {Constants.FIRST_RUN_PAGE_SKIP_ACCOUNT !== this.state.currentPage &&
Constants.FIRST_RUN_PAGE_EMAIL_VERIFY !== this.state.currentPage && ( Constants.FIRST_RUN_PAGE_EMAIL_VERIFY !== this.state.currentPage && (
<Text style={firstRunStyle.buttonText}> <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> </Text>
)} )}
</TouchableOpacity> </TouchableOpacity>
+26 -18
View File
@@ -196,7 +196,7 @@ class PublishPage extends React.PureComponent {
}, },
() => { () => {
NativeModules.Gallery.getVideos().then(videos => this.setState({ videos, loadingVideos: false })); NativeModules.Gallery.getVideos().then(videos => this.setState({ videos, loadingVideos: false }));
} },
); );
// Check if this is an edit action // Check if this is an edit action
@@ -288,7 +288,7 @@ class PublishPage extends React.PureComponent {
this.handleChannelChange(channelName); this.handleChannelChange(channelName);
} }
pushDrawerStack(Constants.DRAWER_ROUTE_PUBLISH_FORM); pushDrawerStack(Constants.DRAWER_ROUTE_PUBLISH_FORM);
} },
); );
}; };
@@ -356,18 +356,26 @@ class PublishPage extends React.PureComponent {
} }
if (!title || title.trim().length === 0) { if (!title || title.trim().length === 0) {
notify({ message: __('Please provide a title') }); notify({ message: __('Please provide a title'), isError: true });
return; return;
} }
if (!name) { if (!name) {
notify({ message: __('Please specify an address where people can find your content.') }); notify({ message: __('Please specify an address where people can find your content.'), isError: true });
return;
}
if (!isNameValid(name, false)) {
notify({ message: __('Your content address contains invalid characters.'), isError: true });
return; return;
} }
if (!currentMedia && !editMode) { if (!currentMedia && !editMode) {
// sanity check. normally shouldn't happen // sanity check. normally shouldn't happen
notify({ message: __('No file selected. Please select a video or take a photo before publishing.') }); notify({
message: __('No file selected. Please select a video or take a photo before publishing.'),
isError: true,
});
return; return;
} }
@@ -456,7 +464,7 @@ class PublishPage extends React.PureComponent {
() => { () => {
this.handleNameChange(this.state.name); this.handleNameChange(this.state.name);
pushDrawerStack(Constants.DRAWER_ROUTE_PUBLISH_FORM); pushDrawerStack(Constants.DRAWER_ROUTE_PUBLISH_FORM);
} },
); );
} }
@@ -510,7 +518,7 @@ class PublishPage extends React.PureComponent {
clearPublishFormState(); clearPublishFormState();
// reset thumbnail // reset thumbnail
updatePublishForm({ thumbnail: null }); updatePublishForm({ thumbnail: null });
} },
); );
} }
@@ -537,7 +545,7 @@ class PublishPage extends React.PureComponent {
}, },
() => { () => {
NativeModules.UtilityModule.openDocumentPicker('*/*'); NativeModules.UtilityModule.openDocumentPicker('*/*');
} },
); );
}; };
@@ -583,7 +591,7 @@ class PublishPage extends React.PureComponent {
() => { () => {
// upload a new thumbnail // upload a new thumbnail
uploadImageAsset(fileUrl, this.handleThumbnailUploadSuccess, this.handleThumbnailUploadFailure); uploadImageAsset(fileUrl, this.handleThumbnailUploadSuccess, this.handleThumbnailUploadFailure);
} },
); );
} }
} else { } else {
@@ -634,7 +642,7 @@ class PublishPage extends React.PureComponent {
videoRecordingMode: false, videoRecordingMode: false,
recordingVideo: false, recordingVideo: false,
}, },
() => pushDrawerStack(Constants.DRAWER_ROUTE_PUBLISH_FORM) () => pushDrawerStack(Constants.DRAWER_ROUTE_PUBLISH_FORM),
); );
}); });
} }
@@ -658,7 +666,7 @@ class PublishPage extends React.PureComponent {
showCameraOverlay: false, showCameraOverlay: false,
videoRecordingMode: false, videoRecordingMode: false,
}, },
() => pushDrawerStack(Constants.DRAWER_ROUTE_PUBLISH) () => pushDrawerStack(Constants.DRAWER_ROUTE_PUBLISH),
); );
}); });
} }
@@ -777,8 +785,8 @@ class PublishPage extends React.PureComponent {
uploadImageAsset( uploadImageAsset(
this.getFilePathFromUri(uri), this.getFilePathFromUri(uri),
this.handleThumbnailUploadSuccess, this.handleThumbnailUploadSuccess,
this.handleThumbnailUploadFailure this.handleThumbnailUploadFailure,
) ),
); );
} }
} else if (mediaType === 'image' || mediaType === 'video') { } else if (mediaType === 'image' || mediaType === 'video') {
@@ -791,7 +799,7 @@ class PublishPage extends React.PureComponent {
this.setState({ currentThumbnailUri: `file://${path}`, updatingThumbnailUri: false }); this.setState({ currentThumbnailUri: `file://${path}`, updatingThumbnailUri: false });
if (!this.state.uploadedThumbnailUri) { if (!this.state.uploadedThumbnailUri) {
this.setState({ uploadThumbnailStarted: true }, () => this.setState({ uploadThumbnailStarted: true }, () =>
uploadImageAsset(path, this.handleThumbnailUploadSuccess, this.handleThumbnailUploadFailure) uploadImageAsset(path, this.handleThumbnailUploadSuccess, this.handleThumbnailUploadFailure),
); );
} }
}) })
@@ -817,7 +825,7 @@ class PublishPage extends React.PureComponent {
}, },
() => { () => {
this.handleNameChange(this.state.name); this.handleNameChange(this.state.name);
} },
); );
} }
}; };
@@ -881,7 +889,7 @@ class PublishPage extends React.PureComponent {
}, },
() => { () => {
NativeModules.UtilityModule.openDocumentPicker('image/*'); NativeModules.UtilityModule.openDocumentPicker('image/*');
} },
); );
}; };
@@ -1112,7 +1120,7 @@ class PublishPage extends React.PureComponent {
{__('The address where people can find your content (ex. lbry://myvideo). ')} {__('The address where people can find your content (ex. lbry://myvideo). ')}
{this.state.editMode && {this.state.editMode &&
__( __(
'You cannot change this address while editing your content. If you wish to use a new address, please republish the content.' 'You cannot change this address while editing your content. If you wish to use a new address, please republish the content.',
)} )}
</Text> </Text>
@@ -1262,7 +1270,7 @@ class PublishPage extends React.PureComponent {
</View> </View>
<Text style={publishStyle.successText}> <Text style={publishStyle.successText}>
{__( {__(
'Your content will be live in a few minutes. In the mean time, feel free to publish more content or explore the app.' 'Your content will be live in a few minutes. In the mean time, feel free to publish more content or explore the app.',
)} )}
</Text> </Text>
</View> </View>
+6 -4
View File
@@ -1,14 +1,15 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { import {
doClaimSearch, doClaimSearch,
doResolveUris,
doSearch, doSearch,
doUpdateSearchQuery, doUpdateSearchQuery,
makeSelectSearchUris, makeSelectSearchUris,
selectClaimSearchByQuery, selectClaimSearchByQuery,
selectIsSearching, selectIsSearching,
selectResolvingUris,
selectSearchValue, selectSearchValue,
makeSelectQueryWithOptions, makeSelectQueryWithOptions,
selectSearchUrisByQuery,
} from 'lbry-redux'; } from 'lbry-redux';
import { doPushDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer'; import { doPushDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer';
import { selectCurrentRoute } from 'redux/selectors/drawer'; import { selectCurrentRoute } from 'redux/selectors/drawer';
@@ -22,19 +23,20 @@ const select = state => ({
currentRoute: selectCurrentRoute(state), currentRoute: selectCurrentRoute(state),
isSearching: selectIsSearching(state), isSearching: selectIsSearching(state),
query: selectSearchValue(state), query: selectSearchValue(state),
resolvingUris: selectResolvingUris(state),
uris: makeSelectSearchUris(makeSelectQueryWithOptions(null, numSearchResults)(state))(state), uris: makeSelectSearchUris(makeSelectQueryWithOptions(null, numSearchResults)(state))(state),
urisByQuery: selectSearchUrisByQuery(state),
}); });
const perform = dispatch => ({ const perform = dispatch => ({
search: query => dispatch(doSearch(query, numSearchResults)), search: query => dispatch(doSearch(query, numSearchResults, null, false, false)),
claimSearch: options => dispatch(doClaimSearch(options)), claimSearch: options => dispatch(doClaimSearch(options)),
updateSearchQuery: query => dispatch(doUpdateSearchQuery(query)), updateSearchQuery: query => dispatch(doUpdateSearchQuery(query)),
pushDrawerStack: () => dispatch(doPushDrawerStack(Constants.DRAWER_ROUTE_SEARCH)), pushDrawerStack: () => dispatch(doPushDrawerStack(Constants.DRAWER_ROUTE_SEARCH)),
resolveUris: uris => dispatch(doResolveUris(uris)),
setPlayerVisible: () => dispatch(doSetPlayerVisible(false)), setPlayerVisible: () => dispatch(doSetPlayerVisible(false)),
}); });
export default connect( export default connect(
select, select,
perform perform,
)(SearchPage); )(SearchPage);
+59 -21
View File
@@ -26,6 +26,7 @@ class SearchPage extends React.PureComponent {
showTagResult: false, showTagResult: false,
claimSearchRun: false, claimSearchRun: false,
claimSearchOptions: null, claimSearchOptions: null,
resultsResolved: false,
}; };
static navigationOptions = { static navigationOptions = {
@@ -58,6 +59,7 @@ class SearchPage extends React.PureComponent {
claimSearchOptions: null, claimSearchOptions: null,
claimSearchRun: false, claimSearchRun: false,
showTagResult: false, showTagResult: false,
resultsResolved: false,
}); });
search(searchQuery); search(searchQuery);
} }
@@ -69,8 +71,8 @@ class SearchPage extends React.PureComponent {
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
const { currentRoute, query } = nextProps; const { currentRoute, query, isSearching } = nextProps;
const { currentRoute: prevRoute, search } = this.props; const { currentRoute: prevRoute, search, isSearching: prevIsSearching } = this.props;
if (Constants.DRAWER_ROUTE_SEARCH === currentRoute && currentRoute !== prevRoute) { if (Constants.DRAWER_ROUTE_SEARCH === currentRoute && currentRoute !== prevRoute) {
this.onComponentFocused(); this.onComponentFocused();
@@ -80,11 +82,44 @@ class SearchPage extends React.PureComponent {
this.setState({ this.setState({
currentQuery: query, currentQuery: query,
currentUri: isURIValid(query) ? normalizeURI(query) : null, currentUri: isURIValid(query) ? normalizeURI(query) : null,
resultsResolved: false,
}); });
search(query); search(query);
} }
} }
allContentResolved(props) {
const { uris, resolvingUris } = 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(nextProps) {
const { isSearching, uris } = this.props;
return (isSearching && (!uris || uris.length === 0)) || (!isSearching && this.allContentResolved(this.props));
}
componentDidUpdate() {
const { isSearching, resolveUris, uris } = this.props;
if (!isSearching && !this.state.resultsResolved) {
this.setState({ resultsResolved: true }, () => {
if (uris && uris.length > 0) {
resolveUris(uris);
}
});
}
}
getSearchQuery() { getSearchQuery() {
const { navigation } = this.props; const { navigation } = this.props;
if (navigation && navigation.state && navigation.state.params) { if (navigation && navigation.state && navigation.state.params) {
@@ -100,6 +135,7 @@ class SearchPage extends React.PureComponent {
claimSearchOptions: null, claimSearchOptions: null,
claimSearchRun: false, claimSearchRun: false,
showTagResult: false, showTagResult: false,
resultsResolved: false,
}); });
search(keywords); search(keywords);
}; };
@@ -130,11 +166,11 @@ class SearchPage extends React.PureComponent {
this.setState({ claimSearchOptions: options, claimSearchRun: true }, () => claimSearch(options)); 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 claimSearchKey = createNormalizedClaimSearchKey(this.state.claimSearchOptions);
const claimSearchUris = claimSearchByQuery[claimSearchKey]; const claimSearchUris = claimSearchByQuery[claimSearchKey];
this.setState({ showTagResult: claimSearchUris && claimSearchUris.length > 0 }); this.setState({ showTagResult: claimSearchUris && claimSearchUris.length > 0 });
} } */
return ( return (
<View> <View>
@@ -155,7 +191,7 @@ class SearchPage extends React.PureComponent {
}; };
render() { render() {
const { isSearching, navigation, query, uris, urisByQuery } = this.props; const { isSearching, navigation, query, uris } = this.props;
return ( return (
<View style={searchStyle.container}> <View style={searchStyle.container}>
@@ -167,22 +203,24 @@ class SearchPage extends React.PureComponent {
</View> </View>
)} )}
<FlatList {!isSearching && (
extraData={this.state} <FlatList
style={searchStyle.scrollContainer} extraData={this.state}
contentContainerStyle={searchStyle.scrollPadding} style={searchStyle.scrollContainer}
keyboardShouldPersistTaps={'handled'} contentContainerStyle={searchStyle.scrollPadding}
data={uris} keyboardShouldPersistTaps={'handled'}
keyExtractor={(item, index) => item} data={uris}
initialNumToRender={10} keyExtractor={(item, index) => item}
maxToRenderPerBatch={20} initialNumToRender={8}
removeClippedSubviews maxToRenderPerBatch={20}
ListEmptyComponent={!isSearching ? this.listEmptyComponent() : null} removeClippedSubviews
ListHeaderComponent={this.state.currentUri ? this.listHeaderComponent(this.state.showTagResult) : null} ListEmptyComponent={!isSearching ? this.listEmptyComponent() : null}
renderItem={({ item }) => ( ListHeaderComponent={this.state.currentUri ? this.listHeaderComponent(this.state.showTagResult) : null}
<FileListItem key={item} uri={item} style={searchStyle.resultItem} navigation={navigation} /> renderItem={({ item }) => (
)} <FileListItem key={item} uri={item} style={searchStyle.resultItem} batchResolve navigation={navigation} />
/> )}
/>
)}
<FloatingWalletBalance navigation={navigation} /> <FloatingWalletBalance navigation={navigation} />
</View> </View>
); );
+5 -5
View File
@@ -115,7 +115,7 @@ class SplashScreen extends React.PureComponent {
}, },
error => { error => {
/* failed */ /* failed */
} },
); );
}; };
@@ -293,7 +293,7 @@ class SplashScreen extends React.PureComponent {
isLagging: true, isLagging: true,
message: __('Connection Failure'), message: __('Connection Failure'),
details: __( 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.',
), ),
}); });
}); });
@@ -318,7 +318,7 @@ class SplashScreen extends React.PureComponent {
message: __('Testing network'), message: __('Testing network'),
details: __('Waiting for name resolution'), details: __('Waiting for name resolution'),
}, },
() => this.finishSplashScreen() () => this.finishSplashScreen(),
); );
}; };
@@ -331,12 +331,12 @@ class SplashScreen extends React.PureComponent {
<Text style={splashStyle.errorTitle}>{__('Oops! Something went wrong.')}</Text> <Text style={splashStyle.errorTitle}>{__('Oops! Something went wrong.')}</Text>
<Text style={splashStyle.paragraph}> <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>
<Text style={splashStyle.paragraph}> <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> </Text>
+5 -2
View File
@@ -73,7 +73,7 @@ class SubscriptionsPage extends React.PureComponent {
}; };
componentDidMount() { componentDidMount() {
this.onComponentFocused(); // this.onComponentFocused();
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
@@ -115,7 +115,10 @@ class SubscriptionsPage extends React.PureComponent {
unsubscribeShortChannelUrls = () => { unsubscribeShortChannelUrls = () => {
// this should only have to happen once // this should only have to happen once
const { subscribedChannels, channelUnsubscribe } = this.props; const { subscribedChannels, channelUnsubscribe } = this.props;
const badSubs = subscribedChannels.filter(sub => sub.uri.split('#')[1].length < 5); const badSubs = subscribedChannels.filter(sub => {
const parts = sub.uri.split('#');
return parts.length === 1 || parts[1].length < 5;
});
if (badSubs.length > 0) { if (badSubs.length > 0) {
badSubs.forEach(sub => channelUnsubscribe(sub)); badSubs.forEach(sub => channelUnsubscribe(sub));
} }
+7
View File
@@ -64,6 +64,8 @@ const channelPageStyle = StyleSheet.create({
color: Colors.White, color: Colors.White,
fontFamily: 'Inter-UI-Regular', fontFamily: 'Inter-UI-Regular',
fontSize: 18, fontSize: 18,
padding: 2,
backgroundColor: '#000000aa',
}, },
subscribeButtonContainer: { subscribeButtonContainer: {
position: 'absolute', position: 'absolute',
@@ -184,6 +186,11 @@ const channelPageStyle = StyleSheet.create({
fontSize: 12, fontSize: 12,
color: Colors.White, color: Colors.White,
marginTop: 2, marginTop: 2,
padding: 2,
flexWrap: 'wrap',
},
followerCountBg: {
backgroundColor: '#000000aa',
}, },
}); });
+21
View File
@@ -94,6 +94,11 @@ const fileListStyle = StyleSheet.create({
top: 8, top: 8,
left: 8, left: 8,
}, },
featuredDownloadedIcon: {
position: 'absolute',
left: 16,
top: 16,
},
fileItem: { fileItem: {
marginLeft: 24, marginLeft: 24,
marginRight: 24, marginRight: 24,
@@ -115,6 +120,22 @@ const fileListStyle = StyleSheet.create({
marginLeft: 4, marginLeft: 4,
marginTop: 4, marginTop: 4,
}, },
filePriceContainer: {
backgroundColor: Colors.NextLbryGreen,
justifyContent: 'center',
position: 'absolute',
left: thumbnailWidth - 64,
top: 8,
width: 56,
height: 24,
borderRadius: 4,
},
filePriceText: {
fontFamily: 'Inter-UI-Bold',
fontSize: 12,
textAlign: 'center',
color: '#0c604b',
},
}); });
export default fileListStyle; export default fileListStyle;
+7 -2
View File
@@ -27,11 +27,16 @@ const walletStyle = StyleSheet.create({
}, },
address: { address: {
fontFamily: 'Inter-UI-Regular', fontFamily: 'Inter-UI-Regular',
letterSpacing: 0.8,
borderWidth: 1, borderWidth: 1,
borderRadius: 16,
borderStyle: 'dashed', borderStyle: 'dashed',
borderColor: '#cccccc', borderColor: '#e1e1e1',
backgroundColor: '#f9f9f9', backgroundColor: '#f9f9f9',
padding: 8, paddingTop: 8,
paddingLeft: 8,
paddingRight: 8,
paddingBottom: 6,
width: '85%', width: '85%',
}, },
button: { button: {