From 79db8cea2eda78938a37e82a1a1dcdf2ba3e1647 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 6 Feb 2015 13:23:10 -0300
Subject: [PATCH] More copy and share for mobile

---
 js/controllers/copayers.js        | 19 +++++++++++++++++-
 js/controllers/more.js            |  7 +++++++
 views/copayers.html               | 33 +++++++++++++++++++------------
 views/modals/address-book.html    |  2 +-
 views/modals/paypro.html          |  2 +-
 views/modals/qr-address.html      |  4 ++--
 views/modals/tx-details.html      |  2 +-
 views/modals/txp-details.html     |  2 +-
 views/modals/walletSelection.html |  2 +-
 views/more.html                   | 16 +++++++++++++--
 views/receive.html                |  6 +++---
 11 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/js/controllers/copayers.js b/js/controllers/copayers.js
index c424741a8..91d3ecd14 100644
--- a/js/controllers/copayers.js
+++ b/js/controllers/copayers.js
@@ -1,12 +1,13 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('CopayersController',
-  function($scope, $rootScope, $timeout, go, identityService, notification) {
+  function($scope, $rootScope, $timeout, go, identityService, notification, isCordova) {
     var w = $rootScope.wallet;
     $scope.init = function() {
       $rootScope.title = 'Share this secret with your copayers';
       $scope.loading = false;
       $scope.secret = $rootScope.wallet.getSecret();
+      $scope.isCordova = isCordova;
 
       w.on('publicKeyRingUpdated', $scope.updateList);
       w.on('ready', $scope.updateList);
@@ -48,4 +49,20 @@ angular.module('copayApp.controllers').controller('CopayersController',
       });
     };
 
+    $scope.copySecret = function(secret) {
+      if (isCordova) {
+        window.cordova.plugins.clipboard.copy(secret);
+        window.plugins.toast.showShortCenter('Copied to clipboard');
+      }
+    };
+
+    $scope.shareSecret = function(secret) {
+      if (isCordova) {
+        if (isMobile.Android() || isMobile.Windows()) {
+          window.ignoreMobilePause = true;
+        }
+        window.plugins.socialsharing.share(secret, null, null, null);
+      }
+    };
+
   });
diff --git a/js/controllers/more.js b/js/controllers/more.js
index ec3b81c3c..dd633372f 100644
--- a/js/controllers/more.js
+++ b/js/controllers/more.js
@@ -137,6 +137,13 @@ angular.module('copayApp.controllers').controller('MoreController',
       });
     };
 
+    $scope.copyText = function(text) {
+      if (isCordova) {
+        window.cordova.plugins.clipboard.copy(text);
+        window.plugins.toast.showShortCenter('Copied to clipboard');
+      }
+    };
+
     $scope.downloadWalletBackup = function() {
       backupService.walletDownload(w);
     };
diff --git a/views/copayers.html b/views/copayers.html
index d499f210d..1c02af7ee 100644
--- a/views/copayers.html
+++ b/views/copayers.html
@@ -10,21 +10,28 @@
 
       <div ng-if="!$root.wallet.isComplete()">
         <div class="panel oh">
-        <div class="box-notification">
-          <div class="box-icon error">
-            <i class="fi-alert size-24"></i>
+          <div class="box-notification">
+            <div class="box-icon error">
+              <i class="fi-alert size-24"></i>
+            </div>
+            <span class="text-warning size-14">
+              Please note the wallet creator <b>must be online</b> until all copayers have joined.
+            </span>
           </div>
-          <span class="text-warning size-14">
-    Please note the wallet creator <b>must be online</b> until all copayers have joined.
-    </span>
-        </div>
 
-
-          <div class="text-center">
-            <qrcode size="250" data="{{secret}}"></qrcode>
+          <div ng-click="copySecret(secret)">
+            <div class="text-center">
+              <qrcode size="250" data="{{secret}}"></qrcode>
+            </div>
+            <div class="secret m10t">
+              {{secret}}
+            </div>
           </div>
-          <div class="secret m10v">
-            {{secret}}
+          <div class="text-center m10t" ng-if="isCordova">
+            <span class="button outline dark-gray tiny" 
+              ng-click="shareSecret(secret)">
+              <i class="fi-share"></i> Share secret
+            </span>
           </div>
           <div class="size-10 line-t text-center">
             <h2 class="m10t">{{$root.wallet.getName()}}</h2>
@@ -32,7 +39,7 @@
             [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]
             </span>
             <span ng-if="$root.wallet.isTestnet()"> in TESTNET</span>
-          </div>
+          </div> 
         </div>
       </div>
     </div>
diff --git a/views/modals/address-book.html b/views/modals/address-book.html
index 819cd6623..bb733ddb5 100644
--- a/views/modals/address-book.html
+++ b/views/modals/address-book.html
@@ -1,5 +1,5 @@
 <nav class="tab-bar text-right hide-for-large-up">
-  <a ng-click="close()" class="p10 text-white">Close</a>
+  <span ng-click="close()" class="p10 text-white">Close</span>
 </nav>
 <div class="row modal-mobile">
   <div class="large-12 columns"> 
