Merge pull request #58 from funnyzak/feature/interestnode

Author: funnyzak

src/actions/CacheAction.ts

@@ -8,9 +8,12 @@ import { v2exLib } from '@src/v2ex'
 import {
   APP_CACHE_ADD_MEMBER,
   APP_CACHE_ADD_NODE,
+  APP_CACHE_MEMBER_FOLLOWING,
+  APP_CACHE_MEMBER_INTEREST_NODES,
   APP_CACHE_RESET,
   APP_CACHE_RESET_MEMBERS,
-  APP_CACHE_RESET_NODES
+  APP_CACHE_RESET_NODES,
+  V2exObject
 } from '../types'
 
 export const cacheMember = (userid: string | number) => async (dispatch: AppDispatch) => {
@@ -37,6 +40,16 @@ export const cacheNode = (nodeid: string | number) => async (dispatch: AppDispat
   }
 }
 
+export const cacheMemberFollowing = (members: V2exObject.Member[] | undefined) => ({
+  type: APP_CACHE_MEMBER_FOLLOWING,
+  payload: members
+})
+
+export const cacheMemberInterestNodes = (nodes: V2exObject.Node[] | undefined) => ({
+  type: APP_CACHE_MEMBER_INTEREST_NODES,
+  payload: nodes
+})
+
 export const resetCache = (type: 'all' | 'nodes' | 'members') => ({
   type: type === 'nodes' ? APP_CACHE_RESET_NODES : type === 'members' ? APP_CACHE_RESET_MEMBERS : APP_CACHE_RESET
 })

src/actions/MemberActions.ts

@@ -2,31 +2,42 @@
  * Created by leon<[email protected]> on 22/2/22.
  */
 import AsyncStorage from '@react-native-async-storage/async-storage'
+import { MEMBER_TOKEN_KEY } from '@src/config/constants'
+import { logError } from '@src/helper/logger'
+import NavigationService from '@src/navigation/NavigationService'
+import { RootState } from '@src/store'
+import { v2exLib } from '@src/v2ex'
 import { Dispatch } from 'redux'
 import {
-  MEMBER_PROFILE,
   APP_AUTH,
-  APP_AUTH_LOADING,
-  APP_LOGOUT,
   APP_AUTH_ERROR,
+  APP_AUTH_LOADING,
   APP_AUTH_SUCCESS,
-  V2exObject,
-  MEMBER_TOPICS,
+  APP_LOGOUT,
   MEMBER_INSEREST_NODE,
-  MEMBER_UNINTEREST_NODE
+  MEMBER_PROFILE,
+  MEMBER_SATE_SETTING,
+  MEMBER_TOPICS,
+  MEMBER_UNINTEREST_NODE,
+  V2exObject
 } from '../types'
-import { v2exLib } from '@src/v2ex'
-import { logError } from '@src/helper/logger'
-import NavigationService from '@src/navigation/NavigationService'
-import { MEMBER_TOKEN_KEY } from '@src/config/constants'
+import { cacheMemberInterestNodes } from './CacheAction'
 
