Skip to content

Commit

Permalink
Updated statusbar to be black text on white background.
Browse files Browse the repository at this point in the history
  • Loading branch information
Angel Mortega committed Jun 3, 2019
1 parent b2fa5ed commit d7d0969
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 11 deletions.
3 changes: 2 additions & 1 deletion app-template/config-template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
<preference name="cordova-custom-config-stoponerror" value="true" />

<preference name="StatusBarOverlaysWebView" value="true" />
<preference name="StatusBarStyle" value="lightcontent" />
<preference name="StatusBarStyle" value="default" />
<preference name="StatusBarBackgroundColor" value="#FBFCFF" />

<preference name="ShowSplashScreenSpinner" value="false" />
<preference name="AutoHideSplashScreen" value="false" />
Expand Down
2 changes: 1 addition & 1 deletion src/js/controllers/buy-bitcoin/home.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
function _onBeforeEnter(event, data) {
if ($window.StatusBar) {
$window.StatusBar.styleDefault();
$window.StatusBar.backgroundColorByHexString('#F0F0F0');
$window.StatusBar.backgroundColorByHexString('#FBFCFF');
}

_initVariables();
Expand Down
2 changes: 1 addition & 1 deletion src/js/controllers/buy-bitcoin/receipt.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
function _onBeforeEnter() {
if ($window.StatusBar) {
$window.StatusBar.styleDefault();
$window.StatusBar.backgroundColorByHexString('#F0F0F0');
$window.StatusBar.backgroundColorByHexString('#FBFCFF');
}

_initVariables();
Expand Down
4 changes: 2 additions & 2 deletions src/js/controllers/tab-home.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ angular
function onBeforeEnter (event, data) {

if ($window.StatusBar) {
$window.StatusBar.styleLightContent();
StatusBar.backgroundColorByHexString('#000000');
$window.StatusBar.styleDefault();
StatusBar.backgroundColorByHexString('#FBFCFF');
}

if (!$scope.homeTip) {
Expand Down
4 changes: 2 additions & 2 deletions src/js/controllers/wallet-details.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun

$scope.$on("$ionicView.beforeEnter", function(event, data) {
if ($window.StatusBar) {
$window.StatusBar.styleLightContent();
$window.StatusBar.styleDefault();
}

configService.whenAvailable(function (config) {
Expand Down Expand Up @@ -469,7 +469,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
refreshInterval = null;
}
if ($window.StatusBar) {
$window.StatusBar.backgroundColorByHexString('#000000');
$window.StatusBar.backgroundColorByHexString('#FBFCFF');
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/js/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -1609,7 +1609,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
screen.lockOrientation('portrait');

if (ionic.Platform.isAndroid() && platformInfo.isCordova && StatusBar) {
StatusBar.backgroundColorByHexString('#000000');
StatusBar.backgroundColorByHexString('#FBFCFF');
}

if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard && !platformInfo.isWP) {
Expand Down
8 changes: 5 additions & 3 deletions src/sass/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ $v-warning-color: #ffa500 !default;
$v-warning-color-2: #b7664d;
$v-error-color: #ef473a !default;

$v-background-root-color: #fbfcff;
$v-background-under-card: #fbfcff;

$v-wallet-color-map: (
Expand Down Expand Up @@ -192,9 +193,10 @@ $item-default-active-border: darken($v-subtle-gray, 7%)
$item-divider-bg: $v-subtle-gray !default;

$bar-default-border: $v-subtle-gray !default;
$bar-royal-bg: $v-primary-color !default;
$bar-royal-border: $v-primary-color !default;
$bar-royal-text: #ffffff !default;
$bar-royal-bg: $v-background-root-color !default;
$bar-royal-border: $v-background-root-color !default;
$bar-royal-text: #000 !default;
$toolbar-background: $v-background-root-color;

$tabs-icon-size: 22px !default;

Expand Down

0 comments on commit d7d0969

Please sign in to comment.