diff --git a/views/modals/paypro.html b/views/modals/paypro.html
index f1ef6f9c1..127cafb13 100644
--- a/views/modals/paypro.html
+++ b/views/modals/paypro.html
@@ -1,5 +1,5 @@
 <nav class="tab-bar text-right hide-for-large-up">
-  <a ng-click="cancel()" class="p10 text-white">Close</a>
+  <span ng-click="cancel()" class="p10 text-white">Close</span>
 </nav>
 <div class="modal-mobile">
 <div class="text-center">
diff --git a/views/modals/qr-address.html b/views/modals/qr-address.html
index 63bab5c5f..2df6dc4fd 100644
--- a/views/modals/qr-address.html
+++ b/views/modals/qr-address.html
@@ -1,5 +1,5 @@
 <nav class="tab-bar text-right hide-for-large-up">
-  <a ng-click="cancel()" class="p10 text-white">Close</a>
+  <span ng-click="cancel()" class="p10 text-white">Close</span>
 </nav>
 <div class="modal-mobile text-center" ng-init="addr = address.address">
   <qrcode size="220" data="{{addr}}"></qrcode>
@@ -15,7 +15,7 @@
   </div>
   <div class="text-center m10t" ng-if="isCordova">
     <button class="primary expand" ng-click="copyAddress(addr)">
-      Copy to clipboard
+      <i class="fi-clipboard-pencil"></i> Copy to clipboard
     </button>
   </div>
   <a class="close-reveal-modal show-for-large-up" ng-click="cancel()"><i class="fi-x size-18"></i></a>
diff --git a/views/modals/tx-details.html b/views/modals/tx-details.html
index a97ef245a..45ae1c5ab 100644
--- a/views/modals/tx-details.html
+++ b/views/modals/tx-details.html
@@ -1,5 +1,5 @@
 <nav class="tab-bar text-right hide-for-large-up">
-  <a ng-click="cancel()" class="p10 text-white">Close</a>
+  <span ng-click="cancel()" class="p10 text-white">Close</span>
 </nav>
 <div class="modal-mobile">
 <div class="header-modal text-center">
diff --git a/views/modals/txp-details.html b/views/modals/txp-details.html
index f7d9a466c..e9c2013cc 100644
--- a/views/modals/txp-details.html
+++ b/views/modals/txp-details.html
@@ -1,5 +1,5 @@
 <nav class="tab-bar text-right hide-for-large-up">
-  <a ng-click="cancel()" class="p10 text-white">Close</a>
+  <span ng-click="cancel()" class="p10 text-white">Close</span>
 </nav>
 <div class="modal-mobile">
 <div class="header-modal">
diff --git a/views/modals/walletSelection.html b/views/modals/walletSelection.html
index 22f5408cc..eda2d7afd 100644
--- a/views/modals/walletSelection.html
+++ b/views/modals/walletSelection.html
@@ -1,5 +1,5 @@
 <nav class="tab-bar text-right hide-for-large-up">
-  <a ng-click="cancel()" class="p10 text-white">Close</a>
+  <span ng-click="cancel()" class="p10 text-white">Close</span>
 </nav>
 <div class="modal-mobile" ng-init="setWallets()">
 
diff --git a/views/more.html b/views/more.html
index 227c46c98..7cf644f5b 100644
--- a/views/more.html
+++ b/views/more.html
@@ -145,7 +145,13 @@
           <span translate ng-hide="!hidePriv">Show</span>
           <span translate ng-hide="hidePriv">Hide</span>
         </a>
-        <textarea class="m10t" ng-hide="hidePriv">{{priv}}</textarea>
+        <div class="m10t" ng-hide="hidePriv">
+          <textarea>{{priv}}</textarea>
+          <span ng-if="isCordova" class="button outline dark-gray tiny" 
+            ng-click="copyText(priv)">
+            <i class="fi-clipboard-pencil"></i> Copy to clipboard
+          </span>
+        </div>
       </div>
     </div>
     <div class="large-12 columns">
@@ -193,7 +199,13 @@
           <span translate ng-hide="!hideSecret">Show</span>
           <span translate ng-hide="hideSecret">Hide</span>
         </a>
-        <textarea class="m10t" ng-hide="hideSecret">{{secret}}</textarea>
+        <div class="m10t" ng-hide="hideSecret">
+          <textarea>{{secret}}</textarea>
+          <span ng-if="isCordova" class="button outline dark-gray tiny" 
+            ng-click="copyText(secret)">
+            <i class="fi-clipboard-pencil"></i> Copy to clipboard
+          </span>
+        </div>
       </div>
     </div>
   </div>
diff --git a/views/receive.html b/views/receive.html
index a45b83a66..019a9c332 100644
--- a/views/receive.html
+++ b/views/receive.html
@@ -17,12 +17,12 @@
           </div>
         </div>
         <div class="m10t text-center" ng-show="isCordova">
-          <a href class="button-setup" 
+          <span class="button outline dark-gray tiny" 
             ng-click="shareAddress(addr)">
             <i class="fi-share"></i> Share address
-          </a>
+          </span>
         </div>
-        <div class="line-t m10t size-12">
+        <div class="line-t size-12">
           Share this with anyone to have them send you payments. To protect your privacy, new addresses are generated automatically once you use them.
         </div>
       </div>