app/src/component/subscribeButton/view.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { normalizeURI, parseURI } from 'lbry-redux';
 import { NativeModules, Text, View, TouchableOpacity } from 'react-native';
-import Button from '../button';
-import Colors from '../../styles/colors';
+import Button from 'component/button';
+import Colors from 'styles/colors';
 
 class SubscribeButton extends React.PureComponent {
   render() {
@@ -11,7 +11,8 @@ class SubscribeButton extends React.PureComponent {
       isSubscribed,
       doChannelSubscribe,
       doChannelUnsubscribe,
-      style
+      style,
+      hideText
     } = this.props;
 
     let styles = [];
@@ -35,7 +36,7 @@ class SubscribeButton extends React.PureComponent {
         icon={isSubscribed ? "heart-broken" : "heart"}
         iconColor={iconColor}
         solid={isSubscribed ? false : true}
-        text={subscriptionLabel}
+        text={hideText ? null : subscriptionLabel}
         onPress={() => {
           subscriptionHandler({
             channelName: claimName,

app/src/page/file/index.js

@@ -1,6 +1,7 @@
 import { connect } from 'react-redux';
 import {
   doFetchFileInfo,
+  doFileGet,
   doPurchaseUri,
   doDeletePurchasedUri,
   doResolveUri,
@@ -70,6 +71,7 @@ const perform = dispatch => ({
   },
   fetchFileInfo: uri => dispatch(doFetchFileInfo(uri)),
   fetchCostInfo: uri => dispatch(doFetchCostInfoForUri(uri)),
+  fileGet: (uri, saveFile) => dispatch(doFileGet(uri, saveFile)),
   notify: data => dispatch(doToast(data)),
   popDrawerStack: () => dispatch(doPopDrawerStack()),
   purchaseUri: (uri, costInfo, saveFile) => dispatch(doPurchaseUri(uri, costInfo, saveFile)),

app/src/page/file/view.js

@@ -63,6 +63,7 @@ class FilePage extends React.PureComponent {
       downloadPressed: false,
       fileViewLogged: false,
       fullscreenMode: false,
+      fileGetStarted: false,
       imageUrls: null,
       isLandscape: false,
       mediaLoaded: false,
@@ -150,7 +151,7 @@ class FilePage extends React.PureComponent {
 
     const mediaType = Lbry.getMediaType(contentType);
     const isPlayable = mediaType === 'video' || mediaType === 'audio';
-    if (prevPurchasedUris.length != purchasedUris.length && NativeModules.UtilityModule) {
+    if ((this.state.fileGetStarted || prevPurchasedUris.length !== purchasedUris.length) && NativeModules.UtilityModule) {
       if (purchasedUris.includes(uri)) {
         const { nout, txid } = claim;
         const outpoint = `${txid}:${nout}`;
@@ -159,6 +160,7 @@ class FilePage extends React.PureComponent {
         if (!isPlayable && !this.state.fileViewLogged) {
           this.logFileView(uri, claim);
         }
+        this.setState({ fileGetStarted: false });
       }
       NativeModules.UtilityModule.checkDownloads();
     }
@@ -499,6 +501,22 @@ class FilePage extends React.PureComponent {
     navigateBack(navigation, drawerStack, popDrawerStack);
   }
 
+  onSaveFilePressed = () => {
+    const { costInfo, fileGet, fileInfo, navigation, purchasedUris, purchaseUri } = this.props;
+    const { uri } = navigation.state.params;
+
+    if (fileInfo || purchasedUris.includes(uri)) {
+      // file already in library or URI already purchased, use fileGet directly
+      this.setState({ fileGetStarted: true }, () => fileGet(uri, true));
+    } else {
+      this.setState({
+        downloadPressed: true,
+        autoPlayMedia: false,
+        stopDownloadConfirmed: false
+      }, () => purchaseUri(uri, costInfo, true));
+    }
+  }
+
   render() {
     const {
       balance,
@@ -579,7 +597,10 @@ class FilePage extends React.PureComponent {
         const mediaType = Lbry.getMediaType(contentType);
         const isPlayable = mediaType === 'video' || mediaType === 'audio';
         const { height, channel_name: channelName, value } = claim;
-        const showActions = !this.state.streamingMode && !this.state.fullscreenMode && !this.state.showImageViewer && !this.state.showWebView;
+        const showActions = (fileInfo && fileInfo.download_path) &&
+          !this.state.fullscreenMode &&
+          !this.state.showImageViewer &&
+          !this.state.showWebView;
         const showFileActions = (fileInfo && fileInfo.download_path) &&
           (completed || (fileInfo && !fileInfo.stopped && fileInfo.written_bytes < fileInfo.total_bytes));
         const channelClaimId = claim && claim.signing_channel && claim.signing_channel.claim_id;
@@ -754,6 +775,11 @@ class FilePage extends React.PureComponent {
                           show={DateTime.SHOW_DATE} />
                       </View>
                       <View style={filePageStyle.subscriptionRow}>
+                        {((isPlayable && !fileInfo) || (isPlayable && fileInfo && !fileInfo.download_path)) &&
+                        <Button style={[filePageStyle.actionButton, filePageStyle.saveFileButton]}
+                            theme={"light"}
+                            icon={"download"}
+                            onPress={this.onSaveFilePressed} />}
                         <Button style={[filePageStyle.actionButton, filePageStyle.tipButton]}
                             theme={"light"}
                             icon={"gift"}
@@ -761,7 +787,8 @@ class FilePage extends React.PureComponent {
                         <SubscribeButton
                           style={filePageStyle.actionButton}
                           uri={fullChannelUri}
-                          name={channelName} />
+                          name={channelName}
+                          hideText={false} />
                         <SubscribeNotificationButton
                           style={[filePageStyle.actionButton, filePageStyle.bellButton]}
                           uri={fullChannelUri}

app/src/styles/filePage.js

@@ -79,13 +79,13 @@ const filePageStyle = StyleSheet.create({
     marginBottom: 16,
   },
   subscriptionRow: {
-    flex: 0.5,
+    flex: 0.6,
     flexDirection: 'row',
     justifyContent: 'flex-end',
     marginTop: 8
   },
   publishInfo: {
-    flex: 0.5,
+    flex: 0.4,
     marginTop: 6,
   },
   channelName: {
@@ -197,8 +197,8 @@ const filePageStyle = StyleSheet.create({
   actionButton: {
     alignSelf: 'flex-start',
     backgroundColor: Colors.White,
-    paddingLeft: 16,
-    paddingRight: 16
+    paddingLeft: 10,
+    paddingRight: 10
   },
   bellButton: {
     marginLeft: 8
@@ -309,6 +309,9 @@ const filePageStyle = StyleSheet.create({
   tipButton: {
     marginRight: 8
   },
+  saveFileButton: {
+    marginRight: 8
+  },
   tagContainer: {
     marginLeft: 12,
     marginRight: 12,