feat: ui & logo optimization

App.tsx

@@ -31,7 +31,7 @@ import './utils/dayjsPlugins'
 import {
   asyncStoragePersister,
   queryClient,
-  resetInfiniteQueriesWithHugeData,
+  removeUnnecessaryPages,
 } from './utils/query'
 import tw from './utils/tw'
 
@@ -62,7 +62,7 @@ function App() {
             persister: asyncStoragePersister,
           }}
           onSuccess={() => {
-            resetInfiniteQueriesWithHugeData()
+            removeUnnecessaryPages()
             isReadyNavigation.then(SplashScreen.hideAsync)
           }}
         >

components/StyledImage.tsx

@@ -38,7 +38,9 @@ function CustomImage({ style, source, onLoad, onError, ...props }: ImageProps) {
   const hasPassedSize = isStyle(style) && hasSize(style)
 
   const isMiniImage =
-    isStyle(size) && hasSize(size) ? size.width < 50 && size.height < 50 : false
+    isStyle(size) && hasSize(size)
+      ? size.width < 100 && size.height < 100
+      : false
 
   return (
     <FastImage

navigation/index.tsx

@@ -222,13 +222,13 @@ const Drawer = createDrawerNavigator()
 function DrawerNavigator() {
   return (
     <Drawer.Navigator
-      initialRouteName="HomeScreen"
+      initialRouteName="Home"
       drawerContent={() => <Profile />}
       screenOptions={{
         headerShown: false,
       }}
     >
-      <Drawer.Screen name="HomeScreen" component={HomeScreen} />
+      <Drawer.Screen name="Home" component={HomeScreen} />
     </Drawer.Navigator>
   )
 }

navigation/navigationRef.tsx

@@ -3,7 +3,6 @@ import {
   createNavigationContainerRef,
 } from '@react-navigation/native'
 import { NativeStackNavigationProp } from '@react-navigation/native-stack'
-import { isFunction } from 'lodash-es'
 
 import { RootStackParamList } from '../types'
 
@@ -33,8 +32,7 @@ export function getNavigation() {
   return navigation
 }
 
-export function getCurrentRouteName(): string {
+export function getCurrentRouteName(): keyof RootStackParamList {
   // @ts-ignore
-  const getCurrentRoute: any = getNavigation()?.getCurrentRoute
-  return isFunction(getCurrentRoute) ? getCurrentRoute()?.name : undefined
+  return getNavigation()?.getCurrentRoute?.()?.name
 }

package.json

@@ -20,7 +20,7 @@
     "@react-navigation/native": "^6.0.13",
     "@react-navigation/native-stack": "^6.9.1",
     "@tanstack/query-async-storage-persister": "^5.0.0-alpha.19",
-    "@tanstack/react-query": "^5.0.0-alpha.19",
+    "@tanstack/react-query": "^5.0.0-alpha.35",
     "@tanstack/react-query-persist-client": "^5.0.0-alpha.19",
     "@types/spark-md5": "^3.0.2",
     "axios": "^0.27.2",
@@ -30,15 +30,15 @@
     "expo-blur": "~12.2.2",
     "expo-clipboard": "~4.1.2",
     "expo-constants": "~14.2.1",
-    "expo-dev-client": "~2.1.6",
+    "expo-dev-client": "~2.2.1",
     "expo-device": "~5.2.1",
     "expo-file-system": "~15.2.2",
     "expo-font": "~11.1.1",
     "expo-image-picker": "~14.1.1",
     "expo-linking": "~4.0.1",
     "expo-media-library": "~15.2.3",
     "expo-sharing": "~11.2.2",
-    "expo-splash-screen": "~0.18.1",
+    "expo-splash-screen": "~0.18.2",
     "expo-status-bar": "~1.4.4",
     "expo-updates": "~0.16.4",
     "highlight.js": "^11.6.0",
@@ -50,7 +50,7 @@
     "react-dom": "18.2.0",
     "react-error-boundary": "^3.1.4",
     "react-hook-form": "^7.39.4",
-    "react-native": "0.71.7",
+    "react-native": "0.71.8",
     "react-native-bouncy-checkbox": "^3.0.6",
     "react-native-drag-sort": "^2.4.4",
     "react-native-fast-image": "^8.6.3",
@@ -66,7 +66,7 @@
     "react-native-toast-message": "^2.1.6",
     "react-native-webview": "11.26.0",
     "react-native-youtube-iframe": "^2.2.2",
-    "react-query-kit": "^1.4.4",
+    "react-query-kit": "^1.4.5",
     "rn-placeholder": "^3.0.3",
     "spark-md5": "^3.0.2",
     "twrnc": "^3.6.0",

screens/HomeScreen.tsx

@@ -39,11 +39,12 @@ import { fontScaleAtom, getFontSize } from '@/jotai/fontSacleAtom'
 import { homeTabIndexAtom, homeTabsAtom } from '@/jotai/homeTabsAtom'
 import { profileAtom } from '@/jotai/profileAtom'
 import { colorSchemeAtom } from '@/jotai/themeAtom'
+import { getCurrentRouteName } from '@/navigation/navigationRef'
 import { useRecentTopics, useTabTopics } from '@/servicies/topic'
 import { Topic } from '@/servicies/types'
 import { RootStackParamList } from '@/types'
 import { isSignined } from '@/utils/authentication'
-import { queryClient, resetInfiniteQueriesWithHugeData } from '@/utils/query'
+import { queryClient, removeUnnecessaryPages } from '@/utils/query'
 import tw from '@/utils/tw'
 import { useRefreshByUser } from '@/utils/useRefreshByUser'
 
@@ -124,7 +125,7 @@ function HomeScreen() {
       errorResetMap[tab]?.()
     } else if (query?.getObserversCount() && query?.isStale()) {
       if (tab === 'recent') {
-        resetInfiniteQueriesWithHugeData(useRecentTopics.getKey())
+        removeUnnecessaryPages(useRecentTopics.getKey())
       }
       queryClient.refetchQueries({ queryKey: activeKey })
     }
@@ -203,13 +204,13 @@ function HomeScreen() {
                 onPress={() => {
                   navigation.navigate('SortTabs')
                 }}
-                style={tw`h-full flex-row items-center justify-center z-50 bg-body-1`}
+                style={tw`h-full flex-row items-center justify-center z-50`}
               >
                 <Feather
                   name="menu"
                   size={17}
                   color={tw.color(`text-tint-secondary`)}
-                  style={tw`-mt-1 pr-4 pl-1`}
+                  style={tw`pr-4 pl-2`}
                 />
               </TouchableOpacity>
             </View>
@@ -238,7 +239,7 @@ function RecentTopics({
     isFetching,
   } = useRecentTopics({
     suspense: true,
-    refetchOnWindowFocus: isActive,
+    refetchOnWindowFocus: () => isActive && getCurrentRouteName() === 'Home',
   })
 
   const { isRefetchingByUser, refetchByUser } = useRefreshByUser(refetch)
@@ -303,7 +304,7 @@ function TabTopics({
   const { data, refetch, isFetching } = useTabTopics({
     variables: { tab },
     suspense: true,
-    refetchOnWindowFocus: isActive,
+    refetchOnWindowFocus: () => isActive && getCurrentRouteName() === 'Home',
   })
 
   const { isRefetchingByUser, refetchByUser } = useRefreshByUser(refetch)

screens/MemberDetailScreen.tsx

@@ -63,11 +63,11 @@ import {
 import { Member, Reply, Topic } from '@/servicies/types'
 import { RootStackParamList } from '@/types'
 import { isMe, isSignined } from '@/utils/authentication'
-import { queryClient, resetInfiniteQueriesWithHugeData } from '@/utils/query'
+import { queryClient, removeUnnecessaryPages } from '@/utils/query'
 import tw from '@/utils/tw'
 import { useRefreshByUser } from '@/utils/useRefreshByUser'
 
-const TAB_BAR_HEIGHT = 40
+const TAB_BAR_HEIGHT = 53
 const TOP_BAR_BG_CLS = `bg-[rgb(51,51,68)]`
 const TAB_VIEW_MARGIN_TOP = -2
 
@@ -88,10 +88,10 @@ function MemberDetailScreen() {
   const { params } = useRoute<RouteProp<RootStackParamList, 'MemberDetail'>>()
 
   useMemo(() => {
-    resetInfiniteQueriesWithHugeData(
+    removeUnnecessaryPages(
       useMemberTopics.getKey({ username: params.username })
     )
-    resetInfiniteQueriesWithHugeData(
+    removeUnnecessaryPages(
       useMemberReplies.getKey({ username: params.username })
     )
     queryClient.prefetchInfiniteQuery({

screens/MyFollowingScreen.tsx

@@ -11,7 +11,6 @@ import {
 } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import { TabBar, TabView } from 'react-native-tab-view'
-import { inferData } from 'react-query-kit'
 
 import Empty from '@/components/Empty'
 import NavBar, { useNavBarHeight } from '@/components/NavBar'
@@ -31,7 +30,7 @@ import { getFontSize } from '@/jotai/fontSacleAtom'
 import { colorSchemeAtom } from '@/jotai/themeAtom'
 import { useMemberTopics, useMyFollowing } from '@/servicies/member'
 import { Topic } from '@/servicies/types'
-import { queryClient, resetInfiniteQueriesWithHugeData } from '@/utils/query'
+import { removeUnnecessaryPages } from '@/utils/query'
 import tw from '@/utils/tw'
 import { useRefreshByUser } from '@/utils/useRefreshByUser'
 
@@ -83,16 +82,8 @@ const MemoMemberTopics = withQuerySuspense(memo(MemberTopics), {
 
 function MyFollowingScreen() {
   useMemo(() => {
-    resetInfiniteQueriesWithHugeData(useMyFollowing.getKey())
-    queryClient
-      .getQueryData<inferData<typeof useMyFollowing>>(useMyFollowing.getKey())
-      ?.pages?.[0]?.following.forEach(member => {
-        resetInfiniteQueriesWithHugeData(
-          useMemberTopics.getKey({
-            username: member.username,
-          })
-        )
-      })
+    removeUnnecessaryPages(useMyFollowing.getKey())
+    removeUnnecessaryPages(useMemberTopics.getKey())
   }, [])
 
   const { data } = useMyFollowing({

screens/MyTopicsScreen.tsx

@@ -19,7 +19,7 @@ import TopicItem from '@/components/topic/TopicItem'
 import { colorSchemeAtom } from '@/jotai/themeAtom'
 import { useMyTopics } from '@/servicies/topic'
 import { Topic } from '@/servicies/types'
-import { resetInfiniteQueriesWithHugeData } from '@/utils/query'
+import { removeUnnecessaryPages } from '@/utils/query'
 import tw from '@/utils/tw'
 import { useRefreshByUser } from '@/utils/useRefreshByUser'
 
@@ -40,7 +40,7 @@ export default withQuerySuspense(MyTopicsScreen, {
 
 function MyTopicsScreen() {
   useMemo(() => {
-    resetInfiniteQueriesWithHugeData(useMyTopics.getKey())
+    removeUnnecessaryPages(useMyTopics.getKey())
   }, [])
 
   const {

screens/NodeTopicsScreen.tsx

@@ -29,7 +29,7 @@ import { useLikeNode, useNodeTopics, useNodes } from '@/servicies/node'
 import { Topic } from '@/servicies/types'
 import { RootStackParamList } from '@/types'
 import { isSignined } from '@/utils/authentication'
-import { queryClient, resetInfiniteQueriesWithHugeData } from '@/utils/query'
+import { queryClient, removeUnnecessaryPages } from '@/utils/query'
 import tw from '@/utils/tw'
 import { useRefreshByUser } from '@/utils/useRefreshByUser'
 
@@ -67,9 +67,7 @@ function NodeTopicsScreen() {
   const { params } = useRoute<RouteProp<RootStackParamList, 'NodeTopics'>>()
 
   useMemo(() => {
-    resetInfiniteQueriesWithHugeData(
-      useNodeTopics.getKey({ name: params.name })
-    )
+    removeUnnecessaryPages(useNodeTopics.getKey({ name: params.name }))
   }, [params.name])
 
   const { data, refetch, hasNextPage, fetchNextPage, isFetchingNextPage } =

screens/NotificationsScreen.tsx

@@ -31,7 +31,7 @@ import { Notice } from '@/servicies/types'
 import { RootStackParamList } from '@/types'
 import { isSignined } from '@/utils/authentication'
 import { confirm } from '@/utils/confirm'
-import { queryClient, resetInfiniteQueriesWithHugeData } from '@/utils/query'
+import { queryClient, removeUnnecessaryPages } from '@/utils/query'
 import tw from '@/utils/tw'
 import { useRefreshByUser } from '@/utils/useRefreshByUser'
 
@@ -52,7 +52,7 @@ export default withQuerySuspense(NotificationsScreen, {
 
 function NotificationsScreen() {
   useMemo(() => {
-    resetInfiniteQueriesWithHugeData(useNotifications.getKey())
+    removeUnnecessaryPages(useNotifications.getKey())
   }, [])
 
   const {

screens/RelatedRepliesScreen.tsx

@@ -196,7 +196,6 @@ export default function RelatedRepliesScreen() {
                             : tw`text-tint-secondary font-medium`
                         )}
                         numberOfLines={1}
-                        ellipsizeMode="clip"
                       >
                         {route.title}
                       </Text>

screens/SearchScreen.tsx

@@ -37,7 +37,7 @@ import { useSov2ex } from '@/servicies/sov2ex'
 import { useTopicDetail } from '@/servicies/topic'
 import { Member, Node, Sov2exResult } from '@/servicies/types'
 import { RootStackParamList } from '@/types'
-import { resetInfiniteQueriesWithHugeData } from '@/utils/query'
+import { removeUnnecessaryPages } from '@/utils/query'
 import tw from '@/utils/tw'
 import { useRefreshByUser } from '@/utils/useRefreshByUser'
 
@@ -202,7 +202,7 @@ function SoV2exList({
   )
 
   useMemo(() => {
-    resetInfiniteQueriesWithHugeData(useSov2ex.getKey(variables))
+    removeUnnecessaryPages(useSov2ex.getKey(variables))
   }, [variables])
 
   const { data, refetch, hasNextPage, fetchNextPage, isFetchingNextPage } =

screens/TopicDetailScreen.tsx

@@ -32,7 +32,7 @@ import { useTopicDetail } from '@/servicies/topic'
 import { Reply } from '@/servicies/types'
 import { RootStackParamList } from '@/types'
 import { isMe } from '@/utils/authentication'
-import { resetInfiniteQueriesWithHugeData } from '@/utils/query'
+import { removeUnnecessaryPages } from '@/utils/query'
 import tw from '@/utils/tw'
 import { useRefreshByUser } from '@/utils/useRefreshByUser'
 
@@ -61,7 +61,7 @@ function TopicDetailScreen() {
   const { params } = useRoute<RouteProp<RootStackParamList, 'TopicDetail'>>()
 
   useMemo(() => {
-    resetInfiniteQueriesWithHugeData(useTopicDetail.getKey({ id: params.id }))
+    removeUnnecessaryPages(useTopicDetail.getKey({ id: params.id }))
   }, [params.id])
 
   const {

store.config.json

@@ -7,7 +7,7 @@
     },
     "info": {
       "zh-Hans": {
-        "title": "v2ex-native"
+        "title": "v2fun"
       }
     },
     "advisory": {

types.tsx

@@ -20,6 +20,7 @@ declare module 'axios' {
 
 export type RootStackParamList = {
   Root: undefined
+  Home: undefined
   SortTabs: undefined
   NotFound: undefined
   MyNodes: undefined

utils/query.ts

@@ -25,7 +25,7 @@ AppState.addEventListener('change', status => {
   }
 })
 
-export function resetInfiniteQueriesWithHugeData(queryKey?: unknown[]) {
+export function removeUnnecessaryPages(queryKey?: unknown[]) {
   queryClient
     .getQueryCache()
     .findAll({ queryKey })

utils/request/index.ts

@@ -33,6 +33,11 @@ request.interceptors.response.use(
   },
   error => {
     handle503Error(error)
+    if (error instanceof Error && error.message.includes(`403`)) {
+      const err = new Error('请检查你的代理设置')
+      err.name = '请求失败'
+      return Promise.reject(err)
+    }
     return Promise.reject(error)
   }
 )
@@ -72,7 +77,7 @@ function updateStoreWithData(data: any) {
 
       store.set(profileAtom, prev => {
         if (
-          getCurrentRouteName() !== 'HomeScreen' &&
+          getCurrentRouteName() !== 'Home' &&
           store.get(enabledMsgPushAtom) &&
           newProfile.my_notification !== prev?.my_notification &&
           isInteger(newProfile.my_notification) &&