From c2c70779faf2d10b800a3408f4dbe3fbf4eb1f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Mon, 19 Sep 2016 12:06:46 -0300 Subject: [PATCH] add home tip when onboarding is finished --- public/views/tab-home.html | 16 +++++++++ src/js/controllers/import.js | 4 ++- src/js/controllers/onboarding/disclaimer.js | 4 ++- src/js/controllers/onboarding/terms.js | 4 ++- src/js/controllers/tab-home.js | 4 +-- src/js/routes.js | 40 ++++++++++----------- src/sass/common.scss | 5 +++ src/sass/views/tab-home.scss | 21 ++++++++++- 8 files changed, 72 insertions(+), 26 deletions(-) diff --git a/public/views/tab-home.html b/public/views/tab-home.html index 935b34bb7..37a0a08dd 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -5,6 +5,22 @@ +
+
+ +
+
+ + + +
+
+ Your bitcoin wallet is ready! +
+
+ On this screen you can see all your wallets, accounts, and assets. +
+
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 01d452c6b..45d03da1f 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -345,6 +345,8 @@ angular.module('copayApp.controllers').controller('importController', if (err) $log.error(err); }); } - $state.go('tabs.home'); + $state.go('tabs.home', { + fromOnboarding: $stateParams.fromOnboarding + }); }; }); diff --git a/src/js/controllers/onboarding/disclaimer.js b/src/js/controllers/onboarding/disclaimer.js index c4ffbe7cd..3a66c39d8 100644 --- a/src/js/controllers/onboarding/disclaimer.js +++ b/src/js/controllers/onboarding/disclaimer.js @@ -15,7 +15,9 @@ angular.module('copayApp.controllers').controller('disclaimerController', functi profileService.setDisclaimerAccepted(function(err) { if (err) $log.error(err); else { - $state.go('tabs.home'); + $state.go('tabs.home', { + fromOnboarding: true + }); } }); }; diff --git a/src/js/controllers/onboarding/terms.js b/src/js/controllers/onboarding/terms.js index 5f6955e09..0c4773c04 100644 --- a/src/js/controllers/onboarding/terms.js +++ b/src/js/controllers/onboarding/terms.js @@ -8,7 +8,9 @@ angular.module('copayApp.controllers').controller('termsController', function($s profileService.setDisclaimerAccepted(function(err) { if (err) $log.error(err); else { - $state.go('tabs.home'); + $state.go('tabs.home', { + fromOnboarding: true + }); } }); }; diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 18f0b236a..1049ae2dd 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -1,13 +1,13 @@ 'use strict'; angular.module('copayApp.controllers').controller('tabHomeController', - function($rootScope, $timeout, $scope, $state, $ionicScrollDelegate, lodash, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window) { + function($rootScope, $timeout, $scope, $state, $stateParams, $ionicScrollDelegate, lodash, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window) { $scope.externalServices = {}; $scope.bitpayCardEnabled = true; // TODO $scope.openTxpModal = txpModalService.open; $scope.version = $window.version; $scope.name = $window.appConfig.nameCase; - + $scope.homeTip = $stateParams.fromOnboarding; configService.whenAvailable(function() { var config = configService.getSync(); var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova; diff --git a/src/js/routes.js b/src/js/routes.js index c520854c3..82d115f1d 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -186,7 +186,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr templateUrl: 'views/tabs.html' }) .state('tabs.home', { - url: '/home', + url: '/home/:fromOnboarding', views: { 'tab-home': { templateUrl: 'views/tab-home.html', @@ -632,29 +632,29 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) - /* - * - * Buy or Sell Bitcoin - * - */ + /* + * + * Buy or Sell Bitcoin + * + */ - .state('tabs.buyandsell', { - url: '/buyandsell', - views: { - 'tab-home': { - templateUrl: 'views/buyandsell.html' - } + .state('tabs.buyandsell', { + url: '/buyandsell', + views: { + 'tab-home': { + templateUrl: 'views/buyandsell.html' } - }) + } + }) - /* - * - * Glidera - * - * - */ + /* + * + * Glidera + * + * + */ - .state('tabs.buyandsell.glidera', { + .state('tabs.buyandsell.glidera', { url: '/glidera', views: { 'tab-home@tabs': { diff --git a/src/sass/common.scss b/src/sass/common.scss index 3d287431c..0a3972087 100644 --- a/src/sass/common.scss +++ b/src/sass/common.scss @@ -12,6 +12,11 @@ font-weight: lighter; } +.icon.close-home-tip { + color: #666; + font-size: 38px; +} + .icon.list-add-button { color: #666; font-size: 38px; diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index cd360427a..66399540c 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -20,5 +20,24 @@ padding-top: 20px; padding-bottom: 20px; } - + .homeTip { + .item { + border-style: none; + } + div { + text-align: center; + margin-top: 20px; + margin-bottom: 20px; + } + .title { + font-size: 20px; + font-weight: bold; + } + .subtitle{ + margin-left: 25px; + margin-right: 25px; + font-size: 18px; + font-weight: 100; + } + } }