-export const myProfile = () => async (dispatch: Dispatch) => {
+export const myProfile = () => async (dispatch: Dispatch, getState: () => RootState) => {
   const _member = await v2exLib.member.myProfile()
 
   dispatch({
     type: MEMBER_PROFILE,
     payload: _member
   })
+
+  dispatch({
+    type: MEMBER_SATE_SETTING,
+    payload: {
+      interestNodes: getState().cache.membersInterestNodes[_member.id],
+      followPeoples: getState().cache.membersFollowing[_member.id]
+    }
+  })
 }
 
 export const getToken = () => async (dispatch: Dispatch) => {
@@ -41,15 +52,21 @@ export const setMyTopics = (topics: V2exObject.Topic[]) => ({
   payload: topics
 })
 
-export const interestNode = (node: V2exObject.Node) => ({
-  type: MEMBER_INSEREST_NODE,
-  payload: node
-})
+export const interestNode = (node: V2exObject.Node) => async (dispatch: Dispatch, getState: () => RootState) => {
+  dispatch({
+    type: MEMBER_INSEREST_NODE,
+    payload: node
+  })
+  dispatch(cacheMemberInterestNodes(getState().member.interestNodes))
+}
 
-export const unInterestNode = (node: V2exObject.Node) => ({
-  type: MEMBER_UNINTEREST_NODE,
-  payload: node
-})
+export const unInterestNode = (node: V2exObject.Node) => async (dispatch: Dispatch, getState: () => RootState) => {
+  dispatch({
+    type: MEMBER_UNINTEREST_NODE,
+    payload: node
+  })
+  dispatch(cacheMemberInterestNodes(getState().member.interestNodes))
+}
 
 export const setCurrentToken = (token?: V2exObject.MToken) => ({
   type: APP_AUTH,
@@ -60,14 +77,14 @@ export const loginByToken = (token: string) => async (dispatch: Dispatch) => {
   try {
     dispatch({ type: APP_AUTH_LOADING })
     const token_info = await v2exLib.member.token(token)
-    loginByTokenSuccess(dispatch, token_info)
+    dispatch(loginByTokenSuccess(token_info) as any)
   } catch (e: any) {
     logError(e)
     loginByTokenFail(dispatch, e.message)
   }
 }
 
-const loginByTokenSuccess = async (dispatch: Dispatch, token: V2exObject.MToken) => {
+const loginByTokenSuccess = (token: V2exObject.MToken) => async (dispatch: Dispatch, getState: () => RootState) => {
   await AsyncStorage.setItem(MEMBER_TOKEN_KEY, token.token)
 
   v2exLib.setToken(token.token)

src/actions/RestActions.ts

@@ -8,11 +8,12 @@ import { MEMBER_TOKEN_KEY } from '@src/config/constants'
 import { APP_INIT, APP_SITE_STAT, APP_INIT_ERROR, APP_SITE_INFO, APP_ALL_NODE_INFO, IState } from '../types'
 import { logError } from '@src/helper/logger'
 import DeviceInfo from 'react-native-device-info'
+import { RootState } from '@src/store'
 
 export const initV2ex = () => {
   v2exLib.setOptions(v2exOptions)
 
-  return async (dispatch: Dispatch, _getState: () => IState.AppState) => {
+  return async (dispatch: Dispatch, _getState: () => RootState) => {
     try {
       v2exLib.init()
 

src/actions/types.ts

@@ -23,6 +23,7 @@ export const MEMBER_READ_TOPIC = 'read_topic'
 export const MEMBER_TOPICS = 'member_topics'
 export const MEMBER_INSEREST_NODE = 'member_interest_node'
 export const MEMBER_UNINTEREST_NODE = 'member_uninterest_node'
+export const MEMBER_SATE_SETTING = 'member_state_setting'
 
 export const FEEDBACKING = 'feedbacking'
 export const FEEDBACK_DONE = 'feedback_done'
@@ -45,14 +46,19 @@ export const APP_NODE_LOAD_ERROR = 'v2ex_node_error'
 
 export const APP_CACHE_ADD_MEMBER = 'v2ex_cache_add_member'
 export const APP_CACHE_ADD_NODE = 'v2ex_cache_add_node'
+export const APP_CACHE_MEMBER_INTEREST_NODES = 'v2ex_cache_member_interest_nodes'
+export const APP_CACHE_MEMBER_FOLLOWING = 'v2ex_cache_member_following'
 export const APP_CACHE_RESET_MEMBERS = 'v2ex_cache_reset_member'
 export const APP_CACHE_RESET_NODES = 'v2ex_cache_reset_node'
 export const APP_CACHE_RESET = 'v2ex_cache_reset'
 
 export const ActionTypes = {
   MEMBER_INSEREST_NODE,
+  APP_CACHE_MEMBER_INTEREST_NODES,
   MEMBER_UNINTEREST_NODE,
+  APP_CACHE_MEMBER_FOLLOWING,
   MEMBER_TOPICS,
+  MEMBER_SATE_SETTING,
   APP_CACHE_RESET,
   APP_CACHE_RESET_MEMBERS,
   APP_CACHE_RESET_NODES,

src/i18n/locales/en.json

@@ -156,6 +156,7 @@
     "noTopics": "No Topics.",
     "noReplies": "No Replies.",
     "noNodes": "No Nodes.",
+    "noInterestNodes": "No interest node yet.",
     "noData": "No Data.",
     "noUser": "No User.",
     "noNode": "No Node.",

src/i18n/locales/zh.json

@@ -156,6 +156,7 @@
     "noTopics": "还没有任何主题.",
     "noReplies": "还没有任何回复.",
     "noNodes": "还没有任何节点.",
+    "noInterestNodes": "还没有收藏节点.",
     "noData": "没有数据",
     "noUser": "用户不存在",
     "noNode": "节点不存在",

src/reducers/CacheReducer.ts

@@ -2,19 +2,29 @@ import {
   Action,
   APP_CACHE_ADD_MEMBER,
   APP_CACHE_ADD_NODE,
+  APP_CACHE_MEMBER_FOLLOWING,
+  APP_CACHE_MEMBER_INTEREST_NODES,
   APP_CACHE_RESET,
   APP_CACHE_RESET_MEMBERS,
   APP_CACHE_RESET_NODES,
-  IState
+  APP_LOGOUT,
+  IState,
+  MEMBER_PROFILE
 } from '../types'
 
 const INITIAL_STATE: IState.CacheState = {
   members: [],
-  nodes: []
+  nodes: [],
+  membersFollowing: { 0: undefined },
+  membersInterestNodes: { 0: undefined }
 }
 
 export default (state: IState.CacheState = INITIAL_STATE, action: Action): IState.CacheState => {
   switch (action.type) {
+    case MEMBER_PROFILE:
+      return { ...state, currentSessionMember: action.payload }
+    case APP_LOGOUT:
+      return { ...state, currentSessionMember: undefined }
     case APP_CACHE_ADD_MEMBER:
       const members = state.members
         .filter((v) => v.info.id !== action.payload.id)
@@ -25,6 +35,12 @@ export default (state: IState.CacheState = INITIAL_STATE, action: Action): IStat
         .filter((v) => v.info.name !== action.payload.name)
         .concat([{ pullTime: new Date().getTime(), info: action.payload }])
       return { ...state, nodes }
+    case APP_CACHE_MEMBER_INTEREST_NODES:
+      state.membersInterestNodes[state.currentSessionMember?.id ?? 0] = action.payload
+      return { ...state }
+    case APP_CACHE_MEMBER_FOLLOWING:
+      state.membersFollowing[state.currentSessionMember?.id ?? 0] = action.payload
+      return { ...state }
     case APP_CACHE_RESET_MEMBERS:
       return { ...state, members: [] }
     case APP_CACHE_RESET_NODES:

src/reducers/MemberReducer.ts

@@ -8,7 +8,8 @@ import {
   MEMBER_READ_TOPIC,
   MEMBER_TOPICS,
   MEMBER_INSEREST_NODE,
-  MEMBER_UNINTEREST_NODE
+  MEMBER_UNINTEREST_NODE,
+  MEMBER_SATE_SETTING
 } from '../types'
 const INITIAL_STATE: IState.MemberState = {
   refreshing: false,
@@ -29,6 +30,8 @@ export default (state: IState.MemberState = INITIAL_STATE, action: Action): ISta
         ...state,
         interestNodes: state.interestNodes.filter((v) => v.id !== action.payload.id)
       }
+    case MEMBER_SATE_SETTING:
+      return { ...state, ...action.payload }
     case MEMBER_TOPICS:
       return { ...state, topics: action.payload }
     case APP_AUTH:

src/screens/components/button/header/LikeNode.tsx

@@ -42,9 +42,9 @@ const LikeNodeHeaderButton = ({
       NavigationService.navigate(ROUTES.SignIn)
     } else {
       if (isInterest) {
-        dispatch(unInterestNode(node))
+        dispatch(unInterestNode(node) as any)
       } else {
-        dispatch(interestNode(node))
+        dispatch(interestNode(node) as any)
       }
     }
   }

src/screens/login/SignIn.tsx

@@ -163,7 +163,7 @@ const styles = {
     flex: 1,
     width: theme.dimens.defaultButtonWidth,
     backgroundColor: theme.colors.transparent,
-    paddingTop: theme.dimens.WINDOW_HEIGHT / 5,
+    paddingTop: theme.dimens.WINDOW_HEIGHT / 3,
     alignSelf: 'center',
     flexDirection: 'column',
     justifyContent: 'flex-start',
@@ -199,7 +199,7 @@ const styles = {
   }),
   footer: (theme: ITheme): ViewStyle => ({
     width: '80%',
-    marginBottom: theme.spacing.medium,
+    marginBottom: theme.spacing.large,
     flexDirection: 'row',
     alignItems: 'center',
     justifyContent: 'center',