Skip to content

Commit 0a635b3

Browse files
author
SupriyaKalghatgi
committed
Upgraded RN to 0.53.0 and NB to 2.3.9
1 parent f6124f1 commit 0a635b3

File tree

23 files changed

+1403
-1433
lines changed

23 files changed

+1403
-1433
lines changed

‎.flowconfig

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@
1616
; Ignore polyfills
1717
.*/Libraries/polyfills/.*
1818

19+
; Ignore metro
20+
.*/node_modules/metro/.*
21+
1922
[include]
2023

2124
[libs]
2225
node_modules/react-native/Libraries/react-native/react-native-interface.js
2326
node_modules/react-native/flow/
27+
node_modules/react-native/flow-github/
2428

2529
[options]
2630
emoji=true
@@ -31,18 +35,20 @@ munge_underscores=true
3135

3236
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
3337

38+
module.file_ext=.js
39+
module.file_ext=.jsx
40+
module.file_ext=.json
41+
module.file_ext=.native.js
42+
3443
suppress_type=$FlowIssue
3544
suppress_type=$FlowFixMe
3645
suppress_type=$FlowFixMeProps
3746
suppress_type=$FlowFixMeState
38-
suppress_type=$FixMe
3947

40-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-7]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
41-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-7]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
48+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
49+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
4250
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
4351
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
4452

45-
unsafe.enable_getters_and_setters=true
46-
4753
[version]
48-
^0.57.0
54+
^0.63.0

‎ChangeLog.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# [2.4.5](https://github.com/GeekyAnts/NativeBase-KitchenSink/releases/tag/v2.4.5)
1+
# [2.4.6](https://github.com/GeekyAnts/NativeBase-KitchenSink/releases/tag/v2.4.6)
22

33

44
#### Upgraded Features
55

6-
* Upgraded React Native from 0.50.1 to 0.51.0
7-
* Upgraded dev-dependencies
6+
* Upgraded React Native from 0.51.0 to 0.53.0
7+
* Upgraded NativeBase from 2.3.5 to 2.3.9
88

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# NativeBase KitchenSink v2.4.5
1+
# NativeBase KitchenSink v2.4.6
22
An example app with all the UI components of NativeBase
33

44
> **NativeBase-KitchenSink** comes in three forms of app for you!

‎ios/NativebaseKitchenSink.xcodeproj/project.pbxproj

Lines changed: 205 additions & 182 deletions
Large diffs are not rendered by default.

‎ios/NativebaseKitchenSink/Info.plist

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,14 @@
5858
<string>FontAwesome.ttf</string>
5959
<string>Foundation.ttf</string>
6060
<string>Ionicons.ttf</string>
61-
<string>MaterialCommunityIcons.ttf</string>
6261
<string>MaterialIcons.ttf</string>
6362
<string>Octicons.ttf</string>
63+
<string>Roboto_medium.ttf</string>
64+
<string>Roboto.ttf</string>
65+
<string>rubicon-icon-font.ttf</string>
6466
<string>SimpleLineIcons.ttf</string>
6567
<string>Zocial.ttf</string>
68+
<string>MaterialCommunityIcons.ttf</string>
6669
</array>
6770
</dict>
6871
</plist>

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "NativebaseKitchenSink",
3-
"version": "2.4.5",
3+
"version": "2.4.6",
44
"private": true,
55
"devDependencies": {
66
"babel-eslint": "7.2.3",
@@ -32,9 +32,9 @@
3232
"color": "1.0.3",
3333
"lodash": "4.13.1",
3434
"moment": "2.13.0",
35-
"native-base": "2.3.5",
35+
"native-base": "2.3.9",
3636
"react": "16.0.0",
37-
"react-native": "0.51.0",
37+
"react-native": "0.53.0",
3838
"react-native-vector-icons": "4.3.0",
3939
"react-navigation": "1.0.0-beta.19"
4040
}

‎src/screens/tab/tabFive.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@ export default class TabFour extends Component {
66
return (
77
<Content padder style={{ marginTop: 0 }}>
88
<Card style={{ flex: 0 }}>
9+
<CardItem header>
10+
<Text>Recommended by Awesome React Native</Text>
11+
</CardItem>
912
<CardItem>
1013
<Body>
1114
<Text>
12-
Lorem ipsum dolor sit amet, consectetur adipisicing elit.
13-
DOESN'T SUPPORT ADVANCED TABS :( numquam non magnam praesentium,
14-
maxime quaerat!
15+
NativeBase added into the list of Frameworks of Awesome React
16+
Native and are also used by many other React lovers across the
17+
world.
1518
</Text>
1619
</Body>
1720
</CardItem>

‎src/screens/tab/tabFour.js

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,15 @@ export default class TabFour extends Component {
66
return (
77
<Content padder style={{ marginTop: 0 }}>
88
<Card style={{ flex: 0 }}>
9-
<CardItem>
10-
<Body>
11-
<Text>
12-
Lorem ipsum dolor sit amet, consectetur adipisicing elit.
13-
Consequuntur sunt itaque adipisci quisquam pariatur qui,
14-
reiciendis architecto quod sint incidunt labore nisi totam illum
15-
numquam non magnam praesentium, maxime quaerat!
16-
</Text>
17-
</Body>
9+
<CardItem header>
10+
<Text>Recommended by Microsoft</Text>
1811
</CardItem>
19-
</Card>
20-
<Card style={{ flex: 0 }}>
2112
<CardItem>
2213
<Body>
2314
<Text>
24-
NativeBase gives you the potential of building applications that
25-
run on iOS and Android using a single codebase.
15+
If you're looking to get started with React Native + CodePush,
16+
and are looking for an awesome starter kit, you should check out
17+
Native Starter Pro - Microsoft's react-native-code-push repo
2618
</Text>
2719
</Body>
2820
</CardItem>

‎src/theme/components/Badge.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export default (variables = variable) => {
2828
padding: variables.badgePadding,
2929
paddingHorizontal: 6,
3030
alignSelf: "flex-start",
31+
justifyContent: variables.platform === "ios" ? "center" : undefined,
3132
borderRadius: 13.5,
3233
height: 27
3334
};

‎src/theme/components/Body.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import variable from "./../variables/platform";
1+
import variable from './../variables/platform';
22

33
export default (variables = variable) => {
4-
const bodyTheme = {
5-
flex: 1,
6-
alignItems: "center",
7-
alignSelf: "center"
8-
};
4+
const bodyTheme = {
5+
flex: 1,
6+
alignItems: 'center',
7+
alignSelf: 'center',
8+
};
99

10-
return bodyTheme;
10+
return bodyTheme;
1111
};

0 commit comments

Comments
 (0)