From 6194dfa817a6a647dfddf9d73ba79ac1edb49254 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Sat, 6 Jan 2018 23:47:26 -0300 Subject: [PATCH 1/4] Fix header WalletDetails. Fix cordova plugins StatusBar --- app-template/bitpay/sass/overrides.scss | 1 + app-template/config-template.xml | 14 +++++++------- app-template/copay/sass/overrides.scss | 1 + package.json | 12 ++++++------ src/app/app.component.ts | 9 --------- src/pages/home/home.html | 4 +++- src/pages/home/home.scss | 8 ++++++++ src/pages/wallet-details/wallet-details.html | 4 ++-- src/pages/wallet-details/wallet-details.scss | 16 +++++++++++----- src/theme/global.scss | 11 +++++++++++ 10 files changed, 50 insertions(+), 30 deletions(-) diff --git a/app-template/bitpay/sass/overrides.scss b/app-template/bitpay/sass/overrides.scss index db6c26a5f..3c55a7318 100644 --- a/app-template/bitpay/sass/overrides.scss +++ b/app-template/bitpay/sass/overrides.scss @@ -22,3 +22,4 @@ $colors: ( ); $icon-border-radius: 50%; +$toolbar-background: #1e3186; diff --git a/app-template/config-template.xml b/app-template/config-template.xml index 0545f5f03..cbc223230 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -18,11 +18,11 @@ - + @@ -42,21 +42,21 @@ - + - + - + - - - + + + diff --git a/app-template/copay/sass/overrides.scss b/app-template/copay/sass/overrides.scss index a2d9ae5a0..21fd5fdef 100644 --- a/app-template/copay/sass/overrides.scss +++ b/app-template/copay/sass/overrides.scss @@ -22,3 +22,4 @@ $colors: ( ); $icon-border-radius: 3px; +$toolbar-background: #192c3a; diff --git a/package.json b/package.json index fafd3dacf..8dc08e01d 100644 --- a/package.json +++ b/package.json @@ -91,17 +91,17 @@ "cordova-plugin-android-fingerprint-auth": "^1.4.0", "cordova-plugin-compat": "^1.2.0", "cordova-plugin-customurlscheme": "https://github.com/cmgustavo/Custom-URL-scheme.git#v4.0", - "cordova-plugin-device": "^2.0.1", - "cordova-plugin-dialogs": "^2.0.1", + "cordova-plugin-device": "^1.1.7", + "cordova-plugin-dialogs": "^1.3.4", "cordova-plugin-fcm": "https://github.com/cmgustavo/cordova-plugin-fcm.git#v4.0", "cordova-plugin-file": "^6.0.1", "cordova-plugin-globalization": "^1.0.9", - "cordova-plugin-inappbrowser": "^2.0.1", + "cordova-plugin-inappbrowser": "^1.7.2", "cordova-plugin-ionic-webview": "^1.1.16", - "cordova-plugin-network-information": "^2.0.1", + "cordova-plugin-network-information": "^1.3.4", "cordova-plugin-qrscanner": "^2.5.0", "cordova-plugin-spinner-dialog": "^1.3.1", - "cordova-plugin-splashscreen": "^5.0.1", + "cordova-plugin-splashscreen": "^4.1.0", "cordova-plugin-statusbar": "^2.4.1", "cordova-plugin-swift-support": "^3.1.1", "cordova-plugin-touch-id": "^3.3.1", @@ -195,4 +195,4 @@ "ios" ] } -} \ No newline at end of file +} diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 989f18489..a453a0b08 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,7 +1,5 @@ import { Component } from '@angular/core'; import { Platform, ModalController } from 'ionic-angular'; -import { StatusBar } from '@ionic-native/status-bar'; -import { SplashScreen } from '@ionic-native/splash-screen'; //providers import { Logger } from '@nsalaun/ng-logger'; @@ -33,8 +31,6 @@ export class CopayApp { constructor( private platform: Platform, - private statusBar: StatusBar, - private splashScreen: SplashScreen, private logger: Logger, private app: AppProvider, private profile: ProfileProvider, @@ -59,11 +55,6 @@ export class CopayApp { ' - v' + this.app.info.version + ' #' + this.app.info.commitHash); - if (this.platform.is('cordova')) { - this.statusBar.overlaysWebView(true); - this.statusBar.styleLightContent(); - this.splashScreen.hide(); - } // Check Profile this.profile.loadAndBindProfile().then((profile: any) => { this.openLockModal(); diff --git a/src/pages/home/home.html b/src/pages/home/home.html index c6e2540b1..99d53e034 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -1,6 +1,8 @@ - {{'Home' | translate}} + + + diff --git a/src/pages/home/home.scss b/src/pages/home/home.scss index f2a162181..6c822d813 100644 --- a/src/pages/home/home.scss +++ b/src/pages/home/home.scss @@ -1,4 +1,12 @@ page-home { + .home-logo { + height: 26px; + position: relative; + top: 3px; + } + .toolbar-title-ios { + text-align: center; + } .check{ text-align: center; .title { diff --git a/src/pages/wallet-details/wallet-details.html b/src/pages/wallet-details/wallet-details.html index 81adb1bc6..99c254262 100644 --- a/src/pages/wallet-details/wallet-details.html +++ b/src/pages/wallet-details/wallet-details.html @@ -1,5 +1,5 @@ - - + + {{wallet.name}} diff --git a/src/pages/wallet-details/wallet-details.scss b/src/pages/wallet-details/wallet-details.scss index dfc812e23..9c5da6d41 100644 --- a/src/pages/wallet-details/wallet-details.scss +++ b/src/pages/wallet-details/wallet-details.scss @@ -1,16 +1,22 @@ page-wallet-details { + ion-header { + .toolbar-title, ion-icon { + color: color($colors, light); + } + background: color($colors, primary); + } .balance-card { background: color($colors, primary); } .balance-header { position: relative; color: color($colors, light); - height: 14rem; + height: 12rem; text-align: center; } .balance-str { cursor: pointer; - padding-top: 5rem; + padding-top: 3rem; font-size: 35px; font-weight: 600; } @@ -20,12 +26,12 @@ page-wallet-details { } .balance-hidden { cursor: pointer; - padding-top: 5rem; + padding-top: 3rem; font-size: 20px; font-weight: 500; } .balance-error { - padding: 10% 1rem 0 1rem; + padding: 5% 1rem 0 1rem; } .balance-spendable { cursor: pointer; @@ -35,7 +41,7 @@ page-wallet-details { } } .balance-scanning { - padding-top: 6rem; + padding-top: 3rem; } .tx-history { img { diff --git a/src/theme/global.scss b/src/theme/global.scss index f2972409b..9df8ef53a 100644 --- a/src/theme/global.scss +++ b/src/theme/global.scss @@ -35,6 +35,17 @@ $refresher-icon-color: color($colors, primary); height: 70px; } +/* Ionic Overrides and Workarounds */ +// Please include a description of the problem solved by the workaround. + +// the ion tabs element never needs it's own background (backgrounds are +// rendered by the tabs), and the default background would cover the scanner +ion-tabs.ion-tabs-transparent { + background: none transparent; +} + +ion-nav-bar.hide { display: block !important; } + // Hide border when refresh .has-refresher > .scroll-content { border-top: none !important; From 6dc8144fc2350d5b51f04880f7715c6d0d1b682a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Sun, 7 Jan 2018 00:30:45 -0300 Subject: [PATCH 2/4] Adds StatusBar --- app-template/config-template.xml | 12 ++++++------ package.json | 10 +++++----- src/app/app.component.ts | 10 ++++++++++ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app-template/config-template.xml b/app-template/config-template.xml index cbc223230..9ee7c2fc3 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -42,21 +42,21 @@ - + - + - + - - - + + + diff --git a/package.json b/package.json index 8dc08e01d..3f184a95f 100644 --- a/package.json +++ b/package.json @@ -91,17 +91,17 @@ "cordova-plugin-android-fingerprint-auth": "^1.4.0", "cordova-plugin-compat": "^1.2.0", "cordova-plugin-customurlscheme": "https://github.com/cmgustavo/Custom-URL-scheme.git#v4.0", - "cordova-plugin-device": "^1.1.7", - "cordova-plugin-dialogs": "^1.3.4", + "cordova-plugin-device": "^2.0.1", + "cordova-plugin-dialogs": "^2.0.1", "cordova-plugin-fcm": "https://github.com/cmgustavo/cordova-plugin-fcm.git#v4.0", "cordova-plugin-file": "^6.0.1", "cordova-plugin-globalization": "^1.0.9", - "cordova-plugin-inappbrowser": "^1.7.2", + "cordova-plugin-inappbrowser": "^2.0.1", "cordova-plugin-ionic-webview": "^1.1.16", - "cordova-plugin-network-information": "^1.3.4", + "cordova-plugin-network-information": "^2.0.1", "cordova-plugin-qrscanner": "^2.5.0", "cordova-plugin-spinner-dialog": "^1.3.1", - "cordova-plugin-splashscreen": "^4.1.0", + "cordova-plugin-splashscreen": "^5.0.1", "cordova-plugin-statusbar": "^2.4.1", "cordova-plugin-swift-support": "^3.1.1", "cordova-plugin-touch-id": "^3.3.1", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index a453a0b08..77d0ca2bd 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,5 +1,7 @@ import { Component } from '@angular/core'; import { Platform, ModalController } from 'ionic-angular'; +import { StatusBar } from '@ionic-native/status-bar'; +import { SplashScreen } from '@ionic-native/splash-screen'; //providers import { Logger } from '@nsalaun/ng-logger'; @@ -31,6 +33,8 @@ export class CopayApp { constructor( private platform: Platform, + private statusBar: StatusBar, + private splashScreen: SplashScreen, private logger: Logger, private app: AppProvider, private profile: ProfileProvider, @@ -55,6 +59,12 @@ export class CopayApp { ' - v' + this.app.info.version + ' #' + this.app.info.commitHash); + if (this.platform.is('cordova')) { + this.statusBar.show(); + this.statusBar.overlaysWebView(true); + this.statusBar.styleLightContent(); + this.splashScreen.hide(); + } // Check Profile this.profile.loadAndBindProfile().then((profile: any) => { this.openLockModal(); From 245815631dcc51b7cbf262048a01fce47d98ef98 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Sun, 7 Jan 2018 01:30:20 -0300 Subject: [PATCH 3/4] Fix onboarding header. Fix wallet details header --- .../onboarding/backup-request/backup-request.scss | 9 +++++++-- src/pages/onboarding/collect-email/collect-email.html | 6 +++--- src/pages/onboarding/collect-email/collect-email.scss | 11 ++++++++--- src/pages/onboarding/disclaimer/disclaimer.html | 4 ++-- src/pages/onboarding/disclaimer/disclaimer.scss | 9 +++++++-- src/pages/onboarding/tour/tour.html | 2 +- src/pages/onboarding/tour/tour.scss | 9 +++++++-- src/pages/wallet-details/wallet-details.html | 2 +- src/pages/wallet-details/wallet-details.scss | 10 +++++----- src/theme/global.scss | 11 ----------- 10 files changed, 41 insertions(+), 32 deletions(-) diff --git a/src/pages/onboarding/backup-request/backup-request.scss b/src/pages/onboarding/backup-request/backup-request.scss index f5502f04f..6766f7c4c 100644 --- a/src/pages/onboarding/backup-request/backup-request.scss +++ b/src/pages/onboarding/backup-request/backup-request.scss @@ -1,7 +1,12 @@ page-backup-request { text-align: center; - .toolbar-background{ - background-color: transparent; + ion-header { + .toolbar-title, ion-icon { + color: color($colors, primary); + } + .toolbar-background { + background-color: transparent; + } } p { line-height: 1.6; diff --git a/src/pages/onboarding/collect-email/collect-email.html b/src/pages/onboarding/collect-email/collect-email.html index 5da7ef85b..5d3b1c635 100644 --- a/src/pages/onboarding/collect-email/collect-email.html +++ b/src/pages/onboarding/collect-email/collect-email.html @@ -2,7 +2,7 @@ - + @@ -22,7 +22,7 @@ - + Get news and updates from BitPay @@ -48,4 +48,4 @@ - \ No newline at end of file + diff --git a/src/pages/onboarding/collect-email/collect-email.scss b/src/pages/onboarding/collect-email/collect-email.scss index 1eb5d6fa1..1bf8ab7e9 100644 --- a/src/pages/onboarding/collect-email/collect-email.scss +++ b/src/pages/onboarding/collect-email/collect-email.scss @@ -1,8 +1,13 @@ page-collect-email { - text-align: center; - .toolbar-background{ - background-color: transparent; + ion-header { + .toolbar-title, ion-icon { + color: color($colors, primary); + } + .toolbar-background { + background-color: transparent; + } } + text-align: center; p { line-height: 1.6; font-size: 18px; diff --git a/src/pages/onboarding/disclaimer/disclaimer.html b/src/pages/onboarding/disclaimer/disclaimer.html index 41683a890..63908bf91 100644 --- a/src/pages/onboarding/disclaimer/disclaimer.html +++ b/src/pages/onboarding/disclaimer/disclaimer.html @@ -5,7 +5,7 @@

