Merge pull request #49 from just4fun/v1.7.1-latest

just4fun · web-flow · commit a29ddcf09151 · 2018-12-08T02:26:55.000+08:00
v1.7.1 (new)
diff --git a/README.md b/README.md
@@ -1,16 +1,30 @@
-[<img width="200" alt="new_logo" src="https://user-images.githubusercontent.com/7512625/34460783-aaf95076-ee53-11e7-8699-3e94b6a0c270.png">](https://user-images.githubusercontent.com/7512625/34460783-aaf95076-ee53-11e7-8699-3e94b6a0c270.png)
-
-[![React Native](https://img.shields.io/badge/react--native-v0.51.0-05A5D1.svg)](https://facebook.github.io/react-native)
-[![GitHub issues](https://img.shields.io/github/issues/just4fun/stuhome.svg)](https://github.com/just4fun/stuhome/issues)
-[![MIT](https://img.shields.io/dub/l/vibe-d.svg)](http://opensource.org/licenses/MIT)
-
-An officially recommended 3rd party iOS client for http://bbs.uestc.edu.cn/ written in [react-native](https://facebook.github.io/react-native/), [redux](http://redux.js.org/) and [redux-observable](https://redux-observable.js.org/).
+<p align="center">
+  <img width="200" alt="new_logo" src="https://user-images.githubusercontent.com/7512625/34460783-aaf95076-ee53-11e7-8699-3e94b6a0c270.png">
+  <p align="center">
+    <img alt="alu" src="https://user-images.githubusercontent.com/7512625/49665467-eb50ab80-fa8f-11e8-871c-5928dc2c3cb8.gif" />
+    <img alt="alu" src="https://user-images.githubusercontent.com/7512625/49665467-eb50ab80-fa8f-11e8-871c-5928dc2c3cb8.gif" />
+    <img alt="alu" src="https://user-images.githubusercontent.com/7512625/49665467-eb50ab80-fa8f-11e8-871c-5928dc2c3cb8.gif" />
+  </p>
+  <p align="center">
+    <a href="https://facebook.github.io/react-native">
+      <img alt="React Native" src="https://img.shields.io/badge/react--native-v0.51.0-05A5D1.svg" />
+    </a>
+    <a href="https://github.com/just4fun/stuhome/issues">
+      <img alt="GitHub issues" src="https://img.shields.io/github/issues/just4fun/stuhome.svg" />
+    </a>
+    <a href="http://opensource.org/licenses/MIT">
+      <img alt="MIT" src="https://img.shields.io/dub/l/vibe-d.svg" />
+    </a>
+  </p>
+</p>
+
+## What
+
+An iOS client for http://bbs.uestc.edu.cn/ written in [react-native](https://facebook.github.io/react-native/), [redux](http://redux.js.org/) and [redux-observable](https://redux-observable.js.org/), which has been [recommended officially](http://bbs.uestc.edu.cn/forum.php?mod=viewthread&tid=1554255) as one of the best 3rd party iOS clients.
 
 APIs are provided by [appbyme/mobcent-discuz](https://github.com/appbyme/mobcent-discuz) and partly documented by [UESTC-BBS/API-Docs](https://github.com/UESTC-BBS/API-Docs/wiki/Mobcent-API).
 
-For all officially recommended clients, please visit http://bbs.uestc.edu.cn/forum.php?mod=viewthread&tid=1554255.
-
-## Status (v1.7.0)
+## Status (v1.7.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)
 
diff --git a/ios/stuhome/Info.plist b/ios/stuhome/Info.plist
@@ -19,7 +19,7 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.7.0</string>
+    <string>1.7.1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stuhome",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "An officially recommended 3rd party iOS client for http://bbs.uestc.edu.cn/ written in react-native, redux and redux-observable.",
   "author": "just4fun <houritsunohikari@gmail.com>",
   "scripts": {
@@ -20,7 +20,7 @@
     "apsl-react-native-button": "3.1.0",
     "lodash": "4.17.4",
     "md5": "2.1.0",
-    "moment": "2.19.3",
+    "moment": "^2.19.0",
     "react": "16.0.0",
     "react-native": "0.51.0",
     "react-native-checkbox": "2.0.0",
@@ -36,7 +36,7 @@
     "react-native-smart-timer-enhance": "1.0.3",
     "react-native-sticky-keyboard-accessory": "0.1.1",
     "react-native-vector-icons": "4.4.3",
-    "react-navigation": "1.0.3",
+    "react-navigation": "2.18.3",
     "react-redux": "5.0.6",
     "redux": "3.3.1",
     "redux-actions": "1.2.1",
diff --git a/src/common/vendor/components/GiftedChatMessageText.js b/src/common/vendor/components/GiftedChatMessageText.js
@@ -81,7 +81,12 @@ export default class MessageText extends React.Component {
           ]}
           childrenProps={{...this.props.textProps}}
         >
-          {parseContentWithEmoji(this.props.currentMessage.text)}
+          {
+            // In private message, no need to custom the size for emoji,
+            // since the font size setting is only used for topic content.
+            // So `0` for 2nd parameter here.
+          }
+          {parseContentWithEmoji(this.props.currentMessage.text, 0)}
         </ParsedText>
       </View>
     );
diff --git a/src/components/Avatar/Avatar.js b/src/components/Avatar/Avatar.js
@@ -30,7 +30,7 @@ export default Avatar = (props) => {
         // 3. Same user (in individual page)
         if (!currentUserId || !userId || +userId === +currentUserId) { return; }
 
-        navigation.navigate('Individual', {
+        navigation.push('Individual', {
           userId,
           userName,
           currentUserId
diff --git a/src/components/Comment/Comment.js b/src/components/Comment/Comment.js
@@ -58,7 +58,7 @@ export default class Comment extends Component {
     (buttonIndex) => {
       switch (buttonIndex) {
         case 0:
-          navigation.navigate('ReplyModal', {
+          navigation.push('ReplyModal', {
             // `comment` here is item from `forum/postlist`, which has
             // no `topicId` and `boardId`, but necessary for topic reply
             // API.
@@ -80,7 +80,7 @@ export default class Comment extends Component {
           break;
         case 2:
           if (canSendPrivateMessage) {
-            navigation.navigate('PrivateMessage', { userId });
+            navigation.push('PrivateMessage', { userId });
           } else if (editable) {
             const editAction = managePanel.find(item => item.title === '编辑');
             SafariView.show(editAction.action);
diff --git a/src/components/Content/Content.js b/src/components/Content/Content.js
@@ -113,7 +113,7 @@ export default class Content extends Component {
   render() {
     const newContent = this.getContentByGroup();
     const { navigation, settings } = this.props;
-    const { fontSize, lineHeight } = FONT_SIZES[settings.fontSize];
+    const { fontSize, lineHeight, emojiSize } = FONT_SIZES[settings.fontSize];
     const fontStyle = {
       fontSize,
       lineHeight
@@ -138,14 +138,14 @@ export default class Content extends Component {
                   {groupContent.map((item, index) => {
                     return (
                       item.type === 0 && (
-                        <Text key={index}>{parseContentWithEmoji(item.infor)}</Text>
+                        <Text key={index}>{parseContentWithEmoji(item.infor, emojiSize)}</Text>
                       ) || (
                         this.isAtSomebody(item.url) && (
                           // @somebody
                           <Text
                             key={index}
                             style={styles.url}
-                            onPress={() => navigation.navigate('Individual', {
+                            onPress={() => navigation.push('Individual', {
                               userId: this.getUserId(item.url),
                               userName: this.getUserName(item.infor)
                             })}>
@@ -159,7 +159,7 @@ export default class Content extends Component {
                             <Text
                               key={index}
                               style={styles.url}
-                              onPress={() => navigation.navigate('Topic', {
+                              onPress={() => navigation.push('Topic', {
                                 topic_id: this.getTopicId(item.url)
                               })}>
                               {item.infor}
diff --git a/src/components/MenuButton/MenuButton.js b/src/components/MenuButton/MenuButton.js
@@ -16,9 +16,9 @@ export default class MenuButton extends Component {
     } = this.props;
 
     if (isLogin) {
-      navigation.navigate('DrawerToggle');
+      navigation.openDrawer();
     } else {
-      navigation.navigate('LoginModal');
+      navigation.push('LoginModal');
     }
   }
 
diff --git a/src/components/MenuProfile/MenuProfile.js b/src/components/MenuProfile/MenuProfile.js
@@ -27,6 +27,7 @@ export default MenuProfile = (props) => {
         {token &&
           <TouchableOpacity
             style={styles.avatar}
+            // https://reactnavigation.org/docs/en/navigation-prop.html
             onPress={() => navigation.navigate('Information', { userId: uid })}>
             <Image
               key={avatar}
@@ -36,7 +37,7 @@ export default MenuProfile = (props) => {
           ||
           <TouchableOpacity
             style={styles.avatar}
-            onPress={() => navigation.navigate('LoginModal')}>
+            onPress={() => navigation.push('LoginModal')}>
             <Image
               key='noavatar'
               style={styles.avatar}
diff --git a/src/components/NotifyItem/NotifyItem.js b/src/components/NotifyItem/NotifyItem.js
@@ -41,7 +41,7 @@ export default NotifyItem = (props) => {
     <TouchableHighlight
       style={styles.container}
       underlayColor={colors.underlay}
-      onPress={() => navigation.navigate('Topic', {
+      onPress={() => navigation.push('Topic', {
         topic_id,
         board_id,
         board_name
@@ -68,7 +68,7 @@ export default NotifyItem = (props) => {
           <Button
             style={styles.button}
             textStyle={styles.buttonText}
-            onPress={() => navigation.navigate('ReplyModal', {
+            onPress={() => navigation.push('ReplyModal', {
               comment: {
                 // WTF! Why there are different names for common field?!
                 reply_name: reply_nick_name,
diff --git a/src/components/PmSessionItem/PmSessionItem.js b/src/components/PmSessionItem/PmSessionItem.js
@@ -16,7 +16,7 @@ export default class PmSessionItem extends Component {
       // Mark message as read.
       this.props.markPmAsRead({ plid });
     }
-    this.props.navigation.navigate('PrivateMessage', { userId });
+    this.props.navigation.push('PrivateMessage', { userId });
   }
 
   render() {
diff --git a/src/components/SettingItem/SettingItem.style.js b/src/components/SettingItem/SettingItem.style.js
@@ -12,11 +12,11 @@ export default StyleSheet.create({
     backgroundColor: colors.white,
   },
   info: {
-    color: colors.mainField,
+    color: colors.significantField,
   },
   indicator: {
     flex: 1,
     textAlign: 'right',
-    color: colors.underlay,
+    color: colors.mainField,
   }
 });
diff --git a/src/components/SubForumItem/SubForumItem.js b/src/components/SubForumItem/SubForumItem.js
@@ -36,7 +36,7 @@ export default SubForumItem = (props) => {
         if (isForumListModal) {
           props.handleSelectForum(subForum);
         } else {
-          navigation.navigate('Forum', subForum);
+          navigation.push('Forum', subForum);
         }
       }}>
       <View style={styles.subForum}>
diff --git a/src/components/TopicItem/TopicItem.js b/src/components/TopicItem/TopicItem.js
@@ -23,9 +23,9 @@ export default class TopicItem extends Component {
     } = this.props;
     // Login User
     if (currentUserId) {
-      navigation.navigate('Topic', topic);
+      navigation.push('Topic', topic);
     } else {
-      navigation.navigate('LoginModal');
+      navigation.push('LoginModal');
     }
   }
 
diff --git a/src/config/app.js b/src/config/app.js
@@ -21,7 +21,7 @@ module.exports = {
 
   MAX_UPLOAD_IMAGES_COUNT: 9,
 
-  VERSION: 'v1.7.0',
+  VERSION: 'v1.7.1',
 
   AUTHOR_ID: 32044,
 
diff --git a/src/constants/fontSize.js b/src/constants/fontSize.js
@@ -2,16 +2,19 @@ export default {
   big: {
     text: '大',
     fontSize: 17,
-    lineHeight: 24
+    lineHeight: 24,
+    emojiSize: 28
   },
   medium: {
     text: '中',
     fontSize: 16,
-    lineHeight: 22
+    lineHeight: 22,
+    emojiSize: 26
   },
   small: {
     text: '小',
     fontSize: 15,
-    lineHeight: 20
+    lineHeight: 20,
+    emojiSize: 24
   }
 };
diff --git a/src/containers/About/About.js b/src/containers/About/About.js
@@ -42,7 +42,7 @@ export default class About extends Component {
           <SettingItem
             style={styles.lastItem}
             text='BUG 上报或意见反馈'
-            onPress={() => navigation.navigate('PrivateMessage', {
+            onPress={() => navigation.push('PrivateMessage', {
               userId: configs.AUTHOR_ID
             })} />
         </View>
diff --git a/src/containers/ForumDetail/ForumDetail.js b/src/containers/ForumDetail/ForumDetail.js
@@ -31,7 +31,7 @@ class ForumDetail extends Component {
       headerRight: (
         isLogin &&
           <PublishButton
-            onPress={() => navigation.navigate('PublishModal', {
+            onPress={() => navigation.push('PublishModal', {
               boardId,
               callback: () => handleModalCallback()
             })} />
diff --git a/src/containers/ForumListModal/ForumListModal.js b/src/containers/ForumListModal/ForumListModal.js
@@ -38,7 +38,7 @@ class ForumListModal extends Component {
 
   handleSelectForum(forum) {
     const { navigation } = this.props;
-    navigation.navigate('PublishModal', {
+    navigation.push('PublishModal', {
       boardId: forum.board_id
     });
   }
diff --git a/src/containers/Home/Home.js b/src/containers/Home/Home.js
@@ -37,7 +37,7 @@ class Home extends Component {
       headerRight: (
         isLogin &&
           <PublishButton
-            onPress={() => navigation.navigate('ForumListModal')} />
+            onPress={() => navigation.push('ForumListModal')} />
       )
     };
   }
diff --git a/src/containers/Individual/Individual.js b/src/containers/Individual/Individual.js
@@ -35,7 +35,7 @@ class Individual extends Component {
             style={headerRightButtonStyles.button}
             name='envelope'
             size={18}
-            onPress={() => navigation.navigate('PrivateMessage', { userId })} />
+            onPress={() => navigation.push('PrivateMessage', { userId })} />
       )
     };
   }
@@ -141,7 +141,7 @@ class Individual extends Component {
         <View style={styles.header}>
           <TouchableOpacity
             onPress={() => {
-              navigation.navigate('Information', { userId: this.userId });
+              navigation.push('Information', { userId: this.userId });
             }}>
             <Image
               style={styles.avatar}
diff --git a/src/containers/Information/Information.style.js b/src/containers/Information/Information.style.js
@@ -20,6 +20,6 @@ export default StyleSheet.create({
   },
   avatarIndicator: {
     marginLeft: 10,
-    color: colors.underlay,
+    color: colors.mainField,
   }
 });
diff --git a/src/containers/LoginModal/LoginModal.js b/src/containers/LoginModal/LoginModal.js
@@ -12,7 +12,7 @@ import {
 } from 'react-native';
 import Button from 'apsl-react-native-button';
 import { connect } from 'react-redux';
-import { NavigationActions } from 'react-navigation';
+import { NavigationActions, StackActions } from 'react-navigation';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
 import PopButton from '~/components/PopButton/PopButton';
 import Header from '~/components/Header/Header';
@@ -28,7 +28,7 @@ import {
 import mainStyles from '~/common/styles/Main.style';
 import styles from './LoginModal.style';
 
-const resetAction = NavigationActions.reset({
+const resetAction = StackActions.reset({
   index: 0,
   actions: [
     NavigationActions.navigate({ routeName: 'Main' })
diff --git a/src/containers/Menu/Menu.js b/src/containers/Menu/Menu.js
@@ -6,7 +6,7 @@ import {
   AsyncStorage,
   ActionSheetIOS,
 } from 'react-native';
-import { SafeAreaView, NavigationActions } from 'react-navigation';
+import { SafeAreaView, NavigationActions, StackActions } from 'react-navigation';
 import MenuProfile from '~/components/MenuProfile/MenuProfile';
 import MenuItem from '~/components/MenuItem/MenuItem';
 import MenuBottomItem from '~/components/MenuBottomItem/MenuBottomItem';
@@ -22,7 +22,7 @@ import { getAlertCount } from '~/modules/message/alert/alert.selectors';
 
 import styles from './Menu.style';
 
-const resetAction = NavigationActions.reset({
+const resetAction = StackActions.reset({
   index: 0,
   actions: [
     NavigationActions.navigate({ routeName: 'Home' })
diff --git a/src/containers/Navigator/Navigator.js b/src/containers/Navigator/Navigator.js
diff --git a/src/containers/PublishModal/PublishModal.js b/src/containers/PublishModal/PublishModal.js
diff --git a/src/containers/ReplyModal/ReplyModal.js b/src/containers/ReplyModal/ReplyModal.js
diff --git a/src/containers/Settings/Settings.js b/src/containers/Settings/Settings.js
diff --git a/src/containers/SettingsFontSize/SettingsFontSize.js b/src/containers/SettingsFontSize/SettingsFontSize.js
diff --git a/src/containers/TopicDetail/TopicDetail.js b/src/containers/TopicDetail/TopicDetail.js
diff --git a/src/utils/contentParser.js b/src/utils/contentParser.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ export default class MenuButton extends Component {`
`16`	`16`	`} = this.props;`
`17`	`17`
`18`	`18`	`if (isLogin) {`
`19`		`- navigation.navigate('DrawerToggle');`
	`19`	`+ navigation.openDrawer();`
`20`	`20`	`} else {`
`21`		`- navigation.navigate('LoginModal');`
	`21`	`+ navigation.push('LoginModal');`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`