version 3.5.0

Author: breitning

.flowconfig

@@ -17,6 +17,7 @@
 
 # Ignore unexpected extra @providesModule
 .*/node_modules/commoner/test/source/widget/share.js
+.*/node_modules/.*/node_modules/fbjs/.*
 
 # Ignore duplicate module providers
 # For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root
@@ -48,11 +49,11 @@ suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-2]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-2]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-3]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-3]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.32.0
+^0.33.0

.gitignore

@@ -40,4 +40,5 @@ buck-out/
 \.buckd/
 android/app/libs
 android/keystores/debug.keystore
-source/config/index.js
+android/gradle.properties
+source/config/index.bak.js

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         applicationId "com.reactnativecnblogs"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 4
-        versionName "3.3.0"
+        versionCode 350
+        versionName "3.5.0"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
@@ -152,6 +152,6 @@ dependencies {
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-  from configurations.compile
-  into 'libs'
+    from configurations.compile
+    into 'libs'
 }

android/app/src/debug/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">博客圆</string>
+    <string name="app_name">博客苑</string>
 </resources>

android/app/src/main/java/com/reactnativecnblogs/MainApplication.java

@@ -8,7 +8,7 @@
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
-
+import com.facebook.soloader.SoLoader;
 import com.oblador.vectoricons.VectorIconsPackage;
 import com.microsoft.codepush.react.CodePush;
 import com.remobile.toast.RCTToastPackage;
@@ -42,6 +42,12 @@ protected List<ReactPackage> getPackages() {
 
   @Override
   public ReactNativeHost getReactNativeHost() {
-      return mReactNativeHost;
+    return mReactNativeHost;
+  }
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    SoLoader.init(this, /* native exopackage */ false);
   }
 }

ios/reactNativeCnblogs/Info.plist

@@ -52,5 +52,19 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string></string>
+	<key>NSAppTransportSecurity</key>
+	<!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/ -->
+	<dict>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>localhost</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+		</dict>
+	</dict>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactNativeCnblogs",
-  "version": "3.3.0",
+  "version": "3.5.0",
   "author": {
     "name": "togayther",
     "email": "[email protected]"
@@ -35,24 +35,24 @@
   "dependencies": {
     "@remobile/react-native-toast": "^1.0.5",
     "entities": "^1.1.1",
-    "flux-standard-action": "^0.6.1",
-    "lodash": "^4.13.1",
-    "moment": "^2.13.0",
-    "react": "^15.3.1",
-    "react-addons-pure-render-mixin": "^15.2.0",
-    "react-native": "^0.34.0",
-    "react-native-action-button": "^2.0.3",
-    "react-native-animatable": "^0.6.1",
-    "react-native-code-push": "^1.13.5-beta",
+    "flux-standard-action": "^1.0.0",
+    "lodash": "^4.17.2",
+    "moment": "^2.17.1",
+    "react": "^15.4.1",
+    "react-addons-pure-render-mixin": "^15.4.1",
+    "react-native": "^0.38.1",
+    "react-native-action-button": "^2.0.16",
+    "react-native-animatable": "^1.1.0",
+    "react-native-code-push": "^1.16.1-beta",
     "react-native-drawer": "^2.3.0",
     "react-native-html-converter": "^1.0.4",
     "react-native-parallax-scroll-view": "^0.19.0",
-    "react-native-scrollable-tab-view": "^0.5.1",
-    "react-native-vector-icons": "^2.0.3",
+    "react-native-scrollable-tab-view": "^0.7.0",
+    "react-native-vector-icons": "^3.0.0",
     "react-redux": "^4.4.5",
     "react-timer-mixin": "^0.13.3",
-    "redux": "^3.5.2",
-    "redux-actions": "^0.10.0",
+    "redux": "^3.6.0",
+    "redux-actions": "^1.1.0",
     "redux-thunk": "^2.1.0"
   }
 }

source/action/config.js

@@ -31,4 +31,3 @@ export const getConfig = createAction(types.GET_CONFIG, async({key})=> {
       	rejected
 	}
 });
-

source/action/update.js

@@ -0,0 +1,10 @@
+import { createAction } from 'redux-actions';
+import * as types from '../constant/actiontype';
+import * as updateService from '../service/updateService';
+
+export const getUpdateInfo = createAction(
+  types.FETCH_UPDATE_INFO,
+  async(version)=> {
+    return await updateService.getUpdateInfo(version);
+  }
+)

