From 1df951ad85352a1df4d720fe0fbb2211df6a4c8e Mon Sep 17 00:00:00 2001 From: JDonadio Date: Fri, 10 Mar 2017 17:04:36 -0300 Subject: [PATCH] styling dead view --- src/js/controllers/deadview.js | 6 +++- src/js/routes.js | 4 +-- src/sass/views/deadview.scss | 36 ++++++++++++++++++++ src/sass/views/views.scss | 1 + www/img/icon-fingerprint-bitpay.svg | 52 +++++++++++++++++++++++++++++ www/img/icon-fingerprint-copay.svg | 52 +++++++++++++++++++++++++++++ www/views/deadview.html | 16 +++++---- www/views/pincode.html | 2 +- 8 files changed, 159 insertions(+), 10 deletions(-) create mode 100644 src/sass/views/deadview.scss create mode 100644 www/img/icon-fingerprint-bitpay.svg create mode 100644 www/img/icon-fingerprint-copay.svg diff --git a/src/js/controllers/deadview.js b/src/js/controllers/deadview.js index 41b7b6ce4..c16faddd8 100644 --- a/src/js/controllers/deadview.js +++ b/src/js/controllers/deadview.js @@ -1,6 +1,10 @@ 'use strict'; -angular.module('copayApp.controllers').controller('deadviewController', function($state, $scope, $ionicHistory, fingerprintService) { +angular.module('copayApp.controllers').controller('deadviewController', function($state, $scope, $ionicHistory, fingerprintService, appConfigService, gettextCatalog) { + $scope.$on("$ionicView.beforeEnter", function(event) { + $scope.title = appConfigService.nameCase + ' ' + gettextCatalog.getString('is locked'); + $scope.appName = appConfigService.name; + }); $scope.requestFingerprint = function() { fingerprintService.check('unlockingApp', function(err) { diff --git a/src/js/routes.js b/src/js/routes.js index 9f8aecbb4..1c7188c00 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -1199,7 +1199,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr configService.whenAvailable(function(config) { var nextView; var lockapp = config.lockapp; - if (fingerprintService.isAvailable() && lockapp.fingerprint && lockapp.fingerprint.enabled) { + if (platformInfo.isCordova && fingerprintService.isAvailable() && lockapp.fingerprint && lockapp.fingerprint.enabled) { fingerprintService.check('unlockingApp', function(err) { if (err) nextView = 'deadview'; else nextView = $ionicHistory.currentStateName(); @@ -1259,7 +1259,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr configService.whenAvailable(function(config) { var lockapp = config.lockapp; startupService.ready(); - if (fingerprintService.isAvailable() && lockapp.fingerprint && lockapp.fingerprint.enabled) { + if (platformInfo.isCordova && fingerprintService.isAvailable() && lockapp.fingerprint && lockapp.fingerprint.enabled) { fingerprintService.check('unlockingApp', function(err) { if (err) goTo('deadview'); else goTo('tabs.home'); diff --git a/src/sass/views/deadview.scss b/src/sass/views/deadview.scss new file mode 100644 index 000000000..06c9ee17c --- /dev/null +++ b/src/sass/views/deadview.scss @@ -0,0 +1,36 @@ +#dead-view { + @mixin img-frame { + height: 60px; + width: 60px; + box-shadow: none; + margin: auto; + } + .img-container-copay { + padding: 20%; + .big-icon-svg { + > .bg { + @include img-frame; + background-image: url("../img/icon-fingerprint-copay.svg"); + } + } + } + .img-container-bitpay { + padding: 20%; + .big-icon-svg { + > .bg { + @include img-frame; + background-image: url("../img/icon-fingerprint-bitpay.svg"); + } + } + } + .comments { + text-align: center; + .header { + font-size: 20px; + } + .text-content { + width: 90%; + margin: 5% auto; + } + } +} diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index 5516fd9ab..ac53386d8 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -47,3 +47,4 @@ @import "integrations/integrations"; @import "custom-amount"; @import "pincode"; +@import "deadview"; diff --git a/www/img/icon-fingerprint-bitpay.svg b/www/img/icon-fingerprint-bitpay.svg new file mode 100644 index 000000000..edf9f95da --- /dev/null +++ b/www/img/icon-fingerprint-bitpay.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/icon-fingerprint-copay.svg b/www/img/icon-fingerprint-copay.svg new file mode 100644 index 000000000..dcad0d889 --- /dev/null +++ b/www/img/icon-fingerprint-copay.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/views/deadview.html b/www/views/deadview.html index f68ddce16..4716b1292 100644 --- a/www/views/deadview.html +++ b/www/views/deadview.html @@ -1,14 +1,18 @@ - + - {{'App Locked' | translate}} + {{title}} -
- APP LOCKED +
+
-
- Request Fingerprint Authentication +
+
+
+
+
One-touch Sign In
+
Please place your fingertip on the scanner to verify your identity
diff --git a/www/views/pincode.html b/www/views/pincode.html index 9e653e5eb..fe98700b2 100644 --- a/www/views/pincode.html +++ b/www/views/pincode.html @@ -8,7 +8,7 @@
Confirm your mobile unlock code
-
+