Quick review!

Almost done! Let's review.

Bitcoin is different – it cannot be safely held with a bank or web service.

- + I understand that my funds are held securely on this device, not by a company. @@ -17,7 +17,7 @@
Terms of Use - + I have read, understood, and agree to the diff --git a/src/pages/onboarding/disclaimer/disclaimer.scss b/src/pages/onboarding/disclaimer/disclaimer.scss index da6a1b2a9..08f291be3 100644 --- a/src/pages/onboarding/disclaimer/disclaimer.scss +++ b/src/pages/onboarding/disclaimer/disclaimer.scss @@ -1,7 +1,12 @@ page-disclaimer { text-align: center; - .toolbar-background{ - background-color: transparent; + ion-header { + .toolbar-title, ion-icon { + color: color($colors, primary); + } + .toolbar-background { + background-color: transparent; + } } .link { font-size: 2vh; diff --git a/src/pages/onboarding/tour/tour.html b/src/pages/onboarding/tour/tour.html index 533175f40..bb5c105e1 100644 --- a/src/pages/onboarding/tour/tour.html +++ b/src/pages/onboarding/tour/tour.html @@ -2,7 +2,7 @@ - diff --git a/src/pages/onboarding/tour/tour.scss b/src/pages/onboarding/tour/tour.scss index fea109ba8..b134fc15b 100644 --- a/src/pages/onboarding/tour/tour.scss +++ b/src/pages/onboarding/tour/tour.scss @@ -1,6 +1,11 @@ page-tour { - .toolbar-background{ - background-color: transparent; + ion-header { + .toolbar-title, ion-icon { + color: color($colors, primary); + } + .toolbar-background { + background-color: transparent; + } } .bottom-absolute { padding: 15px 15px 5vh 15px; diff --git a/src/pages/wallet-details/wallet-details.html b/src/pages/wallet-details/wallet-details.html index 99c254262..7e775f9a2 100644 --- a/src/pages/wallet-details/wallet-details.html +++ b/src/pages/wallet-details/wallet-details.html @@ -1,4 +1,4 @@ - + {{wallet.name}} diff --git a/src/pages/wallet-details/wallet-details.scss b/src/pages/wallet-details/wallet-details.scss index 9c5da6d41..e03d4b07a 100644 --- a/src/pages/wallet-details/wallet-details.scss +++ b/src/pages/wallet-details/wallet-details.scss @@ -3,7 +3,7 @@ page-wallet-details { .toolbar-title, ion-icon { color: color($colors, light); } - background: color($colors, primary); + background-color: color($colors, primary); } .balance-card { background: color($colors, primary); @@ -11,12 +11,12 @@ page-wallet-details { .balance-header { position: relative; color: color($colors, light); - height: 12rem; + height: 10rem; text-align: center; } .balance-str { cursor: pointer; - padding-top: 3rem; + padding-top: 1rem; font-size: 35px; font-weight: 600; } @@ -26,7 +26,7 @@ page-wallet-details { } .balance-hidden { cursor: pointer; - padding-top: 3rem; + padding-top: 1rem; font-size: 20px; font-weight: 500; } @@ -41,7 +41,7 @@ page-wallet-details { } } .balance-scanning { - padding-top: 3rem; + padding-top: 1rem; } .tx-history { img { diff --git a/src/theme/global.scss b/src/theme/global.scss index 9df8ef53a..f2972409b 100644 --- a/src/theme/global.scss +++ b/src/theme/global.scss @@ -35,17 +35,6 @@ $refresher-icon-color: color($colors, primary); height: 70px; } -/* Ionic Overrides and Workarounds */ -// Please include a description of the problem solved by the workaround. - -// the ion tabs element never needs it's own background (backgrounds are -// rendered by the tabs), and the default background would cover the scanner -ion-tabs.ion-tabs-transparent { - background: none transparent; -} - -ion-nav-bar.hide { display: block !important; } - // Hide border when refresh .has-refresher > .scroll-content { border-top: none !important; From 14cb5fb88f1c447606edc5085699632e814f4934 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Sun, 7 Jan 2018 01:54:17 -0300 Subject: [PATCH 4/4] Fix end-line package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f184a95f..fafd3dacf 100644 --- a/package.json +++ b/package.json @@ -195,4 +195,4 @@ "ios" ] } -} +} \ No newline at end of file