Permalink
Browse files

update rn 0.28

  • Loading branch information...
1 parent c4c5b64 commit ca2f6199ab5da67740db16e618b124e6cded0fc8 @soliury committed Jun 25, 2016
Showing with 202 additions and 457 deletions.
  1. +1 −0 android/app/build.gradle
  2. BIN android/app/src/main/assets/fonts/FontAwesome.ttf
  3. BIN android/app/src/main/assets/fonts/Ionicons.ttf
  4. +1 −0 android/app/src/main/res/values/strings.xml
  5. +2 −0 android/settings.gradle
  6. +2 −3 index.android.js
  7. +2 −3 index.ios.js
  8. +8 −2 ios/noder.xcodeproj/project.pbxproj
  9. +2 −2 ios/noder/AppDelegate.m
  10. +55 −55 ios/noder/Info.plist
  11. +22 −21 package.json
  12. +2 −6 src/components/CommentHtml.js
  13. +3 −13 src/components/CommentList.js
  14. +3 −8 src/components/CommentOverlay.js
  15. +3 −9 src/components/CommentUp.js
  16. +2 −7 src/components/MarkAsReadOverlay.js
  17. +2 −12 src/components/MessageList.js
  18. +2 −8 src/components/MessageOverlay.js
  19. +2 −9 src/components/Nav.js
  20. +5 −23 src/components/ScrollableTabs.js
  21. +2 −10 src/components/Setting.js
  22. +2 −10 src/components/TabBar.js
  23. +2 −10 src/components/TopicRow.js
  24. +3 −8 src/components/UserOverlay.js
  25. +2 −8 src/components/UserTopicList.js
  26. +2 −8 src/components/base/ErrorHandle.js
  27. +2 −7 src/components/base/Html.js
  28. +2 −9 src/components/base/Loading.js
  29. +2 −12 src/components/base/Modal.js
  30. +2 −6 src/components/base/OverlayButton.js
  31. +2 −6 src/components/base/Return.js
  32. +2 −7 src/components/base/Row.js
  33. +2 −7 src/components/base/Spinner.js
  34. +2 −9 src/components/base/Toast.js
  35. +8 −6 src/configs/Router.js
  36. +2 −3 src/configs/animations.js
  37. +2 −4 src/configs/sceneConfig.js
  38. +1 −1 src/index.js
  39. +3 −12 src/layouts/About.js
  40. +3 −15 src/layouts/Comment.js
  41. +2 −11 src/layouts/Home.js
  42. +7 −7 src/layouts/Login.js
  43. +2 −8 src/layouts/Message.js
  44. +2 −10 src/layouts/Navigation.js
  45. +2 −15 src/layouts/Publish.js
  46. +2 −10 src/layouts/QRCode.js
  47. +3 −14 src/layouts/Topic.js
  48. +2 −10 src/layouts/TopicList.js
  49. +2 −11 src/layouts/User.js
  50. +2 −8 src/layouts/Utils.js
  51. +1 −1 src/reducers/message.js
  52. +1 −1 src/reducers/topic.js
  53. +1 −1 src/reducers/user.js
  54. +2 −3 src/services/storage.js
  55. +2 −5 src/utils/codePushSync.js
  56. +2 −3 src/utils/index.js