source/component/button/home.js

@@ -51,6 +51,7 @@ class HomeButton extends Component {
                 buttonColor = { item.color } 
                 style = { styles.button_item }
                 titleColor = { StyleConfig.color_white }
+                textContainerStyle = {{ borderWidth:0 }}
                 titleBgColor = { item.color }>
                 <Icon name={ item.icon }  style={ ComponentStyles.button_icon } />
             </ActionButton.Item>
@@ -72,6 +73,7 @@ class HomeButton extends Component {
                 bgColor = { StyleConfig.action_background_color }
                 btnOutRange = { StyleConfig.action_color_danger_active }
                 buttonColor = { StyleConfig.action_color_danger }
+                hideShadow = { true }
                 icon = {  this.renderButtonIcon() }>
                 {
                     buttons && buttons.map((button, index)=>{

source/component/button/post.js

@@ -52,6 +52,7 @@ class PostButton extends Component {
                 buttonColor = { item.color } 
                 titleBgColor = { item.color }
                 titleColor = { StyleConfig.color_white }
+                textContainerStyle = {{ borderWidth:0 }}
                 onPress={() => this.onButtonPress(item) }>
                 <Icon name={ item.icon }  style={ ComponentStyles.button_icon } />
             </ActionButton.Item>
@@ -73,6 +74,7 @@ class PostButton extends Component {
                 bgColor = { StyleConfig.action_background_color }
                 btnOutRange = { StyleConfig.action_color_danger_active }
                 buttonColor = { StyleConfig.action_color_danger }
+                hideShadow = { true }
                 icon = {  this.renderButtonIcon() }>
                 {
                     buttons && buttons.map((button, index)=>{

source/component/button/search.js

@@ -46,6 +46,7 @@ class SearchButton extends Component {
                 style = { styles.button_item }
                 buttonColor = { item.color } 
                 titleBgColor = { item.color }
+                textContainerStyle = {{ borderWidth:0 }}
                 titleColor = { StyleConfig.color_white }
                 onPress={() => this.onButtonPress(item) }>
                 <Icon name={ item.icon }  style={ ComponentStyles.button_icon } />
@@ -68,6 +69,7 @@ class SearchButton extends Component {
                 bgColor = { StyleConfig.action_background_color }
                 btnOutRange = { StyleConfig.action_color_danger_active }
                 buttonColor = { StyleConfig.action_color_danger }
+                hideShadow = { true }
                 icon = {  this.renderButtonIcon() }>
                 {
                     buttons && buttons.map((button, index)=>{

source/component/button/single.js

@@ -36,6 +36,7 @@ class SingleButton extends Component {
                 position={ position }
                 buttonColor = { color }
                 onPress = { ()=>onPress() }
+                hideShadow = { true }
                 icon = { this.renderButtonIcon() }>
             </ActionButton>
 	    )

source/component/htmlConvertor.js

@@ -15,15 +15,21 @@ import ImageBox from './imageBox';
 
 const defaultImageMaxWidth = StyleConfig.screen_width - StyleConfig.space_3 * 2;
 
-class HtmlRender extends Component {
+class HtmlConvertor extends Component {
 
 	constructor(props) {
 		super(props);
 		this.shouldComponentUpdate = PureRenderMixin.shouldComponentUpdate.bind(this);
 	}
 
 	onLinkPress(url) {
-		openLink(url);
+		const { router } = this.props;
+		if(url && router){
+			router.push(ViewPage.web(), {
+				title: url,
+				url: url
+			});
+		}
 	}
 
 	renderCodeBlock(codeText) {
@@ -74,14 +80,10 @@ class HtmlRender extends Component {
 		const { imgDisabled } = this.props;
 
 		if(node.type == 'tag'){
-			//note: 解析图片
 			if(node.name == "img" && node.attribs && node.attribs.src){
-				
 				const imageUri = node.attribs.src;
-
 				// 1，禁用图片加载
 				// 2，每篇博文尾部会附加：<img src="http://counter.cnblogs.com//blog/post/5876249" width="1" height="1" style="border:0px;visibility:hidden"/>
-				//    不渲染图片
 				if(imgDisabled === true || imageUri.indexOf("counter.cnblogs.com") > 0){
 					return undefined;
 				}
@@ -108,7 +110,6 @@ class HtmlRender extends Component {
 			   node.name == "pre" || 
 			   (node.name == "div" && node.attribs && node.attribs.class && node.attribs.class=="cnblogs_code")){
 
-				//不解析code snippet
 				if(this.props.renderCode === false){
 					return undefined;
 				}
@@ -140,7 +141,6 @@ class HtmlRender extends Component {
 		}
 	}
 
-
 	render() {
 		return (
 			<HTMLView
@@ -154,4 +154,4 @@ class HtmlRender extends Component {
 	}
 }
 
-export default HtmlRender;
+export default HtmlConvertor;

source/component/messager.js

@@ -0,0 +1,41 @@
+import React, { Component } from 'react';
+import {
+	View
+} from 'react-native';
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+import { CommonStyles, StyleConfig } from '../style';
+import Toast from '@remobile/react-native-toast';
+import PureRenderMixin from 'react-addons-pure-render-mixin';
+
+class Messager extends Component {
+	
+	constructor(props) {
+		super(props);
+		this.shouldComponentUpdate = PureRenderMixin.shouldComponentUpdate.bind(this);
+	}
+
+	componentWillReceiveProps(nextProps, nextStates) {
+		if (this.props.common.message.id !== nextProps.common.message.id) {
+			const message = nextProps.common.message.text;
+			if (message && typeof message === "string") {
+				Toast.show(message);
+			}
+		}
+	}
+
+	render() {
+        return null;
+	}
+}
+
+export default connect(state => ({
+  	common : state.common
+}), dispatch => ({ 
+}), null, {
+  	withRef: true
+})(Messager);
+
+
+
+

source/component/navigation.js

@@ -50,12 +50,13 @@ class Navigation extends Component {
 	render() {
 		return (
 			<View style={ ComponentStyles.container }>
-				<Plugin />
 				<Navigator
 					initialRoute={ defaultRoute }
 					configureScene={ this.configureScene.bind(this) }
 					renderScene={ this.renderScene.bind(this) } 
 					onDidFocus={ this.onDidFocus.bind(this) }/>
+					
+				<Plugin router={ this.router }/>
 			</View>
 		)
 	}

source/component/panel.js

@@ -38,29 +38,39 @@ class Panel extends Component {
 		}
 	}
 
-	render() {
-
-		const { onPress = (()=>null) } = this.props;
+	renderTail(){
+		if(this.props.tailControl){
+			return (
+				<View style={[ CommonStyles.flexItemsMiddle, CommonStyles.flexItemsRight ]}>
+					{ this.props.tailControl }
+				</View>
+			)
+		}
+	}
 
+	renderContent(){
 		return (
-			<TouchableHighlight 
-				onPress={()=> onPress() }
-				underlayColor ={ StyleConfig.touchable_press_color }>
-		        <View style = {[ComponentStyles.list, CommonStyles.flexRow, CommonStyles.flexItemsMiddle, CommonStyles.flexItemsBetween]}>
-					<View style={[ CommonStyles.flexColumn, CommonStyles.flex_4 ]}>
-						{ this.renderTitle() }
-						{ this.renderDescr() }
-					</View>
-					{
-						this.props.tailControl?
-						<View style={[ CommonStyles.flexItemsMiddle, CommonStyles.flex_1 ]}>
-							{ this.props.tailControl }
-						</View>
-						: null
-					}
-		        </View>
-		    </TouchableHighlight>
-		);
+			<View style = {[ComponentStyles.list, CommonStyles.flexRow, CommonStyles.flexItemsMiddle, CommonStyles.flexItemsBetween]}>
+				<View style={[ CommonStyles.flexColumn, CommonStyles.flex_4 ]}>
+					{ this.renderTitle() }
+					{ this.renderDescr() }
+				</View>
+				{ this.renderTail() }
+			</View>
+		)
+	}
+
+	render() {
+		if(this.props.onPress){
+			return (
+				<TouchableHighlight 
+					onPress={()=> this.props.onPress() }
+					underlayColor ={ StyleConfig.touchable_press_color }>
+					{ this.renderContent() }
+				</TouchableHighlight>
+			)
+		}
+		return this.renderContent();
 	}
 }