From a13e12ff07c14d25558b1d3b1064368e6d1656d8 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 11:16:55 -0300 Subject: [PATCH 1/4] Smooth start on mobile --- public/views/disclaimer.html | 8 ++++-- src/js/routes.js | 54 +++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index 879d04da0..8f1426196 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -19,11 +19,13 @@

I affirm that I have read, understood, and agree with these terms.

-
- +
diff --git a/src/js/routes.js b/src/js/routes.js index 2c56b361c..1bc276d58 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -89,25 +89,27 @@ angular $scope.create = function(noWallet) { $scope.creatingProfile = true; - profileService.create({ - noWallet: noWallet - }, function(err) { - if (err) { - $scope.creatingProfile = false; - $log.warn(err); - $scope.error = err; - $scope.$apply(); - $timeout(function() { - $scope.create(noWallet); - }, 3000); - } - }); + $timeout(function() { + profileService.create({ + noWallet: noWallet + }, function(err) { + if (err) { + $scope.creatingProfile = false; + $log.warn(err); + $scope.error = err; + $scope.$apply(); + $timeout(function() { + $scope.create(noWallet); + }, 3000); + } + }); + }, 100); }; } } } }); - + $stateProvider .state('translators', { url: '/translators', @@ -125,7 +127,7 @@ angular views: { 'main': { templateUrl: 'views/disclaimer.html', - controller: function($scope, $timeout, storageService, applicationService, go) { + controller: function($scope, $timeout, storageService, applicationService, go, gettextCatalog, isCordova) { storageService.getCopayDisclaimerFlag(function(err, val) { $scope.agreed = val; $timeout(function() { @@ -134,11 +136,20 @@ angular }); $scope.agree = function() { - storageService.setCopayDisclaimerFlag(function(err) { - $timeout(function() { - applicationService.restart(); - }, 1000); - }); + if (isCordova) { + window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Loading...'), true); + } + $scope.loading = true; + $timeout(function() { + storageService.setCopayDisclaimerFlag(function(err) { + $timeout(function() { + if (isCordova) { + window.plugins.spinnerDialog.hide(); + } + applicationService.restart(); + }, 1000); + }); + }, 100); }; } } @@ -531,7 +542,7 @@ angular event.preventDefault(); } - /* + /* * -------------------- */ @@ -630,7 +641,6 @@ angular cachedBackPanel.getElementsByClassName('content')[0].scrollTop = sc; cachedTransitionState = desiredTransitionState; - //console.log('CACHing animation', cachedTransitionState); return false; } } From ba8e5dacc85b1ded6202a25139f24b3198392ea0 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 11:17:23 -0300 Subject: [PATCH 2/4] Hide some global preferences if noFocusedWallet --- public/views/preferences.html | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/public/views/preferences.html b/public/views/preferences.html index 3f1e1d0cf..bf7db5528 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -8,7 +8,7 @@
-
    +

      {{index.alias}} [{{index.walletName}}] settings

      @@ -55,29 +55,28 @@

      Global settings

      -
    • +
    • Language {{index.defaultLanguageName|translate}}
      • - -
    • +
    • Unit {{preferences.unitName}}
      • -
    • +
    • Alternative Currency {{preferences.selectedAlternative.name}}
      • -
    • Bitcoin Network Fee Policy @@ -85,7 +84,7 @@ {{index.feeOpts[index.currentFeeLevel]|translate}}
      • -
    • +
    • Use Unconfirmed Funds
      • From cdf16f0485cec075a10b0601e234b80c845896c6 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 11:18:16 -0300 Subject: [PATCH 3/4] Fix splash for large devices --- public/views/splash.html | 24 +++++++++++++++--------- src/css/main.css | 11 ++--------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/public/views/splash.html b/public/views/splash.html index 9fca6a0b6..5c343df9b 100644 --- a/public/views/splash.html +++ b/public/views/splash.html @@ -1,14 +1,16 @@ -
      +
      -
      -
      +
      +
      WELCOME TO COPAY

      A multisignature bitcoin wallet

      -
      - icon +
      +
      + icon +
      {{(error)|translate}}. Retrying... @@ -25,9 +27,13 @@ Creating Profile...
      -
      - -

      Already have a wallet?

      - +
      +
      + +

      Already have a wallet?

      + +
      diff --git a/src/css/main.css b/src/css/main.css index 00bc52152..ba8a7564a 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1085,20 +1085,13 @@ input.ng-invalid-match, input.ng-invalid-match:focus { } .splash { - width: 100%; - height: 100%; + top: 0; background: #2C3E50; - position: absolute; background-image: -webkit-linear-gradient(#3D5672 0%, #223243 100%); background-image: -o-linear-gradient(#3D5672 0%, #223243 100%); background-image: linear-gradient(#3D5672 0%, #223243 100%); } -.splash .start-button { - position: absolute; - bottom: 0; -} - .splash .start-button button.black { background-color: #4B6178; } @@ -1107,7 +1100,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { font-size: 0.58rem; } -.gif-splash { +.splash .container-image { padding: 2rem 0; } From 96f93411b324b740e801b613e4bcfd44503030e9 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Aug 2015 11:35:58 -0300 Subject: [PATCH 4/4] Fix layout for prefFee, logs, about, disclaimer, translators --- public/views/disclaimer.html | 2 +- public/views/preferencesAbout.html | 2 +- public/views/preferencesFee.html | 4 ++-- public/views/preferencesLogs.html | 4 ++-- public/views/translators.html | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index 8f1426196..f634daadd 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -23,7 +23,7 @@ Agree
      -
      diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html index 61e23b7bd..17ce28a14 100644 --- a/public/views/preferencesAbout.html +++ b/public/views/preferencesAbout.html @@ -6,7 +6,7 @@
      - Copay + Copay

      Release Information

      diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index 7eb64566d..2cf126cd1 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -12,7 +12,7 @@
    -
    +
    @@ -22,7 +22,7 @@
    -
    +
    Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy.
    diff --git a/public/views/preferencesLogs.html b/public/views/preferencesLogs.html index dbe0d6a53..d579c9922 100644 --- a/public/views/preferencesLogs.html +++ b/public/views/preferencesLogs.html @@ -8,8 +8,8 @@
    -
    - diff --git a/public/views/translators.html b/public/views/translators.html index 39187d299..fc7def514 100644 --- a/public/views/translators.html +++ b/public/views/translators.html @@ -23,7 +23,7 @@
  • cmgustavo83Spanish
  • lax5Russian
-
+

All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at