@@ -131,6 +131,7 @@ android {
}
dependencies {
+ compile project(':react-native-blur')
compile project(':react-native-code-push')
compile project(':react-native-vector-icons')
compile project(':react-native-camera')
Binary file not shown.
Binary file not shown.
@@ -1,3 +1,4 @@
<resources>
+
<string name="app_name">Noder</string>
</resources>
@@ -1,6 +1,8 @@
rootProject.name = 'noder'
include ':app'
+include ':react-native-blur'
+project(':react-native-blur').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-blur/android')
include ':react-native-barcodescanner'
project(':react-native-barcodescanner').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-barcodescanner/android')
include ':react-native-camera'
View
@@ -1,6 +1,5 @@
-import React,{
- AppRegistry,
-} from 'react-native';
+import React from 'react';
+import {AppRegistry} from 'react-native';
import Noder from './src';
View
@@ -1,6 +1,5 @@
-import React,{
- AppRegistry,
-} from 'react-native';
+import React from 'react';
+import {AppRegistry} from 'react-native';
import Noder from './src';
@@ -810,7 +810,10 @@
INFOPLIST_FILE = noder/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- OTHER_LDFLAGS = "-ObjC";
+ OTHER_LDFLAGS = (
+ "-ObjC",
+ "-lc++",
+ );
PRODUCT_BUNDLE_IDENTIFIER = com.lingyong.me.noder;
PRODUCT_NAME = noder;
PROVISIONING_PROFILE = "";
@@ -837,7 +840,10 @@
INFOPLIST_FILE = noder/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- OTHER_LDFLAGS = "-ObjC";
+ OTHER_LDFLAGS = (
+ "-ObjC",
+ "-lc++",
+ );
PRODUCT_BUNDLE_IDENTIFIER = com.lingyong.me.noder;
PRODUCT_NAME = noder;
PROVISIONING_PROFILE = "";
@@ -31,7 +31,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
* on the same Wi-Fi network.
*/
-// jsCodeLocation = [NSURL URLWithString:@"http://172.18.118.32:8081/index.ios.bundle?platform=ios&dev=true"];
+// jsCodeLocation = [NSURL URLWithString:@"http://192.168.31.142:8081/index.ios.bundle?platform=ios&dev=true"];
/**
* OPTION 2
@@ -45,7 +45,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
// jsCodeLocation = [CodePush bundleURL];
#ifdef DEBUG
- jsCodeLocation = [NSURL URLWithString:@"http://172.18.118.32:8081/index.ios.bundle?platform=ios&dev=true"];
+ jsCodeLocation = [NSURL URLWithString:@"http://192.168.31.142:8081/index.ios.bundle?platform=ios&dev=true"];
#else
jsCodeLocation = [CodePush bundleURL];
#endif
View
@@ -1,58 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>zh_CN</string>
- <key>CFBundleExecutable</key>
- <string>$(EXECUTABLE_NAME)</string>
- <key>CFBundleIdentifier</key>
- <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>Noder</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1</string>
- <key>CodePushDeploymentKey</key>
- <string>Q2A8khx6JV4mXXcS0usR0LipDz0Y410YoZxlZ</string>
- <key>LSRequiresIPhoneOS</key>
- <true/>
- <key>NSAppTransportSecurity</key>
- <dict>
- <key>NSAllowsArbitraryLoads</key>
- <true/>
- </dict>
- <key>NSLocationWhenInUseUsageDescription</key>
- <string></string>
- <key>UIAppFonts</key>
- <array>
- <string>Entypo.ttf</string>
- <string>EvilIcons.ttf</string>
- <string>FontAwesome.ttf</string>
- <string>Foundation.ttf</string>
- <string>Ionicons.ttf</string>
- <string>MaterialIcons.ttf</string>
- <string>Octicons.ttf</string>
- <string>Zocial.ttf</string>
- </array>
- <key>UILaunchStoryboardName</key>
- <string>LaunchScreen</string>
- <key>UIRequiredDeviceCapabilities</key>
- <array>
- <string>armv7</string>
- </array>
- <key>UISupportedInterfaceOrientations</key>
- <array>
- <string>UIInterfaceOrientationPortrait</string>
- </array>
- <key>UIViewControllerBasedStatusBarAppearance</key>
- <false/>
-</dict>
-</plist>
+ <dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>zh_CN</string>
+ <key>CFBundleExecutable</key>
+ <string>$(EXECUTABLE_NAME)</string>
+ <key>CFBundleIdentifier</key>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>Noder</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ <key>CodePushDeploymentKey</key>
+ <string>Q2A8khx6JV4mXXcS0usR0LipDz0Y410YoZxlZ</string>
+ <key>LSRequiresIPhoneOS</key>
+ <true/>
+ <key>NSAppTransportSecurity</key>
+ <dict>
+ <key>NSAllowsArbitraryLoads</key>
+ <true/>
+ </dict>
+ <key>NSLocationWhenInUseUsageDescription</key>
+ <string/>
+ <key>UIAppFonts</key>
+ <array>
+ <string>Entypo.ttf</string>
+ <string>EvilIcons.ttf</string>
+ <string>FontAwesome.ttf</string>
+ <string>Foundation.ttf</string>
+ <string>Ionicons.ttf</string>
+ <string>MaterialIcons.ttf</string>
+ <string>Octicons.ttf</string>
+ <string>Zocial.ttf</string>
+ </array>
+ <key>UILaunchStoryboardName</key>
+ <string>LaunchScreen</string>
+ <key>UIRequiredDeviceCapabilities</key>
+ <array>
+ <string>armv7</string>
+ </array>
+ <key>UISupportedInterfaceOrientations</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
+ </array>
+ <key>UIViewControllerBasedStatusBarAppearance</key>
+ <false/>
+ </dict>
+</plist>
View
@@ -18,40 +18,41 @@
},
"dependencies": {
"flux-standard-action": "^0.6.1",
- "lodash": "^4.11.1",
+ "lodash": "^4.13.1",
"markdown": "0.5.0",
- "moment": "^2.12.0",
- "query-string": "^4.1.0",
- "react": "^0.14.8",
- "react-addons-pure-render-mixin": "^15.0.1",
- "react-native": "^0.24.0",
- "react-native-barcodescanner": "^1.0.1",
- "react-native-blur": "^0.7.11",
- "react-native-button": "^1.4.2",
+ "moment": "^2.13.0",
+ "query-string": "^4.2.2",
+ "react": "^15.1.0",
+ "react-addons-pure-render-mixin": "^15.1.0",
+ "react-native": "^0.28.0",
+ "react-native-barcodescanner": "^3.0.0",
+ "react-native-blur": "^1.0.0",
+ "react-native-button": "^1.6.0",
"react-native-camera": "git+https://github.com/lwansbrough/react-native-camera.git",
- "react-native-code-push": "^1.10.2-beta",
- "react-native-html-render": "^1.0.3",
- "react-native-scrollable-tab-view": "^0.4.1",
- "react-native-vector-icons": "^1.3.4",
+ "react-native-cli": "^1.0.0",
+ "react-native-code-push": "^1.12.2-beta",
+ "react-native-html-render": "^1.0.4",
+ "react-native-scrollable-tab-view": "^0.5.1",
+ "react-native-vector-icons": "^2.0.3",
"react-redux": "^4.4.5",
- "redux": "^3.4.0",
- "redux-actions": "^0.9.1",
+ "redux": "^3.5.2",
+ "redux-actions": "^0.10.0",
"redux-logger": "^2.6.1",
"redux-promise": "^0.5.3",
- "redux-thunk": "^2.0.1"
+ "redux-thunk": "^2.1.0"
},
"devDependencies": {
- "babel-eslint": "^6.0.4",
+ "babel-eslint": "^6.1.0",
"coffee-script": "^1.9.2",
"dev-ip": "^1.0.1",
- "eslint": "^2.7.0",
- "eslint-plugin-react": "^4.2.3",
+ "eslint": "^2.13.1",
+ "eslint-plugin-react": "^5.2.2",
"gulp": "^3.9.1",
"gulp-replace": "^0.5.4",
"gulp-util": "^3.0.4",
"react-native-cli": "^0.2.0",
- "redux-devtools": "^3.2.0",
- "run-sequence": "^1.1.0"
+ "redux-devtools": "^3.3.1",
+ "run-sequence": "^1.2.1"
},
"devEngines": {
"node": ">= 4.x",
@@ -1,9 +1,5 @@
-import React, {
- Component,
- StyleSheet,
- Image,
- Dimensions
-} from 'react-native';
+import React, {Component} from 'react';
+import {StyleSheet, Image, Dimensions} from 'react-native';
import Html from './base/Html';
@@ -1,15 +1,5 @@
-import React, {
- Component,
- Dimensions,
- View,
- Text,
- PropTypes,
- ListView,
- StyleSheet,
- Image,
- TouchableOpacity,
- RefreshControl
-} from 'react-native';
+import React, {Component, PropTypes} from 'react';
+import {Dimensions, View, Text, ListView, StyleSheet, Image, TouchableOpacity, RefreshControl} from 'react-native';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import Icon from 'react-native-vector-icons/Ionicons';
import moment from 'moment';
@@ -113,7 +103,7 @@ class CommentList extends Component {
<TouchableOpacity
onPress={ ()=> this.props.onReplyPress(comment.id, authorName) }>
<Icon
- name={'reply'}
+ name={'ios-reply'}
size={22}
color='rgba(0,0,0,0.35)'
style={styles.replyIcon}
@@ -1,10 +1,5 @@
-import React, {
- View,
- StyleSheet,
- Component,
- Text,
- PropTypes
-} from 'react-native';
+import React, {Component, PropTypes} from 'react';
+import {View, StyleSheet, Text} from 'react-native';
import Icon from 'react-native-vector-icons/Ionicons';
import OverlayButton from './base/OverlayButton';
@@ -39,7 +34,7 @@ class CommentOverlay extends Component {
onPress={this.props.onPress}>
<View style={styles.content}>
<Icon
- name='chatbox'
+ name='ios-chatbox'
size={13}
color='white'
style={styles.commentIcon}
@@ -1,11 +1,5 @@
-import React, {
- Component,
- View,
- TouchableOpacity,
- StyleSheet,
- Text,
- PropTypes
-} from 'react-native';
+import React, {Component, PropTypes} from 'react';
+import {View, TouchableOpacity, StyleSheet, Text} from 'react-native';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import Icon from 'react-native-vector-icons/Ionicons';
import Spinner from './base/Spinner';
@@ -67,7 +61,7 @@ class CommentUp extends Component {
}
return (
<Icon
- name={'thumbsup'}
+ name={'ios-thumbsup'}
size={16}
color={this._isUped() ? '#3498DB':'rgba(0,0,0,0.2)'}
style={styles.upIcon}
@@ -1,10 +1,5 @@
-import React, {
- View,
- StyleSheet,
- Component,
- Text,
- PropTypes
-} from 'react-native';
+import React, {Component, PropTypes} from 'react';
+import {View, StyleSheet, Text} from 'react-native';
import OverlayButton from './base/OverlayButton';
import Spinner from './base/Spinner';
@@ -1,15 +1,5 @@
-import React, {
- View,
- StyleSheet,
- Component,
- Text,
- Image,
- ListView,
- TouchableHighlight,
- Dimensions,
- PropTypes,
- RefreshControl
-} from 'react-native';
+import React, {Component, PropTypes} from 'react';
+import {View, StyleSheet, Text, Image, ListView, TouchableHighlight, Dimensions, RefreshControl} from 'react-native';
import moment from 'moment';
import {parseImgUrl} from '../utils';
import * as Constants from '../constants';
@@ -1,11 +1,5 @@
-import React, {
- View,
- Text,
- Component,
- StyleSheet,
- Dimensions,
- PropTypes
-} from 'react-native';
+import React, {Component, PropTypes} from 'react';
+import {View, Text, StyleSheet, Dimensions} from 'react-native';
import OverlayButton from './base/OverlayButton';
import Icon from 'react-native-vector-icons/Ionicons';
Oops, something went wrong.

0 comments on commit ca2f619

Please sign in to comment.