Merge pull request #36 from just4fun/v1.6.1

v1.6.1

Author: just4fun

README.md

@@ -12,7 +12,7 @@ For all officially recommended clients, please visit http://bbs.uestc.edu.cn/for
 
 ![app_icon](https://cloud.githubusercontent.com/assets/7512625/18613513/348f7322-7daf-11e6-902d-94776bb55670.jpg)
 
-## Status (v1.6.0)
+## Status (v1.6.1)
 
 [<img width="250" alt="download_on_the_app_store" src="https://user-images.githubusercontent.com/7512625/27969868-353f554c-637f-11e7-869d-3963933461ca.png">](https://itunes.apple.com/cn/app/qing-shui-he-pan-stuhome/id1190564355)
 

ios/stuhome/Info.plist

@@ -19,7 +19,7 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.6.0</string>
+    <string>1.6.1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stuhome",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "An iOS client for http://bbs.uestc.edu.cn/ written in React Native with Redux.",
   "author": "just4fun <houritsunohikari@gmail.com>",
   "scripts": {

src/components/Avatar.js

@@ -5,7 +5,6 @@ import {
   TouchableOpacity
 } from 'react-native';
 import styles from '../styles/components/_Avatar';
-import colors from '../styles/common/_colors';
 
 export default class Avatar extends Component {
   render() {
@@ -21,7 +20,6 @@ export default class Avatar extends Component {
 
     return (
       <TouchableOpacity
-        underlayColor={colors.underlay}
         onPress={() => {
           if (onPress) {
             onPress();

src/components/MenuProfile.js

@@ -3,10 +3,9 @@ import {
   View,
   Text,
   Image,
-  TouchableHighlight,
+  TouchableOpacity,
 } from 'react-native';
 import styles from '../styles/components/_MenuProfile';
-import colors from '../styles/common/_colors';
 
 export default class MenuProfile extends Component {
   render() {
@@ -24,25 +23,23 @@ export default class MenuProfile extends Component {
       <View style={styles.menuHeader}>
         <View>
           {token &&
-            <TouchableHighlight
+            <TouchableOpacity
               style={styles.avatar}
-              underlayColor={colors.underlay}
               onPress={() => navigation.navigate('Information', { userId: uid })}>
               <Image
                 key={avatar}
                 style={styles.avatar}
                 source={{ uri: avatar }} />
-             </TouchableHighlight>
+             </TouchableOpacity>
             ||
-            <TouchableHighlight
+            <TouchableOpacity
               style={styles.avatar}
-              underlayColor={colors.underlay}
               onPress={() => navigation.navigate('LoginModal')}>
               <Image
                 key='noavatar'
                 style={styles.avatar}
                 source={require('../images/noavatar.jpg')} />
-             </TouchableHighlight>
+             </TouchableOpacity>
           }
           <Text style={styles.name}>{token ? userName : '请先登录'}</Text>
         </View>

src/config.js

@@ -21,7 +21,7 @@ module.exports = {
 
   MAX_UPLOAD_IMAGES_COUNT: 9,
 
-  VERSION: 'v1.6.0',
+  VERSION: 'v1.6.1',
 
   AUTHOR_ID: 32044,
 

src/containers/Individual.js

@@ -138,7 +138,6 @@ class Individual extends Component {
       <View style={mainStyles.container}>
         <View style={styles.header}>
           <TouchableOpacity
-            underlayColor={colors.underlay}
             onPress={() => {
               navigation.navigate('Information', { userId: this.userId });
             }}>

src/containers/TopicDetail.js

@@ -181,6 +181,11 @@ class TopicDetail extends Component {
     let commentHeaderText =
       topic.replies > 0 ? (topic.replies + '条评论') : '还没有评论，快来抢沙发！';
 
+    // Same with f227938f.
+    if (topic.user_id === 0) {
+      topic.user_nick_name = '匿名';
+    }
+
     return (
       <View>
         <View style={styles.top}>
@@ -409,18 +414,24 @@ class TopicDetail extends Component {
           keyExtractor={(item, index) => index}
           removeClippedSubviews={false}
           enableEmptySections={true}
-          renderItem={({ item: comment }) =>
-            <Comment
-              key={comment.reply_posts_id}
-              comment={comment}
-              currentUserId={uid}
-              // `topicId` and `boardId` are not involved in `comment` here,
-              // which are necessary for topic reply API.
-              topicId={this.topicId}
-              boardId={this.boardId}
-              navigation={navigation}
-              getCopyContent={(content) => this.getCopyContent(content)} />
-          }
+          renderItem={({ item: comment }) => {
+            // Same with f227938f.
+            if (comment.reply_id === 0) {
+              comment.reply_name = '匿名';
+            }
+            return (
+              <Comment
+                key={comment.reply_posts_id}
+                comment={comment}
+                currentUserId={uid}
+                // `topicId` and `boardId` are not involved in `comment` here,
+                // which are necessary for topic reply API.
+                topicId={this.topicId}
+                boardId={this.boardId}
+                navigation={navigation}
+                getCopyContent={(content) => this.getCopyContent(content)} />
+            );
+          }}
           onEndReached={() => this.endReached()}
           onEndReachedThreshold={0}
           ListHeaderComponent={() => this.renderHeader()}

src/services/api.js

@@ -101,7 +101,13 @@ export default {
     userName,
     password
   }) => {
-    return callApi(`user/login&username=${userName}&password=${password}`);
+    // If we use `application/x-www-form-urlencoded` as `Content-Type`, the body should be
+    // `key1=value1&key2=value2`, and the specific symbols in value1 and value2 will be treated
+    // as same as we used them in the query string of GET request. That being said, we should
+    // encode the values especially do comparing with database.
+    let body = `username=${encodeURIComponent(userName)}&password=${encodeURIComponent(password)}`;
+    let fetchOptions = getPublishFetchOptions(body);
+    return callApi(`user/login`, fetchOptions);
   },
 
   fetchTopicList: ({