Skip to content

Commit 545c105

Browse files
author
SupriyaKalghatgi
committed
Updated to 2.5.1
1 parent b8b7ec9 commit 545c105

File tree

5 files changed

+65
-45
lines changed

5 files changed

+65
-45
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"color": "1.0.3",
3333
"lodash": "4.13.1",
3434
"moment": "2.13.0",
35-
"native-base": "https://github.com/GeekyAnts/NativeBase#master",
35+
"native-base": "2.5.1",
3636
"react": "16.3.1",
3737
"react-native": "0.55.4",
3838
"react-native-vector-icons": "4.5.0",

src/theme/variables/commonColor.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,14 @@ export default {
151151
iosStatusbar: "dark-content",
152152
toolbarDefaultBorder: platform === "ios" ? "#a7a6ab" : "#3F51B5",
153153
get statusBarColor() {
154-
return color(this.toolbarDefaultBg).darken(0.2).hex();
154+
return color(this.toolbarDefaultBg)
155+
.darken(0.2)
156+
.hex();
155157
},
156158
get darkenHeader() {
157-
return color(this.tabBgColor).darken(0.03).hex();
159+
return color(this.tabBgColor)
160+
.darken(0.03)
161+
.hex();
158162
},
159163

160164
// Icon

src/theme/variables/material.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ export default {
1414
platform,
1515

1616
//Accordion
17-
headerStyle: "#d8d3d8",
17+
headerStyle: "#edebed",
1818
iconStyle: "#000",
19-
contentStyle: "#F4F3F4",
19+
contentStyle: "#f5f4f5",
2020
expandedIconStyle: "#000",
2121

2222
// Android

src/theme/variables/platform.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ export default {
1414
platform,
1515

1616
//Accordion
17-
headerStyle: "#d8d3d8",
17+
headerStyle: "#edebed",
1818
iconStyle: "#000",
19-
contentStyle: "#F4F3F4",
19+
contentStyle: "#f5f4f5",
2020
expandedIconStyle: "#000",
2121

2222
// Android

yarn.lock

Lines changed: 54 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -480,8 +480,8 @@ acorn@^4.0.4:
480480
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
481481

482482
acorn@^5.0.0, acorn@^5.3.0, acorn@^5.5.0:
483-
version "5.6.0"
484-
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.6.0.tgz#572bedb377a1c61b7a289e72b8c5cfeb7baaf0bf"
483+
version "5.6.2"
484+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.6.2.tgz#b1da1d7be2ac1b4a327fb9eab851702c5045b4e7"
485485

486486
agent-base@2:
487487
version "2.1.1"
@@ -596,11 +596,11 @@ anymatch@^2.0.0:
596596
micromatch "^3.1.4"
597597
normalize-path "^2.1.1"
598598

599-
append-transform@^0.4.0:
600-
version "0.4.0"
601-
resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
599+
append-transform@^1.0.0:
600+
version "1.0.0"
601+
resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
602602
dependencies:
603-
default-require-extensions "^1.0.0"
603+
default-require-extensions "^2.0.0"
604604

605605
aproba@^1.0.3:
606606
version "1.2.0"
@@ -1450,8 +1450,8 @@ bcrypt-pbkdf@^1.0.0:
14501450
tweetnacl "^0.14.3"
14511451

14521452
big-integer@^1.6.7:
1453-
version "1.6.30"
1454-
resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.30.tgz#7796f04acdd6ba56345f19049c8fffd427f09d16"
1453+
version "1.6.31"
1454+
resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.31.tgz#6d7852486e67c642502dcc03f7225a245c9fc7fa"
14551455

14561456
"binary@>= 0.3.0 < 1":
14571457
version "0.3.0"
@@ -1783,10 +1783,10 @@ component-emitter@^1.2.1:
17831783
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
17841784

17851785
compressible@~2.0.13:
1786-
version "2.0.13"
1787-
resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.13.tgz#0d1020ab924b2fdb4d6279875c7d6daba6baa7a9"
1786+
version "2.0.14"
1787+
resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.14.tgz#326c5f507fbb055f54116782b969a81b67a29da7"
17881788
dependencies:
1789-
mime-db ">= 1.33.0 < 2"
1789+
mime-db ">= 1.34.0 < 2"
17901790

17911791
compression@^1.7.1:
17921792
version "1.7.2"
@@ -1942,11 +1942,11 @@ deep-is@~0.1.3:
19421942
version "0.1.3"
19431943
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
19441944

1945-
default-require-extensions@^1.0.0:
1946-
version "1.0.0"
1947-
resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
1945+
default-require-extensions@^2.0.0:
1946+
version "2.0.0"
1947+
resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
19481948
dependencies:
1949-
strip-bom "^2.0.0"
1949+
strip-bom "^3.0.0"
19501950

19511951
define-properties@^1.1.2:
19521952
version "1.1.2"
@@ -2708,7 +2708,7 @@ fsevents@^1.2.3:
27082708
mkdirp "0.5"
27092709
rimraf "2"
27102710

2711-
function-bind@^1.0.2, function-bind@^1.1.1:
2711+
function-bind@^1.1.1:
27122712
version "1.1.1"
27132713
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
27142714

@@ -2926,10 +2926,10 @@ has-values@^1.0.0:
29262926
kind-of "^4.0.0"
29272927

29282928
has@^1.0.1:
2929-
version "1.0.1"
2930-
resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
2929+
version "1.0.3"
2930+
resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
29312931
dependencies:
2932-
function-bind "^1.0.2"
2932+
function-bind "^1.1.1"
29332933

29342934
hoist-non-react-statics@^1.0.5:
29352935
version "1.2.0"
@@ -3347,10 +3347,10 @@ istanbul-lib-coverage@^1.0.1, istanbul-lib-coverage@^1.1.1, istanbul-lib-coverag
33473347
resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
33483348

33493349
istanbul-lib-hook@^1.2.0:
3350-
version "1.2.0"
3351-
resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz#ae556fd5a41a6e8efa0b1002b1e416dfeaf9816c"
3350+
version "1.2.1"
3351+
resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.1.tgz#f614ec45287b2a8fc4f07f5660af787575601805"
33523352
dependencies:
3353-
append-transform "^0.4.0"
3353+
append-transform "^1.0.0"
33543354

33553355
istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.8.0:
33563356
version "1.10.1"
@@ -3918,8 +3918,8 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
39183918
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
39193919

39203920
js-yaml@^3.7.0, js-yaml@^3.9.1:
3921-
version "3.11.0"
3922-
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
3921+
version "3.12.0"
3922+
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
39233923
dependencies:
39243924
argparse "^1.0.7"
39253925
esprima "^4.0.0"
@@ -4419,14 +4419,18 @@ micromatch@^3.1.4, micromatch@^3.1.8:
44194419
snapdragon "^0.8.1"
44204420
to-regex "^3.0.2"
44214421

4422-
"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0:
4423-
version "1.33.0"
4424-
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
4422+
"mime-db@>= 1.34.0 < 2":
4423+
version "1.34.0"
4424+
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.34.0.tgz#452d0ecff5c30346a6dc1e64b1eaee0d3719ff9a"
44254425

44264426
mime-db@~1.23.0:
44274427
version "1.23.0"
44284428
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.23.0.tgz#a31b4070adaea27d732ea333740a64d0ec9a6659"
44294429

4430+
mime-db@~1.33.0:
4431+
version "1.33.0"
4432+
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
4433+
44304434
mime-types@2.1.11:
44314435
version "2.1.11"
44324436
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.11.tgz#c259c471bda808a85d6cd193b430a5fae4473b3c"
@@ -4556,9 +4560,9 @@ native-base-shoutem-theme@0.2.2:
45564560
lodash "^4.10.1"
45574561
prop-types "^15.5.10"
45584562

4559-
"native-base@https://github.com/GeekyAnts/NativeBase#master":
4560-
version "2.4.5"
4561-
resolved "https://github.com/GeekyAnts/NativeBase#80dfc6aefbe6896d313347b4040355cfb59370d2"
4563+
native-base@2.5.1:
4564+
version "2.5.1"
4565+
resolved "https://registry.yarnpkg.com/native-base/-/native-base-2.5.1.tgz#31759f977b70abfcecaedeb81bad97512559803b"
45624566
dependencies:
45634567
blueimp-md5 "^2.5.0"
45644568
clamp "^1.0.1"
@@ -4708,8 +4712,8 @@ number-is-nan@^1.0.0:
47084712
resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
47094713

47104714
nwsapi@^2.0.0:
4711-
version "2.0.1"
4712-
resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.1.tgz#a50d59a2dcb14b6931401171713ced2d0eb3468f"
4715+
version "2.0.2"
4716+
resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.2.tgz#33a0aab27c678d4dfdbba6a7f84b1c627fc4966f"
47134717

47144718
oauth-sign@~0.8.2:
47154719
version "0.8.2"
@@ -4856,8 +4860,8 @@ p-finally@^1.0.0:
48564860
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
48574861

48584862
p-limit@^1.1.0:
4859-
version "1.2.0"
4860-
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
4863+
version "1.3.0"
4864+
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
48614865
dependencies:
48624866
p-try "^1.0.0"
48634867

@@ -5119,6 +5123,10 @@ pseudomap@^1.0.2:
51195123
version "1.0.2"
51205124
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
51215125

5126+
psl@^1.1.24:
5127+
version "1.1.27"
5128+
resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.27.tgz#2b2c77019db86855170d903532400bf71ee085b6"
5129+
51225130
"pullstream@>= 0.4.1 < 1":
51235131
version "0.4.1"
51245132
resolved "https://registry.yarnpkg.com/pullstream/-/pullstream-0.4.1.tgz#d6fb3bf5aed697e831150eb1002c25a3f8ae1314"
@@ -5652,7 +5660,7 @@ safe-regex@^1.1.0:
56525660
dependencies:
56535661
ret "~0.1.10"
56545662

5655-
"safer-buffer@>= 2.1.2 < 3":
5663+
"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2:
56565664
version "2.1.2"
56575665
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
56585666

@@ -5922,13 +5930,14 @@ sprintf-js@~1.0.2:
59225930
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
59235931

59245932
sshpk@^1.7.0:
5925-
version "1.14.1"
5926-
resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
5933+
version "1.14.2"
5934+
resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
59275935
dependencies:
59285936
asn1 "~0.2.3"
59295937
assert-plus "^1.0.0"
59305938
dashdash "^1.12.0"
59315939
getpass "^0.1.1"
5940+
safer-buffer "^2.0.2"
59325941
optionalDependencies:
59335942
bcrypt-pbkdf "^1.0.0"
59345943
ecc-jsbn "~0.1.1"
@@ -6177,7 +6186,14 @@ to-regex@^3.0.1, to-regex@^3.0.2:
61776186
regex-not "^1.0.2"
61786187
safe-regex "^1.1.0"
61796188

6180-
tough-cookie@>=2.3.3, tough-cookie@^2.3.2, tough-cookie@^2.3.3, tough-cookie@~2.3.3:
6189+
tough-cookie@>=2.3.3, tough-cookie@^2.3.2, tough-cookie@^2.3.3:
6190+
version "2.4.2"
6191+
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.2.tgz#aa9133154518b494efab98a58247bfc38818c00c"
6192+
dependencies:
6193+
psl "^1.1.24"
6194+
punycode "^1.4.1"
6195+
6196+
tough-cookie@~2.3.3:
61816197
version "2.3.4"
61826198
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
61836199
dependencies:

0 commit comments

Comments
 (0)