Skip to content

Commit 713a8ea

Browse files
KenChoiKenChoi
KenChoi
authored and
KenChoi
committed
fix conflict
2 parents 99ed9d6 + f6e62c6 commit 713a8ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+8524
-54
lines changed

‎example/app/routes/Home/index.js‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
'use strict';
2+
3+
import React from 'react';
4+
import ReactNative from 'react-native';
5+
6+
const {
7+
View,
8+
Text,
9+
TouchableHighlight,
10+
StyleSheet,
11+
} = ReactNative;
12+
13+
export default class MainActivity extends React.Component {
14+
constructor(props) {
15+
super(props);
16+
}
17+
18+
render() {
19+
return (
20+
<Text >
21+
Get Platform List
22+
</Text> )
23+
}
24+
}

‎example/index.ios.js‎

Lines changed: 13 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,22 @@
33
* https://github.com/facebook/react-native
44
*/
55
'use strict';
6-
import React, {
7-
AppRegistry,
8-
Component,
9-
StyleSheet,
10-
Text,
11-
View
6+
import React from 'react';
7+
import {
8+
AppRegistry,
129
} from 'react-native';
10+
import {
11+
StackNavigator
12+
} from 'react-navigation';
1313

14-
class ReactJChat extends Component {
15-
render() {
16-
return (
17-
<View style={styles.container}>
18-
<Text style={styles.welcome}>
19-
Welcome to React Native!
20-
</Text>
21-
<Text style={styles.instructions}>
22-
To get started, edit index.ios.js
23-
</Text>
24-
<Text style={styles.instructions}>
25-
Press Cmd+R to reload,{'\n'}
26-
Cmd+D or shake for dev menu
27-
</Text>
28-
</View>
29-
);
30-
}
31-
}
14+
import HomePage from './app/routes/Home/index.js';
3215

33-
const styles = StyleSheet.create({
34-
container: {
35-
flex: 1,
36-
justifyContent: 'center',
37-
alignItems: 'center',
38-
backgroundColor: '#F5FCFF',
39-
},
40-
welcome: {
41-
fontSize: 20,
42-
textAlign: 'center',
43-
margin: 10,
44-
},
45-
instructions: {
46-
textAlign: 'center',
47-
color: '#333333',
48-
marginBottom: 5,
49-
},
16+
17+
const ReactJChat = StackNavigator({
18+
Home: {
19+
screen: HomePage
20+
},
5021
});
5122

23+
5224
AppRegistry.registerComponent('ReactJChat', () => ReactJChat);

‎example/ios/JMessageDemo-tvOS/Info.plist‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>APPL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>1</string>
23+
<key>LSRequiresIPhoneOS</key>
24+
<true/>
25+
<key>UILaunchStoryboardName</key>
26+
<string>LaunchScreen</string>
27+
<key>UIRequiredDeviceCapabilities</key>
28+
<array>
29+
<string>armv7</string>
30+
</array>
31+
<key>UISupportedInterfaceOrientations</key>
32+
<array>
33+
<string>UIInterfaceOrientationPortrait</string>
34+
<string>UIInterfaceOrientationLandscapeLeft</string>
35+
<string>UIInterfaceOrientationLandscapeRight</string>
36+
</array>
37+
<key>UIViewControllerBasedStatusBarAppearance</key>
38+
<false/>
39+
<key>NSLocationWhenInUseUsageDescription</key>
40+
<string></string>
41+
<key>NSAppTransportSecurity</key>
42+
<!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/ -->
43+
<dict>
44+
<key>NSExceptionDomains</key>
45+
<dict>
46+
<key>localhost</key>
47+
<dict>
48+
<key>NSExceptionAllowsInsecureHTTPLoads</key>
49+
<true/>
50+
</dict>
51+
</dict>
52+
</dict>
53+
</dict>
54+
</plist>

‎example/ios/JMessageDemo-tvOSTests/Info.plist‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>BNDL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>1</string>
23+
</dict>
24+
</plist>

0 commit comments

Comments
 (0)