diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js index 6f8712544..22256de57 100644 --- a/src/js/controllers/advancedSettings.js +++ b/src/js/controllers/advancedSettings.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $rootScope, $log, $window, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService, storageService, $ionicHistory, $timeout) { +angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $rootScope, $log, $window, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService, storageService, $ionicHistory, $timeout, $ionicScrollDelegate) { var updateConfig = function() { @@ -27,14 +27,19 @@ angular.module('copayApp.controllers').controller('advancedSettingsController', $scope.frequentlyUsedEnabled = { value: config.frequentlyUsed.enabled }; - $scope.developmentUtilitiesEnabled = { - value: false - }; }; + $scope.global = $rootScope; + if(!$scope.global.developmentUtilitiesEnabled){ + $scope.global.developmentUtilitiesEnabled = { + value: false + }; + } + $scope.toggledDevelopmentUtils = function (){ - if($scope.developmentUtilitiesEnabled.value){ + if($scope.global.developmentUtilitiesEnabled.value){ $log.debug('User enabled development utilities.'); + $ionicScrollDelegate.resize(); } else { $log.debug('User disabled development utilities.'); } @@ -54,6 +59,9 @@ angular.module('copayApp.controllers').controller('advancedSettingsController', $timeout(function(){ $scope.feedbackCardActivating = false; $scope.feedbackCardActivated = true; + $timeout(function(){ + $scope.feedbackCardActivated = false; + }, 10000); }, 500); }); }); diff --git a/src/sass/ionic.scss b/src/sass/ionic.scss index 899e8fe69..7a5597fb7 100644 --- a/src/sass/ionic.scss +++ b/src/sass/ionic.scss @@ -41,7 +41,7 @@ $placeholder-icon-padding: 10px; // A somewhat dirty solution to the nav-bar "flashing" during page transitions. // Since the old nav-bar is hidden before the new one is shown, this pseudo // element fills the space with the proper background color. -ion-view.pane:before { +ion-view.deflash-blue:before { content: " "; display: block; position: absolute; @@ -51,6 +51,6 @@ ion-view.pane:before { height: $bar-height; background-color: $royal; } -.platform-ios ion-view.pane:before { +.platform-ios.platform-cordova:not(.fullscreen) ion-view.deflash-blue:before { height: $bar-height + $ios-statusbar-height; } diff --git a/src/sass/views/address-book.scss b/src/sass/views/address-book.scss index 7d2695296..96fefb608 100644 --- a/src/sass/views/address-book.scss +++ b/src/sass/views/address-book.scss @@ -20,6 +20,7 @@ } } #view-address-book { + @extend .deflash-blue; .scroll { height:100%; } diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss index eec888643..47df0f90f 100644 --- a/src/sass/views/amount.scss +++ b/src/sass/views/amount.scss @@ -1,4 +1,5 @@ #view-amount { + @extend .deflash-blue; .recipient-label { font-size: 14px; padding-bottom: 0; diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss index 6ae3d89d1..4f6cbc0af 100644 --- a/src/sass/views/confirm.scss +++ b/src/sass/views/confirm.scss @@ -1,4 +1,5 @@ #view-confirm { + @extend .deflash-blue; .tx-details-content > .scroll { padding-bottom: .25rem; } diff --git a/src/sass/views/feedback/complete.scss b/src/sass/views/feedback/complete.scss index 2b0bdb91f..fc6413e7a 100644 --- a/src/sass/views/feedback/complete.scss +++ b/src/sass/views/feedback/complete.scss @@ -31,7 +31,7 @@ margin: 1rem; } .send-feedback-illustration { - height: 21rem; + height: 16rem; margin: 1rem; } .feedback-title { diff --git a/src/sass/views/feedback/send.scss b/src/sass/views/feedback/send.scss index 38e18c267..b9fafa8b1 100644 --- a/src/sass/views/feedback/send.scss +++ b/src/sass/views/feedback/send.scss @@ -1,4 +1,5 @@ #send-feedback { + @extend .deflash-blue; background-color: #ffffff; .row { border: none; diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index ca1a7bde9..80ed81634 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -1,4 +1,5 @@ #tab-home { + @extend .deflash-blue; .icon-create-wallet { background-color: #4A90E2; // default wallet color } diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index b12ef4e9e..ebb9e3ef2 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -1,4 +1,5 @@ #tab-receive { + @extend .deflash-blue; ion-header-bar { button { i { diff --git a/src/sass/views/tab-send.scss b/src/sass/views/tab-send.scss index 8308bd90c..4821d2570 100644 --- a/src/sass/views/tab-send.scss +++ b/src/sass/views/tab-send.scss @@ -1,4 +1,5 @@ #tab-send { + @extend .deflash-blue; .qr-scan-icon a { z-index: 10; display: block; diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss index 4e38c8532..c78445097 100644 --- a/src/sass/views/tab-settings.scss +++ b/src/sass/views/tab-settings.scss @@ -1,4 +1,5 @@ .settings { + @extend .deflash-blue; .item { color: $dark-gray; border-color: rgba(221, 221, 221, 0.3); diff --git a/www/img/illustration-send-feedback.png b/www/img/illustration-send-feedback.png index 3d3b451a1..6718b4325 100644 Binary files a/www/img/illustration-send-feedback.png and b/www/img/illustration-send-feedback.png differ diff --git a/www/views/advancedSettings.html b/www/views/advancedSettings.html index 41c417d26..c95fcfc60 100644 --- a/www/views/advancedSettings.html +++ b/www/views/advancedSettings.html @@ -51,7 +51,7 @@ If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab. - + Development Utilities
@@ -67,7 +67,7 @@ If enabled, the Frequently Used card - a list of the most commonly chosen recipients - will appear in the Send tab.
--> -
+
Development Utilities
@@ -77,13 +77,13 @@
Feedback Card - - -