Merge pull request #5078 from bitjson/visual

fix visual bugs

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);
       });
     });

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;
 }

src/sass/views/address-book.scss

@@ -20,6 +20,7 @@
   }
 }
 #view-address-book {
+  @extend .deflash-blue;
   .scroll {
     height:100%;
   }

src/sass/views/amount.scss

@@ -1,4 +1,5 @@
 #view-amount {
+  @extend .deflash-blue;
   .recipient-label {
     font-size: 14px;
     padding-bottom: 0;

src/sass/views/confirm.scss

@@ -1,4 +1,5 @@
 #view-confirm {
+  @extend .deflash-blue;
   .tx-details-content > .scroll {
     padding-bottom: .25rem;
   }

src/sass/views/feedback/complete.scss

@@ -31,7 +31,7 @@
     margin: 1rem;
   }
   .send-feedback-illustration {
-    height: 21rem;
+    height: 16rem;
     margin: 1rem;
   }
   .feedback-title {

src/sass/views/feedback/send.scss

@@ -1,4 +1,5 @@
 #send-feedback {
+  @extend .deflash-blue;
   background-color: #ffffff;
   .row {
     border: none;

src/sass/views/tab-home.scss

@@ -1,4 +1,5 @@
 #tab-home {
+  @extend .deflash-blue;
   .icon-create-wallet {
     background-color: #4A90E2; // default wallet color
   }

src/sass/views/tab-receive.scss

@@ -1,4 +1,5 @@
 #tab-receive {
+  @extend .deflash-blue;
   ion-header-bar {
     button {
       i {

src/sass/views/tab-send.scss

@@ -1,4 +1,5 @@
 #tab-send {
+  @extend .deflash-blue;
   .qr-scan-icon a {
     z-index: 10;
     display: block;

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);

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.
       </div>
 
-      <ion-toggle class="has-comment" ng-model="developmentUtilitiesEnabled.value" toggle-class="toggle-balanced" ng-change="toggledDevelopmentUtils()">
+      <ion-toggle class="has-comment" ng-model="global.developmentUtilitiesEnabled.value" toggle-class="toggle-balanced" ng-change="toggledDevelopmentUtils()">
         <span class="toggle-label" translate>Development Utilities</span>
       </ion-toggle>
       <div class="comment" translate>
@@ -67,7 +67,7 @@
         <span transaction>If enabled, the Frequently Used card - a list of the most commonly chosen recipients - will appear in the Send tab.</span>
       </div> -->
 
-      <div ng-show="developmentUtilitiesEnabled.value">
+      <div ng-show="global.developmentUtilitiesEnabled.value">
         <div class="item item-divider" translate>Development Utilities</div>
         <div class="settings-explanation">
           <div class="settings-description" translate>
@@ -77,13 +77,13 @@
 
         <div class="item has-comment item-button-right">
           Feedback Card
-          <button class="button" ng-click="activateFeedbackCard()" ng-show="!feedbackCardActivating && !feedbackCardActivated">
+          <button class="button button-secondary" ng-click="activateFeedbackCard()" ng-show="!feedbackCardActivating && !feedbackCardActivated">
             Activate
           </button>
-          <button class="button button-clear" disabled ng-show="feedbackCardActivating">
+          <button class="button button-secondary button-clear" disabled ng-show="feedbackCardActivating">
             <ion-spinner></ion-spinner>
           </button>
-          <button class="button" ng-show="feedbackCardActivated" ng-click="resetActivateFeedbackCard()">
+          <button class="button button-secondary button-clear" ng-show="feedbackCardActivated" ng-click="resetActivateFeedbackCard()">
             Activated
           </button>
         </div>