From fc05b738bde58ed27002d87007af4ac7d87d8727 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 18 Oct 2017 12:08:15 -0300 Subject: [PATCH 1/4] Add themes copay-bitpay. Updates logo.png. Removes chrome-app --- .gitignore | 1 - app-template/apply.js | 3 +- app-template/bitpay/appConfig.json | 2 +- app-template/bitpay/img/logo.png | Bin 0 -> 3980 bytes app-template/bitpay/sass/overrides.scss | 21 ++++++ app-template/config-template.xml | 2 +- app-template/copay/appConfig.json | 2 +- app-template/copay/img/logo.png | Bin 12975 -> 5649 bytes app-template/copay/sass/overrides.scss | 83 ++++------------------ app-template/index-template.html | 2 +- app-template/manifest-template.json | 21 ------ app-template/manifest.ionic-template.json | 6 +- src/theme/variables.scss | 42 +---------- 13 files changed, 45 insertions(+), 140 deletions(-) create mode 100644 app-template/bitpay/img/logo.png delete mode 100644 app-template/manifest-template.json diff --git a/.gitignore b/.gitignore index ee2f7a253..000866d94 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ npm-debug.log* ## App /desktop -/chrome-app /config.xml /ionic.config.json diff --git a/app-template/apply.js b/app-template/apply.js index b6a6b90e8..a93a624f8 100755 --- a/app-template/apply.js +++ b/app-template/apply.js @@ -11,8 +11,7 @@ var templates = { 'manifest.ionic-template.json': 'src/', '.desktop': 'desktop/', 'setup-win.iss': 'desktop/', - 'build-macos.sh': 'desktop/', - 'manifest-template.json': 'chrome-app/' + 'build-macos.sh': 'desktop/' }; var configDir = process.argv[2] || 'copay'; var JSONheader = ' { ' + "\n" + ' "//":"Changes to this file will be overwritten",' + "\n" + ' "//":" Modify it in the app-template directory", ' + "\n"; diff --git a/app-template/bitpay/appConfig.json b/app-template/bitpay/appConfig.json index 2da1677da..cd1b2c57b 100644 --- a/app-template/bitpay/appConfig.json +++ b/app-template/bitpay/appConfig.json @@ -2,7 +2,7 @@ "packageName": "bitpay", "packageDescription": "Secure Bitcoin Wallet", "packageNameId": "com.bitpay.wallet", - "statusBarColor": "#1e3186", + "themeColor": "#1e3186", "userVisibleName": "BitPay", "purposeLine": "Secure Bitcoin Wallet", "bundleName": "wallet", diff --git a/app-template/bitpay/img/logo.png b/app-template/bitpay/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b90d58b825d60001b6b9e6ff5193214153a9aae4 GIT binary patch literal 3980 zcmX|Ec{~*A_nxt3Pe}_`%$QWfSPNq}7-Pv6Gg%tUV2ouLJITnBeMw{ALXtJIFQY6q z*|JLtQQU;d*eO5v{_f}d$9dm#&U@bHoacPbKPT4IM4yLKkP`p^@E9QA<|jAhM6}r1 zPEL6hJ3jybD1^5}`J#-CRGhp#q#dwcjyUN+58}x?0HCT7NOW)_;Cw|LaV~gIHSk6o z6)cL!s)4N)jb)69IyhH6BG?CK5o}`V6ijeZ#)37}IaLEyP5?Y`z7C>+9`2qbl|VJ{ zzql$V`afzP>~i zC^R4-KsrEP+RMiUDyyul43&|C%E?KcL`ac>JbfJkr94Su|3Lgd1{_Cn^1%~*@m`*y z|6n>edinXPfx*y!l0g5VH8q-6nsYpH&zZHCNRd@)qG?ytnVC=`oX1>7;RFcAZP$_MFT*Yim0H+;9) zY?y+PoaW?wnpmTK%;dpJ&@w%z#R4Pf3h^xGazGws;ru&)uMO40xF#`3gVk*lgp1GJ zuGN=P(G>SYsKS^o?53@QuJzU5VIqoajLY$tyo8;rW|sdnP+X0yyG9|ZMbGb=1nNyU zQ7nwVoLM(ZTX;^-sW?O?mzmAs}fWC3OSpBAWMJ z^4no16rYGY|NY8N{B99{SG<0(Y`=m<^Cbsc=UcqC-2HKa`$Ka_%5`ZK?<&nTou055 z_)O~#8g6IyG_S~By3Xl*e7tifIk^=%VWake?tXFO;fH3PUa9Uq6}g13vg2y6anI5U z)FNM=9%+)8=>qz?ckSQNjsN+kSA0wTg@e?Q3e=WA%`-MWtdeM;J%j&J%ZqmI+;ukA_7eU0J!-75g;Ht_aXqm9cuvBvJA{!%L}R% z))nY`uyKZx*~7=FJq^0y&jjj$+|U*ck1GYApB6Q>!pA;kMVVWXU0>G3&6^|7ygqxa zkn@x^Rnx zH1zjI?)oVK3CriEMcPrE|0)jjrxm6i%eRl$I~8%*FU-Wq-EU+rB3;FZ=14M z{W-uBZs_)1P~!Cu5-MV1m-+h<3X@CrW0qj+ zhryW+WBs8GpnKJLfi7b5$%h(F))Xn!P%_Z}&dg5IC2pGI{9D$$e__(Co$1Ws&YXww zbB^2fV4?=V^;s>IJM-Dgn}Fo4JNgGaxf^Varf!vD5CW_vN*tB_pn)?pnbA#lN=X@Z z#c;^9?PM7uzFZ#{TGj^!TvuEdg=8p>&oNEkE}vsnjbY5#iGU&cr3c<;Wj?QX2=|BY zcd24HKY>})*5-;Z z8QqaSlpx9z73itaj2NbSRrl}3FsQ6UV2I>|$P0z5VugEf%SB z=I02+FyPr&)FLqu|LCs!QqWzhS@+oWBBmU@U?VBNFpEgoz-Tb3KD6>ax#)dq0MMim z{e1LdMC}5}JM30Nv0Ckb*GwfkDde*1j4zgIDHsh-jawz7m8hfzNu{|&Mg|jC>he^q zDR3Yzx1MFytTvgx??rnii)ti8 zr2q4q{Xw!#xJU|AOZ0R$tKn=02lDq+`0>T5S1cqetL3U_-Iqed*tx#v z#4kvDBiMRK(c3!(AV`hS)T^b%GmnNG z$A6*qk|_XdEJa1*tXl4NU}QcG*LThczPxv{@irI5Z?QCTiM4nrUN7iI&r^KdbT~S@ zv>8Lwo;5=TI0&{{0~e)_@L zOra!vmz^@Wps8+LXy>GMHr@?x)}|rwdoZMO@XB#^Uoi6s_`HH+%ZSEUs93E%w`}Q5 z<(^`XJ^}9X=ZWy&nPaZ4LZ{vZJ58l|nMIs$43c~5`RU9Jo;9WQ?v#Y2pXw-Q?a)k* zCxZP#orG;bzU=$5!sXGyq;}gGcix}NR)|GKPRchY)yo{G6?DM+f(C)NmvSc;T*TyM z2WK@yk`A%Hb27<`_V7=Hh=zPCkH>xR;!yvwR0!N{*VYJOFI$a902Mf`$}G%QI0CSs zjyKMRaeT!Qc?ls)vS@tz!o57tbd71cogpZgmdO)QZ3jGGl2qkFd3)7Er`DbKl>4T; z$UMBXZ#9*0?uwq)W?LOyI!(g%Ty~>+`J!ER9$pF;V(Hw~dMdjOSoLfi zsbpJ8L2ed1BQwsV=~+mS8p%YsEL+pyy4#oS01~(x*qd4`!&;y?Pr>iEqpy1`I zgb`;)%V}q+ba|%bChPZ3)2V@(+OuU#bus=0atHc4@X~<$cqy=)J{)lB_dGyigpUj88y*1b`0B~L89kwB)nXMh^A(31zX zDxEQmx1wG%C`gOca9{IkI6nt1C$-Msr6~So*(VpiVJ_GepP^9{!~2f_yp53cSk@Ma zaHK8*e~NBJb+IZ@&wYgG+6atsFE@c9iSSofPyicnr=ywbrQ)J!Oc^blD0;s9Lbq}x zgrGN(6Y(VK`%lD2)DW0gzwpox9hm-;91NhfH{@%FJ{bQrGSwkTMb2kBHkBk}Z>{R=8{%(I|8_G*^=wWvcK+u~&d zvgfHR!HNMtUq<-fkxNs09sZBZ$d$}TyuoouZrR7S-@WdgKH}aps+MAf$A@y}1S6c7 zH+}F1QTmN3m7o?b*+JYo?HCN&_o^%u+5^$yF}F}0p%?a)KtUf~7?mv)r_2IEv%e<* zxjI^+=~|exAmy=yvYXmFOt6c4Hbdv-$>ott3iE8GU#feoU@=RfSpExn_~GQXdd}dI znSC1jgE|elhKWooK8FLYI`Q>R?bGA?A>qYx$SHsrsi(hdzvx{b|I&LHi!2tb*rI{w(OlH%hb(9Aa?)=i^)=Oh26f{Zh-I|TN|^hoPR z{)jz^_+J{yDYlifBsn@Ooc*onu;-P{_8-G*HVvKF1y}9ODU{YE_&o@r>ZTyaQ#EY= zg@rPyUeokjCa*xRalRT1S=;Ei@|RTrTki;JgQU4tG)@$g%lrg79d_}JhE#E#7 z^NPD(N_DsI_}h-`chJNQt59#Dd|LjCmlBuNxTLlK)v!Z#SQpfGVr;jakUsB&7X8WaY;7oT8pb<&_nNJB_dM>)DM^S447gCn%wKgW={{R9_Wu*WB literal 0 HcmV?d00001 diff --git a/app-template/bitpay/sass/overrides.scss b/app-template/bitpay/sass/overrides.scss index e69de29bb..41240bd9a 100644 --- a/app-template/bitpay/sass/overrides.scss +++ b/app-template/bitpay/sass/overrides.scss @@ -0,0 +1,21 @@ +/* + * BitPay Distribution SCSS overrides + */ + +// Named Color Variables +// -------------------------------------------------- +// Named colors makes it easy to reuse colors on various components. +// It's highly recommended to change the default colors +// to match your app's branding. Ionic uses a Sass map of +// colors so you can add, rename and remove colors as needed. +// The "primary" color is the only required color in the map. + +$colors: ( + primary: #1e3186, + secondary: #111b49, + danger: #ffa500, + light: #f4f4f4, + dark: #222 +); + +$text-color: #1e3186; diff --git a/app-template/config-template.xml b/app-template/config-template.xml index cf8ab8f56..4abdcde4c 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -18,7 +18,7 @@ - + diff --git a/app-template/copay/appConfig.json b/app-template/copay/appConfig.json index 7ae0dd688..33662aecf 100644 --- a/app-template/copay/appConfig.json +++ b/app-template/copay/appConfig.json @@ -2,7 +2,7 @@ "packageName": "copay", "packageDescription": "Copay Bitcoin Wallet", "packageNameId": "com.bitpay.copay", - "statusBarColor": "#192c3a", + "themeColor": "#192c3a", "userVisibleName": "Copay", "purposeLine": "Copay Bitcoin Wallet", "bundleName": "copay", diff --git a/app-template/copay/img/logo.png b/app-template/copay/img/logo.png index 01fe6c0bde020972ccef61c0e8508eec45152c37..e0557c721d712394d8f4a827ed6ce76bb664dadb 100644 GIT binary patch literal 5649 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 literal 12975 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
- -
- diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d5eb311d3..79828b06b 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -7,6 +7,7 @@ import { Logger } from '@nsalaun/ng-logger'; import { AppProvider } from '../providers/app/app'; import { ProfileProvider } from '../providers/profile/profile'; import { ConfigProvider } from '../providers/config/config'; +import { TouchIdProvider } from '../providers/touchid/touchid'; import { TabsPage } from '../pages/tabs/tabs'; import { OnboardingPage } from '../pages/onboarding/onboarding'; @@ -14,7 +15,8 @@ import { PinModalPage } from '../pages/pin/pin'; import { FingerprintModalPage } from '../pages/fingerprint/fingerprint'; @Component({ - templateUrl: 'app.html' + templateUrl: 'app.html', + providers: [TouchIdProvider] }) export class CopayApp { rootPage: any; diff --git a/src/providers/persistence/persistence.spec.ts b/src/providers/persistence/persistence.spec.ts index dbf073747..fdc9fe971 100644 --- a/src/providers/persistence/persistence.spec.ts +++ b/src/providers/persistence/persistence.spec.ts @@ -7,7 +7,6 @@ import { PersistenceProvider } from './persistence'; import { IStorage, ISTORAGE } from './storage/istorage'; import { RamStorage } from './storage/ram-storage'; import { LocalStorage } from './storage/local-storage'; -import { ChromeStorage } from './storage/chrome-storage'; import { FileStorage } from './storage/file-storage'; describe('Storage Service', () => { diff --git a/src/providers/persistence/persistence.ts b/src/providers/persistence/persistence.ts index 567d9b6b0..2368367ce 100644 --- a/src/providers/persistence/persistence.ts +++ b/src/providers/persistence/persistence.ts @@ -1,12 +1,11 @@ import { Injectable } from '@angular/core'; -import { InjectionToken, Inject } from '@angular/core'; +import { Inject } from '@angular/core'; import { Logger } from '@nsalaun/ng-logger'; import * as _ from 'lodash'; import { IStorage, ISTORAGE } from './storage/istorage'; import { PlatformProvider } from '../platform/platform'; import { LocalStorage } from './storage/local-storage'; -import { ChromeStorage } from './storage/chrome-storage'; import { FileStorage } from './storage/file-storage'; import { RamStorage } from './storage/ram-storage'; diff --git a/src/providers/persistence/storage/chrome-storage.ts b/src/providers/persistence/storage/chrome-storage.ts deleted file mode 100644 index ce0cf0d6a..000000000 --- a/src/providers/persistence/storage/chrome-storage.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; -import * as _ from 'lodash'; - -import { IStorage, KeyAlreadyExistsError } from './istorage'; - -@Injectable() -export class ChromeStorage implements IStorage { - ls: chrome.storage.StorageArea; - constructor(private log: Logger) { - let chrome: any; - if (!chrome.storage || !chrome.storage.local) throw new Error('Chrome storage not supported'); - this.ls = chrome.storage.local; - } - - get(k: string): Promise { - return new Promise(resolve => { - let v = this.ls.get(k, (v) => { - if (!v) return resolve(null); - if (!_.isString(v)) return resolve(v); - let parsed: any; - try { - parsed = JSON.parse(v); - } catch (e) { - } - resolve(parsed || v); - }); - }); - } - - set(k: string, v: any): Promise { - if (_.isObject(v)) { - v = JSON.stringify(v); - } - if (v && !_.isString(v)) { - v = v.toString(); - } - - let obj = {}; - obj[k] = v; - return new Promise(resolve => { - this.ls.set(obj, resolve); - }); - } - - remove(k: string): Promise { - return new Promise(resolve => { - this.ls.remove(k, resolve); - }); - } - - create(k: string, v: any): Promise { - return this.get(k).then((data) => { - if (data) throw new KeyAlreadyExistsError(); - this.set(k, v); - }); - } -} From 84bb35a88ad72a12b105d72cefade62ce67f1099 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 19 Oct 2017 14:09:29 -0300 Subject: [PATCH 4/4] Fix config --- src/providers/config/config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/providers/config/config.ts b/src/providers/config/config.ts index e584972f4..96520d830 100644 --- a/src/providers/config/config.ts +++ b/src/providers/config/config.ts @@ -222,11 +222,11 @@ export class ConfigProvider { }); } - public get(): Object { + public get(): Config { return this.configCache; } - public getDefaults(): Object { + public getDefaults(): Config { return configDefault; }