Skip to content

Commit 42e1ac9

Browse files
author
soliury
committed
ios can work
1 parent 4d41441 commit 42e1ac9

File tree

9 files changed

+75
-61
lines changed

9 files changed

+75
-61
lines changed

‎android/app/src/main/java/com/noder/MainApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class MainApplication extends Application implements ReactApplication {
2121

2222
private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
2323
@Override
24-
protected boolean getUseDeveloperSupport() {
24+
public boolean getUseDeveloperSupport() {
2525
return BuildConfig.DEBUG;
2626
}
2727

‎ios/noder/AppDelegate.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
4545
// jsCodeLocation = [CodePush bundleURL];
4646

4747
#ifdef DEBUG
48-
jsCodeLocation = [NSURL URLWithString:@"http://192.168.1.105:8081/index.ios.bundle?platform=ios&dev=true"];
48+
jsCodeLocation = [NSURL URLWithString:@"http://172.18.118.191:8081/index.ios.bundle?platform=ios&dev=true"];
4949
#else
5050
jsCodeLocation = [CodePush bundleURL];
5151
#endif

‎ios/noder/Images.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 56 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,85 +2,105 @@
22
"images" : [
33
{
44
"idiom" : "iphone",
5-
"size" : "29x29",
6-
"scale" : "2x",
7-
"filename" : "[email protected]"
5+
"size" : "20x20",
6+
"scale" : "2x"
87
},
98
{
109
"idiom" : "iphone",
11-
"size" : "29x29",
12-
"scale" : "3x",
13-
"filename" : "[email protected]"
10+
"size" : "20x20",
11+
"scale" : "3x"
1412
},
1513
{
14+
"size" : "29x29",
1615
"idiom" : "iphone",
17-
"size" : "40x40",
18-
"scale" : "2x",
19-
"filename" : "[email protected]"
16+
"filename" : "[email protected]",
17+
"scale" : "2x"
2018
},
2119
{
20+
"size" : "29x29",
2221
"idiom" : "iphone",
22+
"filename" : "[email protected]",
23+
"scale" : "3x"
24+
},
25+
{
2326
"size" : "40x40",
24-
"scale" : "3x",
25-
"filename" : "[email protected]"
27+
"idiom" : "iphone",
28+
"filename" : "[email protected]",
29+
"scale" : "2x"
2630
},
2731
{
32+
"size" : "40x40",
2833
"idiom" : "iphone",
29-
"size" : "60x60",
30-
"scale" : "2x",
31-
"filename" : "[email protected]"
34+
"filename" : "[email protected]",
35+
"scale" : "3x"
3236
},
3337
{
38+
"size" : "60x60",
3439
"idiom" : "iphone",
40+
"filename" : "[email protected]",
41+
"scale" : "2x"
42+
},
43+
{
3544
"size" : "60x60",
36-
"scale" : "3x",
37-
"filename" : "[email protected]"
45+
"idiom" : "iphone",
46+
"filename" : "[email protected]",
47+
"scale" : "3x"
3848
},
3949
{
4050
"idiom" : "ipad",
41-
"size" : "29x29",
42-
"scale" : "1x",
43-
"filename" : "Icon-Small.png"
51+
"size" : "20x20",
52+
"scale" : "1x"
4453
},
4554
{
4655
"idiom" : "ipad",
47-
"size" : "29x29",
48-
"scale" : "2x",
49-
"filename" : "[email protected]"
56+
"size" : "20x20",
57+
"scale" : "2x"
5058
},
5159
{
60+
"size" : "29x29",
5261
"idiom" : "ipad",
53-
"size" : "40x40",
54-
"scale" : "1x",
55-
"filename" : "Icon-40.png"
62+
"filename" : "Icon-Small.png",
63+
"scale" : "1x"
5664
},
5765
{
66+
"size" : "29x29",
5867
"idiom" : "ipad",
59-
"size" : "40x40",
60-
"scale" : "2x",
61-
"filename" : "[email protected]"
68+
"filename" : "[email protected]",
69+
"scale" : "2x"
6270
},
6371
{
72+
"size" : "40x40",
6473
"idiom" : "ipad",
65-
"size" : "76x76",
66-
"scale" : "1x",
67-
"filename" : "Icon-76.png"
74+
"filename" : "Icon-40.png",
75+
"scale" : "1x"
6876
},
6977
{
78+
"size" : "40x40",
7079
"idiom" : "ipad",
80+
"filename" : "[email protected]",
81+
"scale" : "2x"
82+
},
83+
{
7184
"size" : "76x76",
72-
"scale" : "2x",
73-
"filename" : "[email protected]"
85+
"idiom" : "ipad",
86+
"filename" : "Icon-76.png",
87+
"scale" : "1x"
7488
},
7589
{
90+
"size" : "76x76",
7691
"idiom" : "ipad",
92+
"filename" : "[email protected]",
93+
"scale" : "2x"
94+
},
95+
{
7796
"size" : "83.5x83.5",
78-
"scale" : "2x",
79-
"filename" : "[email protected]"
97+
"idiom" : "ipad",
98+
"filename" : "[email protected]",
99+
"scale" : "2x"
80100
}
81101
],
82102
"info" : {
83103
"version" : 1,
84-
"author" : "makeappicon"
104+
"author" : "xcode"
85105
}
86106
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"markdown": "0.5.0",
2626
"moment": "^2.14.1",
2727
"query-string": "^4.2.3",
28-
"react": "^15.5.3",
28+
"react": "16.0.0-alpha.6",
2929
"react-addons-pure-render-mixin": "^15.5.2",
3030
"react-dom": "^15.5.3",
3131
"react-native": "^0.43.2",

‎src/layouts/Home.js‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ class Home extends Component {
3333
_renderTopicList() {
3434
return ['good', 'ask', 'all', 'share', 'job'].map((item)=> {
3535
return (
36-
<TopicList router={this.props.router}
37-
key={item}
38-
tab={item}
39-
isTabScrolling={()=> this._scrollableTabs.isScrolling()()}
36+
<TopicList router={this.props.router} key={item} tab={item} isTabScrolling={()=> this._scrollableTabs && this._scrollableTabs.isScrolling()()}
4037
/>
4138
)
4239
})
@@ -56,10 +53,9 @@ class Home extends Component {
5653
</ScrollableTabs>
5754

5855

59-
<UserOverlay user={user.secret} toLogin={() => router.toLogin() }
60-
toUser={() => router.toUser({
61-
userName: user.publicInfo.loginname
62-
})}/>
56+
<UserOverlay user={user.secret}
57+
toLogin={() => router.toLogin() }
58+
toUser={() => router.toUser({ userName: user.publicInfo.loginname })}/>
6359

6460

6561
<MessageOverlay user={user.secret}

‎src/layouts/Login.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {
44
View,
55
Text,
66
TouchableHighlight,
7-
ActivityIndicatorIOS,
87
StyleSheet,
98
Dimensions,
109
Image,

‎src/layouts/User.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, {Component} from 'react'
2-
import {View, Dimensions, StyleSheet, Text, Image, TouchableOpacity, ActivityIndicatorIOS, LayoutAnimation} from 'react-native'
2+
import {View, Dimensions, StyleSheet, Text, Image, TouchableOpacity, LayoutAnimation} from 'react-native'
33
import moment from 'moment'
44
import ScrollableTabView from 'react-native-scrollable-tab-view'
55
import Icon from 'react-native-vector-icons/Ionicons'

‎src/store/configureStore.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import asyncActionCallbackMiddleware from './asyncActionCallbackMiddleware'
55
import utilsMiddleware from './utilsMiddleware'
66
import minPendingTimeMiddleware from './minPendingTime'
77
import syncReducerToAsyncStorage from './syncReducerToAsyncStorage'
8-
import createLogger from 'redux-logger'
8+
import {createLogger} from 'redux-logger'
99
import reducers from '../reducers'
1010

1111

‎yarn.lock‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ center-align@^0.1.1:
12891289
align-text "^0.1.3"
12901290
lazy-cache "^1.0.3"
12911291

1292-
chalk@*, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@~1.1.1:
1292+
chalk@*, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.3, chalk@~1.1.1:
12931293
version "1.1.3"
12941294
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
12951295
dependencies:
@@ -1299,7 +1299,7 @@ chalk@*, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3, chalk@~1.1.1:
12991299
strip-ansi "^3.0.0"
13001300
supports-color "^2.0.0"
13011301

1302-
[email protected]:
1302+
[email protected], chalk@^1.1.1:
13031303
version "1.1.1"
13041304
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.1.tgz#509afb67066e7499f7eb3535c77445772ae2d019"
13051305
dependencies:
@@ -1607,15 +1607,15 @@ [email protected]:
16071607
version "2.0.6"
16081608
resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.0.6.tgz#0abf356ad00d1c5a219d88d44518046dd026acfe"
16091609

1610-
[email protected]:
1610+
[email protected], core-js@^2.2.2:
16111611
version "2.2.2"
16121612
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.2.2.tgz#79a0f3a9495507641a5bf7ce275fa494649180bf"
16131613

16141614
core-js@^1.0.0:
16151615
version "1.2.7"
16161616
resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
16171617

1618-
core-js@^2.2.2, core-js@^2.4.0:
1618+
core-js@^2.4.0:
16191619
version "2.4.1"
16201620
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
16211621

@@ -4393,7 +4393,7 @@ prompt@^0.2.14:
43934393
utile "0.2.x"
43944394
winston "0.8.x"
43954395

4396-
prop-types@^15.0.0, prop-types@^15.5.2, prop-types@~15.5.0:
4396+
prop-types@^15.0.0, prop-types@~15.5.0:
43974397
version "15.5.6"
43984398
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.6.tgz#797a915b1714b645ebb7c5d6cc690346205bd2aa"
43994399
dependencies:
@@ -4703,11 +4703,11 @@ react-static-container@^1.0.1:
47034703
version "1.0.1"
47044704
resolved "https://registry.yarnpkg.com/react-static-container/-/react-static-container-1.0.1.tgz#694c0dd68a896b879519afb548399cc1989c9ab0"
47054705

4706-
[email protected]:
4706+
[email protected], react-timer-mixin@^0.13.2:
47074707
version "0.13.2"
47084708
resolved "https://registry.yarnpkg.com/react-timer-mixin/-/react-timer-mixin-0.13.2.tgz#4a4c69993e10406ecff8d95f37e819431367adb5"
47094709

4710-
react-timer-mixin@^0.13.2, react-timer-mixin@^0.13.3:
4710+
react-timer-mixin@^0.13.3:
47114711
version "0.13.3"
47124712
resolved "https://registry.yarnpkg.com/react-timer-mixin/-/react-timer-mixin-0.13.3.tgz#0da8b9f807ec07dc3e854d082c737c65605b3d22"
47134713

@@ -4742,14 +4742,13 @@ react-transform-hmr@^1.0.4:
47424742
webpack "1.13.2"
47434743
webpack-dev-server "1.16.1"
47444744

4745-
react@^15.5.3:
4746-
version "15.5.3"
4747-
resolved "https://registry.yarnpkg.com/react/-/react-%3Cspan%20class="x x-first x-last">15.5.3.tgz#84055382c025dec4e3b902bb61a8697cc79c1258"
4745+
react@16.0.0-alpha.6:
4746+
version "16.0.0-alpha.6"
4747+
resolved "https://registry.yarnpkg.com/react/-/react-%3Cspan%20class="x x-first x-last">16.0.0-alpha.6.tgz#2ccb1afb4425ccc12f78a123a666f2e4c141adb9"
47484748
dependencies:
47494749
fbjs "^0.8.9"
47504750
loose-envify "^1.1.0"
47514751
object-assign "^4.1.0"
4752-
prop-types "^15.5.2"
47534752

47544753
read-pkg-up@^1.0.1:
47554754
version "1.0.1"

0 commit comments

Comments
 (0)