diff --git a/src/components/OnlineList/ListItem.js b/src/components/OnlineList/ListItem.js index 5f3cda1..4235aed 100644 --- a/src/components/OnlineList/ListItem.js +++ b/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() diff --git a/src/components/common/ChoosePath/components/Header.js b/src/components/common/ChoosePath/components/Header.js index dc02c78..3bc6cb7 100644 --- a/src/components/common/ChoosePath/components/Header.js +++ b/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' diff --git a/src/components/common/ChoosePath/components/ListItem.js b/src/components/common/ChoosePath/components/ListItem.js index f75b54b..5afbc79 100644 --- a/src/components/common/ChoosePath/components/ListItem.js +++ b/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 }) => { diff --git a/src/components/common/Dialog.js b/src/components/common/Dialog.js index 9de1cf4..69fc6c1 100644 --- a/src/components/common/Dialog.js +++ b/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' diff --git a/src/components/common/Icon.js b/src/components/common/Icon.js index 43ca456..fcac532 100644 --- a/src/components/common/Icon.js +++ b/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, +} diff --git a/src/components/common/Input.js b/src/components/common/Input.js index 647399c..cc5d6fe 100644 --- a/src/components/common/Input.js +++ b/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) => { diff --git a/src/components/common/Popup.js b/src/components/common/Popup.js index e173ba2..d1ab918 100644 --- a/src/components/common/Popup.js +++ b/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' diff --git a/src/screens/Comment/components/CommentFloor.js b/src/screens/Comment/components/CommentFloor.js index 538b677..2436c9b 100644 --- a/src/screens/Comment/components/CommentFloor.js +++ b/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 diff --git a/src/screens/Comment/components/Header.js b/src/screens/Comment/components/Header.js index b3f3724..86bb1cd 100644 --- a/src/screens/Comment/components/Header.js +++ b/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' diff --git a/src/screens/Comment/index.js b/src/screens/Comment/index.js index 4c13451..ba950d3 100644 --- a/src/screens/Comment/index.js +++ b/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' diff --git a/src/screens/Home/List/components/ListItem.js b/src/screens/Home/List/components/ListItem.js index 0915a8e..d2ab8fc 100644 --- a/src/screens/Home/List/components/ListItem.js +++ b/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') diff --git a/src/screens/Home/List/components/MyList.js b/src/screens/Home/List/components/MyList.js index 6c29cbd..19faf6f 100644 --- a/src/screens/Home/List/components/MyList.js +++ b/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' diff --git a/src/screens/Home/Setting/Sync/History.js b/src/screens/Home/Setting/Sync/History.js index b806473..beb9703 100644 --- a/src/screens/Home/Setting/Sync/History.js +++ b/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' diff --git a/src/screens/Home/SongList/OpenList.js b/src/screens/Home/SongList/OpenList.js index fb8bac9..cdc7f67 100644 --- a/src/screens/Home/SongList/OpenList.js +++ b/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' diff --git a/src/screens/Home/components/Aside.js b/src/screens/Home/components/Aside.js index f25cf6b..a803b7e 100644 --- a/src/screens/Home/components/Aside.js +++ b/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' diff --git a/src/screens/Home/components/Header.js b/src/screens/Home/components/Header.js index faade0f..dfdfaed 100644 --- a/src/screens/Home/components/Header.js +++ b/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' diff --git a/src/screens/Home/components/HeaderLandscape.js b/src/screens/Home/components/HeaderLandscape.js index 0db4f01..02e5eaf 100644 --- a/src/screens/Home/components/HeaderLandscape.js +++ b/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' diff --git a/src/screens/Home/components/PlayerLandscape.js b/src/screens/Home/components/PlayerLandscape.js index 5548506..5c3f911 100644 --- a/src/screens/Home/components/PlayerLandscape.js +++ b/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 ({ diff --git a/src/screens/Home/components/PlayerPortrait/components/ControlBtn.js b/src/screens/Home/components/PlayerPortrait/components/ControlBtn.js index 3d9ddae..df82381 100644 --- a/src/screens/Home/components/PlayerPortrait/components/ControlBtn.js +++ b/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' diff --git a/src/screens/PlayDetail/Landscape/ControlBtn.js b/src/screens/PlayDetail/Landscape/ControlBtn.js index e3d759a..3ae9228 100644 --- a/src/screens/PlayDetail/Landscape/ControlBtn.js +++ b/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' diff --git a/src/screens/PlayDetail/Landscape/MoreBtn/MusicAddBtn.js b/src/screens/PlayDetail/Landscape/MoreBtn/MusicAddBtn.js index cc7dab6..411524f 100644 --- a/src/screens/PlayDetail/Landscape/MoreBtn/MusicAddBtn.js +++ b/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' diff --git a/src/screens/PlayDetail/Landscape/MoreBtn/PlayModeBtn.js b/src/screens/PlayDetail/Landscape/MoreBtn/PlayModeBtn.js index 253c33f..3b808cd 100644 --- a/src/screens/PlayDetail/Landscape/MoreBtn/PlayModeBtn.js +++ b/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' diff --git a/src/screens/PlayDetail/Landscape/MoreBtn/TimeoutExit.js b/src/screens/PlayDetail/Landscape/MoreBtn/TimeoutExit.js index bceb841..b2f57b7 100644 --- a/src/screens/PlayDetail/Landscape/MoreBtn/TimeoutExit.js +++ b/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' diff --git a/src/screens/PlayDetail/Landscape/components/CommentBtn.js b/src/screens/PlayDetail/Landscape/components/CommentBtn.js index f716795..01a82ff 100644 --- a/src/screens/PlayDetail/Landscape/components/CommentBtn.js +++ b/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' diff --git a/src/screens/PlayDetail/Landscape/components/Header.js b/src/screens/PlayDetail/Landscape/components/Header.js index 911b764..dd0a22d 100644 --- a/src/screens/PlayDetail/Landscape/components/Header.js +++ b/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' diff --git a/src/screens/PlayDetail/Portrait/Player/components/ControlBtn.js b/src/screens/PlayDetail/Portrait/Player/components/ControlBtn.js index 932acf8..f6fbea1 100644 --- a/src/screens/PlayDetail/Portrait/Player/components/ControlBtn.js +++ b/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' diff --git a/src/screens/PlayDetail/Portrait/Player/components/MoreBtn/CommentBtn.js b/src/screens/PlayDetail/Portrait/Player/components/MoreBtn/CommentBtn.js index de43c56..586c1b5 100644 --- a/src/screens/PlayDetail/Portrait/Player/components/MoreBtn/CommentBtn.js +++ b/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' diff --git a/src/screens/PlayDetail/Portrait/Player/components/MoreBtn/MusicAddBtn.js b/src/screens/PlayDetail/Portrait/Player/components/MoreBtn/MusicAddBtn.js index 098c312..e8d62fd 100644 --- a/src/screens/PlayDetail/Portrait/Player/components/MoreBtn/MusicAddBtn.js +++ b/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' diff --git a/src/screens/PlayDetail/Portrait/Player/components/MoreBtn/PlayModeBtn.js b/src/screens/PlayDetail/Portrait/Player/components/MoreBtn/PlayModeBtn.js index 63a6d20..b814831 100644 --- a/src/screens/PlayDetail/Portrait/Player/components/MoreBtn/PlayModeBtn.js +++ b/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' diff --git a/src/screens/PlayDetail/Portrait/Player/components/MoreBtn/TimeoutExit.js b/src/screens/PlayDetail/Portrait/Player/components/MoreBtn/TimeoutExit.js index aea89fe..030ba1e 100644 --- a/src/screens/PlayDetail/Portrait/Player/components/MoreBtn/TimeoutExit.js +++ b/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' diff --git a/src/screens/PlayDetail/Portrait/components/Header.js b/src/screens/PlayDetail/Portrait/components/Header.js index 695f76f..9f445de 100644 --- a/src/screens/PlayDetail/Portrait/components/Header.js +++ b/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' diff --git a/src/screens/SonglistDetail/PlayerPortrait/components/ControlBtn.js b/src/screens/SonglistDetail/PlayerPortrait/components/ControlBtn.js index 3d9ddae..df82381 100644 --- a/src/screens/SonglistDetail/PlayerPortrait/components/ControlBtn.js +++ b/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'