修改icon导出方式

src/components/OnlineList/ListItem.js

@@ -5,7 +5,7 @@ import Button from '@/components/common/Button'
 import Badge from '@/components/common/Badge'
 import { BorderWidths } from '@/theme'
 import { useTranslation } from '@/plugins/i18n'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 
 const useQualityTag = musicInfo => {
   const { t } = useTranslation()

src/components/common/ChoosePath/components/Header.js

@@ -1,7 +1,7 @@
 import React, { useCallback, memo, useRef, useState } from 'react'
 import { StyleSheet, View, Text, TouchableOpacity, StatusBar, InteractionManager } from 'react-native'
 import { useGetter } from '@/store'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import Input from '@/components/common/Input'
 import ConfirmAlert from '@/components/common/ConfirmAlert'
 import { useTranslation } from '@/plugins/i18n'

src/components/common/ChoosePath/components/ListItem.js

@@ -2,7 +2,7 @@ import React, { useCallback, memo, useRef } from 'react'
 import { StyleSheet, View, Text, TouchableOpacity } from 'react-native'
 import { useGetter } from '@/store'
 import { BorderWidths } from '@/theme'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 
 
 export default memo(({ item, onPress }) => {

src/components/common/Dialog.js

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react'
 import { StyleSheet, View, Text, TouchableHighlight } from 'react-native'
 
 import Modal from './Modal'
-import Icon from './Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter } from '@/store'
 import { useKeyboard } from '@/utils/hooks'
 

src/components/common/Icon.js

@@ -1,7 +1,41 @@
 import { createIconSetFromIcoMoon } from 'react-native-vector-icons'
 import icoMoonConfig from '@/resources/fonts/selection.json'
 
+// import IconAntDesign from 'react-native-vector-icons/AntDesign'
+// import IconEntypo from 'react-native-vector-icons/Entypo'
+// import IconEvilIcons from 'react-native-vector-icons/EvilIcons'
+// import IconFeather from 'react-native-vector-icons/Feather'
+// import IconFontAwesome from 'react-native-vector-icons/FontAwesome'
+// import IconFontAwesome5 from 'react-native-vector-icons/FontAwesome5'
+// import IconFontisto from 'react-native-vector-icons/Fontisto'
+// import IconFoundation from 'react-native-vector-icons/Foundation'
+// import IconIonicons from 'react-native-vector-icons/Ionicons'
+// import IconMaterialIcons from 'react-native-vector-icons/MaterialIcons'
+// import IconMaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons'
+// import IconOcticons from 'react-native-vector-icons/Octicons'
+// import IconZocial from 'react-native-vector-icons/Zocial'
+// import IconSimpleLineIcons from 'react-native-vector-icons/SimpleLineIcons'
+
+
 const Icon = createIconSetFromIcoMoon(icoMoonConfig)
 
-export default Icon
+// https://oblador.github.io/react-native-vector-icons/
 
+export {
+  Icon,
+
+  // IconAntDesign,
+  // IconEntypo,
+  // IconEvilIcons,
+  // IconFeather,
+  // IconFontAwesome,
+  // IconFontAwesome5,
+  // IconFontisto,
+  // IconFoundation,
+  // IconIonicons,
+  // IconMaterialIcons,
+  // IconMaterialCommunityIcons,
+  // IconOcticons,
+  // IconZocial,
+  // IconSimpleLineIcons,
+}

src/components/common/Input.js

@@ -1,6 +1,6 @@
 import React, { useRef, useImperativeHandle, forwardRef, useCallback } from 'react'
 import { TextInput, StyleSheet, View, TouchableOpacity } from 'react-native'
-import Icon from './Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter } from '@/store'
 
 const Input = ({ onChangeText, onClearText, clearBtn, ...props }, ref) => {

src/components/common/Popup.js

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react'
 import { StyleSheet, View, Text, TouchableOpacity, StatusBar } from 'react-native'
 
 import Modal from './Modal'
-import Icon from './Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter } from '@/store'
 import { useKeyboard } from '@/utils/hooks'
 

src/screens/Comment/components/CommentFloor.js

@@ -3,7 +3,7 @@ import { View, Text, StyleSheet, Image } from 'react-native'
 import { useGetter, useDispatch } from '@/store'
 import { BorderWidths } from '@/theme'
 import defaultUser from '@/resources/images/defaultUser.jpg'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 
 const GAP = 12
 

src/screens/Comment/components/Header.js

@@ -2,7 +2,7 @@ import React, { memo } from 'react'
 
 import { View, StyleSheet, StatusBar, TouchableOpacity, Text } from 'react-native'
 
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import { pop } from '@/navigation'
 import { useTranslation } from '@/plugins/i18n'

src/screens/Comment/index.js

@@ -4,7 +4,7 @@ import PagerView from 'react-native-pager-view'
 import Header from './components/Header'
 import { useTranslation } from '@/plugins/i18n'
 import { useGetter, useDispatch } from '@/store'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import CommentHot from './CommentHot'
 import CommentNew from './CommentNew'
 import { toast } from '@/utils/tools'

src/screens/Home/List/components/ListItem.js

@@ -5,7 +5,7 @@ import { BorderWidths } from '@/theme'
 import { useAssertApiSupport } from '@/utils/hooks'
 import { useGetter, useDispatch } from '@/store'
 import Button from '@/components/common/Button'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 
 export default memo(({ item, index, activeIndex, onPress, showMenu, handleLongPress, selectedList }) => {
   const theme = useGetter('common', 'theme')

src/screens/Home/List/components/MyList.js

@@ -4,7 +4,7 @@ import { StyleSheet, Text, View, TouchableOpacity, ScrollView, InteractionManage
 import { useGetter, useDispatch } from '@/store'
 import { useTranslation } from '@/plugins/i18n'
 // import DorpDownPanel from '@/components/common/DorpDownPanel'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 // import Button from '@/components/common/Button'
 import { BorderWidths } from '@/theme'
 import Menu from '@/components/common/Menu'

src/screens/Home/Setting/Sync/History.js

@@ -2,7 +2,7 @@ import React, { memo, useRef, useState, useEffect, useCallback } from 'react'
 import { StyleSheet, View, Text, TouchableOpacity, ScrollView } from 'react-native'
 import { useGetter } from '@/store'
 // import { gzip, ungzip } from 'pako'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 
 import Button from '../components/Button'
 import { useTranslation } from '@/plugins/i18n'

src/screens/Home/SongList/OpenList.js

@@ -1,6 +1,6 @@
 import React, { useCallback, memo, useMemo, useEffect, useState, useRef } from 'react'
 import { View, Text, StyleSheet, TouchableOpacity } from 'react-native'
-// import Icon from '@/components/common/Icon'
+// import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import { useTranslation } from '@/plugins/i18n'
 import Button from '@/components/common/Button'

src/screens/Home/components/Aside.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import { View, StyleSheet, ScrollView, Dimensions } from 'react-native'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import Button from '@/components/common/Button'
 
 import { STATUS } from '@/store/modules/player'

src/screens/Home/components/Header.js

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react'
 import { View, Text, StyleSheet, StatusBar, TouchableOpacity } from 'react-native'
 // import Button from '@/components/common/Button'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 // import { navigations } from '@/navigation'
 

src/screens/Home/components/HeaderLandscape.js

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react'
 import { View, Text, StyleSheet, StatusBar, TouchableOpacity } from 'react-native'
 // import Button from '@/components/common/Button'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 // import { navigations } from '@/navigation'
 import { BorderWidths } from '@/theme'

src/screens/Home/components/PlayerLandscape.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import { View, ScrollView, Text, StyleSheet, Image, TouchableOpacity } from 'react-native'
 import Button from '@/components/common/Button'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { AppColors } from '@/theme'
 
 export default ({

src/screens/Home/components/PlayerPortrait/components/ControlBtn.js

@@ -1,6 +1,6 @@
 import React, { useCallback, memo, useMemo, useEffect } from 'react'
 import { Text, StyleSheet, TouchableOpacity } from 'react-native'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import { STATUS } from '@/store/modules/player'
 

src/screens/PlayDetail/Landscape/ControlBtn.js

@@ -1,6 +1,6 @@
 import React, { useCallback, memo, useMemo, useEffect } from 'react'
 import { View, StyleSheet, TouchableOpacity } from 'react-native'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import { STATUS } from '@/store/modules/player'
 import { useDimensions } from '@/utils/hooks'

src/screens/PlayDetail/Landscape/MoreBtn/MusicAddBtn.js

@@ -1,6 +1,6 @@
 import React, { useCallback, memo, useMemo, useEffect, useState, useRef } from 'react'
 import { Text, StyleSheet, TouchableOpacity } from 'react-native'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import MusicAddModal from '@/components/MusicAddModal'
 

src/screens/PlayDetail/Landscape/MoreBtn/PlayModeBtn.js

@@ -1,6 +1,6 @@
 import React, { useCallback, memo, useMemo, useEffect } from 'react'
 import { Text, StyleSheet, TouchableOpacity } from 'react-native'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import { toast } from '@/utils/tools'
 import { useTranslation } from '@/plugins/i18n'

src/screens/PlayDetail/Landscape/MoreBtn/TimeoutExit.js

@@ -1,6 +1,6 @@
 import React, { useCallback, memo, useMemo, useEffect, useState, useRef } from 'react'
 import { Text, StyleSheet, TouchableOpacity, View } from 'react-native'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import ConfirmAlert from '@/components/common/ConfirmAlert'
 import { useTranslation } from '@/plugins/i18n'

src/screens/PlayDetail/Landscape/components/CommentBtn.js

@@ -1,6 +1,6 @@
 import React, { memo } from 'react'
 import { StyleSheet, TouchableOpacity } from 'react-native'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import { navigations } from '@/navigation'
 

src/screens/PlayDetail/Landscape/components/Header.js

@@ -2,7 +2,7 @@ import React, { memo, useState, useCallback } from 'react'
 
 import { View, StyleSheet, StatusBar, TouchableOpacity, Text } from 'react-native'
 
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import { pop } from '@/navigation'
 import Popup from '@/components/common/Popup'

src/screens/PlayDetail/Portrait/Player/components/ControlBtn.js

@@ -1,6 +1,6 @@
 import React, { useCallback, memo, useMemo, useEffect } from 'react'
 import { Text, StyleSheet, TouchableOpacity } from 'react-native'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import { STATUS } from '@/store/modules/player'
 

src/screens/PlayDetail/Portrait/Player/components/MoreBtn/CommentBtn.js

@@ -1,6 +1,6 @@
 import React, { useCallback, memo, useMemo, useEffect, useState, useRef } from 'react'
 import { Text, StyleSheet, TouchableOpacity } from 'react-native'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import { navigations } from '@/navigation'
 

src/screens/PlayDetail/Portrait/Player/components/MoreBtn/MusicAddBtn.js

@@ -1,6 +1,6 @@
 import React, { useCallback, memo, useMemo, useEffect, useState, useRef } from 'react'
 import { Text, StyleSheet, TouchableOpacity } from 'react-native'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import MusicAddModal from '@/components/MusicAddModal'
 

src/screens/PlayDetail/Portrait/Player/components/MoreBtn/PlayModeBtn.js

@@ -1,6 +1,6 @@
 import React, { useCallback, memo, useMemo, useEffect } from 'react'
 import { Text, StyleSheet, TouchableOpacity } from 'react-native'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import { toast } from '@/utils/tools'
 import { useTranslation } from '@/plugins/i18n'

src/screens/PlayDetail/Portrait/Player/components/MoreBtn/TimeoutExit.js

@@ -1,6 +1,6 @@
 import React, { useCallback, memo, useMemo, useEffect, useState, useRef } from 'react'
 import { Text, StyleSheet, TouchableOpacity, View } from 'react-native'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import ConfirmAlert from '@/components/common/ConfirmAlert'
 import { useTranslation } from '@/plugins/i18n'

src/screens/PlayDetail/Portrait/components/Header.js

@@ -2,7 +2,7 @@ import React, { memo, useState, useCallback } from 'react'
 
 import { View, StyleSheet, StatusBar, TouchableOpacity, Text } from 'react-native'
 
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import { pop } from '@/navigation'
 import Popup from '@/components/common/Popup'

src/screens/SonglistDetail/PlayerPortrait/components/ControlBtn.js

@@ -1,6 +1,6 @@
 import React, { useCallback, memo, useMemo, useEffect } from 'react'
 import { Text, StyleSheet, TouchableOpacity } from 'react-native'
-import Icon from '@/components/common/Icon'
+import { Icon } from '@/components/common/Icon'
 import { useGetter, useDispatch } from '@/store'
 import { STATUS } from '@/store/modules/player'