From 38d86f6524f4ba70954cf02ff8318748f4a6b9a6 Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Wed, 16 May 2018 14:07:01 +0200 Subject: [PATCH 1/4] Improvement - 337 - Small fix for Android Status Bar Color --- src/js/routes.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/js/routes.js b/src/js/routes.js index 337363fcc..c4431e660 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -1251,6 +1251,12 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr if (screen.width < 768 && platformInfo.isCordova) screen.lockOrientation('portrait'); + if (window.StatusBar) { + if (ionic.Platform.isAndroid()) { + StatusBar.backgroundColorByHexString('#000000'); + } + } + if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard && !platformInfo.isWP) { cordova.plugins.Keyboard.hideKeyboardAccessoryBar(false); cordova.plugins.Keyboard.disableScroll(true); From f03560312bcd6750dc65b6c18190ba8f41e382c4 Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Wed, 16 May 2018 14:09:35 +0200 Subject: [PATCH 2/4] A little more compact --- src/js/routes.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/js/routes.js b/src/js/routes.js index c4431e660..d4d60746c 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -1251,10 +1251,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr if (screen.width < 768 && platformInfo.isCordova) screen.lockOrientation('portrait'); - if (window.StatusBar) { - if (ionic.Platform.isAndroid()) { + if (window.StatusBar && ionic.Platform.isAndroid()) { StatusBar.backgroundColorByHexString('#000000'); - } } if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard && !platformInfo.isWP) { From cc94e1c630954970c9a37433282d61689387a2ec Mon Sep 17 00:00:00 2001 From: Sebastiaan Pasma Date: Wed, 16 May 2018 14:22:37 +0200 Subject: [PATCH 3/4] Change back color when moving back from wallet detail view to home screen. --- src/js/controllers/walletDetails.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index acc0dce79..88ee871ff 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -410,8 +410,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.$on("$ionicView.afterLeave", function(event, data) { $interval.cancel(refreshInterval); if ($window.StatusBar) { - var statusBarColor = appConfigService.name == 'copay' ? '#192c3a' : '#1e3186'; - $window.StatusBar.backgroundColorByHexString(statusBarColor); + $window.StatusBar.backgroundColorByHexString('#000000'); } }); From 630dadda4812f4618303063a52f7348ece98a310 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Mon, 21 May 2018 16:24:25 +0900 Subject: [PATCH 4/4] Fix - 337 - Consistent StatusBar --- src/js/routes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/routes.js b/src/js/routes.js index d4d60746c..b78beffc6 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -1251,8 +1251,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr if (screen.width < 768 && platformInfo.isCordova) screen.lockOrientation('portrait'); - if (window.StatusBar && ionic.Platform.isAndroid()) { - StatusBar.backgroundColorByHexString('#000000'); + if (StatusBar && ionic.Platform.isAndroid()) { + StatusBar.backgroundColorByHexString('#000000'); } if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard && !platformInfo.isWP) {