From d38a3a01be230d67832318a5cb1023b58fb43287 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 14 Sep 2016 14:07:44 -0400 Subject: [PATCH] added screenshot model --- public/img/onboarding-no-screenshot.svg | 27 +++++++++++++++++++ public/views/includes/confirmBackupPopup.html | 12 +-------- .../includes/screenshotWarningModal.html | 16 +++++++++++ .../controllers/onboarding/backupWarning.js | 16 ++++++----- src/sass/views/includes/modals/modals.scss | 12 +++++++-- .../modals/screenshot-warning-model.scss | 7 +++++ 6 files changed, 71 insertions(+), 19 deletions(-) create mode 100644 public/img/onboarding-no-screenshot.svg create mode 100644 public/views/includes/screenshotWarningModal.html create mode 100644 src/sass/views/includes/modals/screenshot-warning-model.scss diff --git a/public/img/onboarding-no-screenshot.svg b/public/img/onboarding-no-screenshot.svg new file mode 100644 index 000000000..7ae7b3f4e --- /dev/null +++ b/public/img/onboarding-no-screenshot.svg @@ -0,0 +1,27 @@ + + + + no-screenshot + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/views/includes/confirmBackupPopup.html b/public/views/includes/confirmBackupPopup.html index efe63ee09..8f4cffc22 100644 --- a/public/views/includes/confirmBackupPopup.html +++ b/public/views/includes/confirmBackupPopup.html @@ -1,6 +1,6 @@ diff --git a/public/views/includes/screenshotWarningModal.html b/public/views/includes/screenshotWarningModal.html new file mode 100644 index 000000000..0994ea628 --- /dev/null +++ b/public/views/includes/screenshotWarningModal.html @@ -0,0 +1,16 @@ + diff --git a/src/js/controllers/onboarding/backupWarning.js b/src/js/controllers/onboarding/backupWarning.js index 4538124a2..6b83ee964 100644 --- a/src/js/controllers/onboarding/backupWarning.js +++ b/src/js/controllers/onboarding/backupWarning.js @@ -1,16 +1,20 @@ 'use strict'; -angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, $ionicPopup, profileService) { +angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, $ionicPopup, profileService, $ionicModal) { $scope.walletId = $stateParams.walletId; $scope.openPopup = function() { - var backupWarningPopup = $ionicPopup.show({ - templateUrl: "views/includes/backupWarningPopup.html", - scope: $scope, - }); + $ionicModal.fromTemplateUrl('views/includes/screenshotWarningModal.html', { + scope: $scope, + backdropClickToClose: false, + hardwareBackButtonClose: false + }).then(function(modal) { + $scope.warningModal = modal; + $scope.warningModal.show(); + }); $scope.close = function() { - backupWarningPopup.close(); + $scope.warningModal.hide(); $state.go('onboarding.backup', { walletId: $stateParams.walletId, fromOnboarding: true diff --git a/src/sass/views/includes/modals/modals.scss b/src/sass/views/includes/modals/modals.scss index ced60fd17..c38cc8c22 100644 --- a/src/sass/views/includes/modals/modals.scss +++ b/src/sass/views/includes/modals/modals.scss @@ -11,8 +11,15 @@ padding: 1rem; border-radius: .25rem .25rem 0 0; min-height: 120px; - &-success { - background: url('../img/onboarding-success.svg') no-repeat center; + &-img{ + height: 6rem; + background-size: contain; + margin-top: .3rem; + background-repeat: no-repeat; + background-position: center; + } + &-img-success { + background-image: url('../img/onboarding-success.svg'); height: 6rem; background-size: contain; margin-top: .3rem; @@ -45,3 +52,4 @@ } @import "backup-confirm-modal"; +@import "screenshot-warning-model"; diff --git a/src/sass/views/includes/modals/screenshot-warning-model.scss b/src/sass/views/includes/modals/screenshot-warning-model.scss new file mode 100644 index 000000000..e979e9ff8 --- /dev/null +++ b/src/sass/views/includes/modals/screenshot-warning-model.scss @@ -0,0 +1,7 @@ +#screenshot-warning-modal{ + .popup-modal-header{ + &-img{ + background-image: url('../img/onboarding-no-screenshot.svg'); + } + } +} \ No newline at end of file