Add menu row loading state

src/components/Menu/Row.tsx

@@ -1,18 +1,22 @@
-import React from 'react'
-import { Pressable, StyleSheet, Text, View } from 'react-native'
 import { Feather } from '@expo/vector-icons'
-import { useTheme } from '@utils/styles/ThemeManager'
-
-import { ColorDefinitions } from '@utils/styles/themes'
 import { StyleConstants } from '@utils/styles/constants'
+import { useTheme } from '@utils/styles/ThemeManager'
+import { ColorDefinitions } from '@utils/styles/themes'
+import React, { useMemo } from 'react'
+import { Pressable, StyleSheet, Text, View } from 'react-native'
+import { Chase } from 'react-native-animated-spinkit'
 
 export interface Props {
   iconFront?: any
   iconFrontColor?: ColorDefinitions
+
   title: string
   content?: string
+
   iconBack?: 'chevron-right' | 'check'
   iconBackColor?: ColorDefinitions
+
+  loading?: boolean
   onPress?: () => void
 }
 
@@ -22,12 +26,25 @@ const Core: React.FC<Props> = ({
   title,
   content,
   iconBack,
-  iconBackColor
+  iconBackColor,
+  loading = false
 }) => {
   const { theme } = useTheme()
   iconFrontColor = iconFrontColor || 'primary'
   iconBackColor = iconBackColor || 'secondary'
 
+  const loadingSpinkit = useMemo(
+    () => (
+      <View style={{ position: 'absolute' }}>
+        <Chase
+          size={StyleConstants.Font.Size.M * 1.25}
+          color={theme.secondary}
+        />
+      </View>
+    ),
+    [theme]
+  )
+
   return (
     <View style={styles.core}>
       <View style={styles.front}>
@@ -46,20 +63,32 @@ const Core: React.FC<Props> = ({
       {(content || iconBack) && (
         <View style={styles.back}>
           {content && content.length ? (
-            <Text
+            <>
-              style={[styles.content, { color: theme.secondary }]}
+              <Text
-              numberOfLines={1}
+                style={[
-            >
+                  styles.content,
-              {content}
+                  {
-            </Text>
+                    color: theme.secondary,
+                    opacity: !iconBack && loading ? 0 : 1
+                  }
+                ]}
+                numberOfLines={1}
+              >
+                {content}
+              </Text>
+              {loading && !iconBack && loadingSpinkit}
+            </>
           ) : null}
           {iconBack && (
-            <Feather
+            <>
-              name={iconBack}
+              <Feather
-              size={StyleConstants.Font.Size.M + 2}
+                name={iconBack}
-              color={theme[iconBackColor]}
+                size={StyleConstants.Font.Size.M + 2}
-              style={styles.iconBack}
+                color={theme[iconBackColor]}
-            />
+                style={[styles.iconBack, { opacity: loading ? 0 : 1 }]}
+              />
+              {loading && loadingSpinkit}
+            </>
           )}
         </View>
       )}
@@ -68,16 +97,13 @@ const Core: React.FC<Props> = ({
 }
 
 const MenuRow: React.FC<Props> = ({ ...props }) => {
-  const { theme } = useTheme()
+  return (
-
+    <Pressable
-  return props.onPress ? (
+      style={styles.base}
-    <Pressable style={styles.base} onPress={props.onPress}>
+      {...(!props.loading && props.onPress && { onPress: props.onPress })}
+    >
       <Core {...props} />
     </Pressable>
-  ) : (
-    <View style={styles.base}>
-      <Core {...props} />
-    </View>
   )
 }
 
@@ -119,8 +145,4 @@ const styles = StyleSheet.create({
   }
 })
 
-export default React.memo(MenuRow, (prev, next) => {
+export default MenuRow
-  let skipUpdate = true
-  skipUpdate = prev.content === next.content
-  return skipUpdate
-})

src/screens/Me/Root/Collections.tsx

@@ -11,7 +11,7 @@ const Collections: React.FC = () => {
   const navigation = useNavigation()
 
   const queryKey = ['Announcements', { showAll: true }]
-  const { data } = useQuery(queryKey, announcementFetch)
+  const { data, isFetching } = useQuery(queryKey, announcementFetch)
 
   const announcementContent = useMemo(() => {
     if (data) {
@@ -55,6 +55,7 @@ const Collections: React.FC = () => {
         iconBack='chevron-right'
         title={t('content.collections.announcements')}
         content={announcementContent}
+        loading={isFetching}
         onPress={() =>
           data &&
           data.length &&

src/screens/Me/Settings.tsx

@@ -26,9 +26,7 @@ const ScreenMeSettings: React.FC = () => {
 
   const [cacheSize, setCacheSize] = useState<number>()
   useEffect(() => {
-    const getCacheSize = async () =>
+    CacheManager.getCacheSize().then(size => setCacheSize(size))
-      setCacheSize(await CacheManager.getCacheSize())
-    getCacheSize()
   }, [])
 
   return (
@@ -127,7 +125,7 @@ const ScreenMeSettings: React.FC = () => {
       <MenuContainer>
         <MenuRow
           title={t('content.cache.heading')}
-          content={cacheSize ? prettyBytes(cacheSize) : undefined}
+          content={cacheSize ? prettyBytes(cacheSize) : '暂无缓存'}
           iconBack='chevron-right'
           onPress={async () => {
             await CacheManager.clearCache()