Skip to content

Commit 6ad172c

Browse files
sawyerfsawyerf
committed
Clean contexts
1 parent 63e8379 commit 6ad172c

104 files changed

Lines changed: 464 additions & 450 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/components/Header.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import React from 'react'
22
import { View, Text, StyleSheet } from 'react-native'
33
import { useNavigation } from '@react-navigation/native'
44

5-
import { ThemeContext } from '~/contexts/theme'
5+
import { useTheme } from '~/contexts/theme'
66
import IconButton from '~/components/button/IconButton'
77
import size from '~/styles/size'
88

99
const Header = ({ title, marginBottom = 30 }) => {
1010
const navigation = useNavigation()
11-
const theme = React.useContext(ThemeContext)
11+
const theme = useTheme()
1212

1313
return (
1414
<View style={[styles.header, { marginBottom }]}>

‎app/components/ImageError.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { View, Image } from 'react-native'
33
import Icon from 'react-native-vector-icons/FontAwesome'
44

55
import size from '~/styles/size'
6-
import { ThemeContext } from '~/contexts/theme'
6+
import { useTheme } from '~/contexts/theme'
77

88
const ImageMemo = React.memo(Image, (prevProps, nextProps) => {
99
return prevProps.source?.uri === nextProps.source?.uri
@@ -12,7 +12,7 @@ const ImageMemo = React.memo(Image, (prevProps, nextProps) => {
1212
const ImageError = ({ source, style = {}, children = null, iconError = null, blurRadius = undefined }) => {
1313
const [isImage, setIsImage] = React.useState(false)
1414
const [lastSource, setLastSource] = React.useState({ uri: null })
15-
const theme = React.useContext(ThemeContext)
15+
const theme = useTheme()
1616

1717
React.useEffect(() => {
1818
if (lastSource.uri === source?.uri) return

‎app/components/PresHeader.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import { Text, View, Pressable } from 'react-native'
3-
import { ThemeContext } from '~/contexts/theme'
3+
import { useTheme } from '~/contexts/theme'
44
import { useSafeAreaInsets } from 'react-native-safe-area-context'
55

66
import BackButton from '~/components/button/BackButton'
@@ -10,7 +10,7 @@ import ImageError from '~/components/ImageError'
1010
import IconButton from '~/components/button/IconButton'
1111

1212
const PresHeader = ({ title, subTitle, imgSrc, onPressTitle = null, onPressOption = null, children = null }) => {
13-
const theme = React.useContext(ThemeContext)
13+
const theme = useTheme()
1414
const insets = useSafeAreaInsets()
1515

1616
return (

‎app/components/PresHeaderIcon.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import React from 'react'
22
import { Text, View, StyleSheet } from 'react-native'
33

4-
import { ThemeContext } from '~/contexts/theme'
4+
import { useTheme } from '~/contexts/theme'
55
import { useSafeAreaInsets } from 'react-native-safe-area-context'
66
import BackButton from '~/components/button/BackButton'
77
import Icon from 'react-native-vector-icons/FontAwesome'
88
import IconButton from '~/components/button/IconButton'
99
import presStyles from '~/styles/pres'
1010

1111
const PresHeaderIcon = ({ title, subTitle, icon, onPressOption = null, children = null }) => {
12-
const theme = React.useContext(ThemeContext)
12+
const theme = useTheme()
1313
const insets = useSafeAreaInsets()
1414

1515
return (

‎app/components/SectionTitle.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React from 'react'
22
import { Text, Pressable } from 'react-native'
33
import Icon from 'react-native-vector-icons/FontAwesome'
4-
import { ThemeContext } from '~/contexts/theme'
4+
import { useTheme } from '~/contexts/theme'
55
import mainStyles from '~/styles/main'
66
import size from '~/styles/size'
77

88
const SectionTitle = ({ title, onPress = null, button = false }) => {
9-
const theme = React.useContext(ThemeContext)
9+
const theme = useTheme()
1010

1111
return (
1212
<Pressable

‎app/components/Selector.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React from 'react'
22
import { ScrollView, Pressable, Text } from 'react-native'
3-
import { ThemeContext } from '~/contexts/theme'
3+
import { useTheme } from '~/contexts/theme'
44

55
const Selector = ({ current, items, setData }) => {
6-
const theme = React.useContext(ThemeContext)
6+
const theme = useTheme()
77

88
return (
99
<ScrollView

‎app/components/bar/BottomBar.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context'
44
import { useTranslation } from 'react-i18next'
55
import Icon from 'react-native-vector-icons/FontAwesome'
66

7-
import { ConfigContext } from '~/contexts/config'
8-
import { ThemeContext } from '~/contexts/theme'
7+
import { useConfig } from '~/contexts/config'
8+
import { useTheme } from '~/contexts/theme'
99
import mainStyles from '~/styles/main'
1010
import size from '~/styles/size'
1111
import useKeyboardIsOpen from '~/utils/useKeyboardIsOpen'
1212

1313
const TabItem = ({ route, index, state, descriptors, navigation }) => {
1414
const { t } = useTranslation()
15-
const config = React.useContext(ConfigContext)
16-
const theme = React.useContext(ThemeContext)
15+
const config = useConfig()
16+
const theme = useTheme()
1717

1818
const options = React.useMemo(() => descriptors[route.key].options, [])
1919
const isFocused = React.useMemo(() => state.index === index, [state.index, index])
@@ -64,8 +64,8 @@ const TabItem = ({ route, index, state, descriptors, navigation }) => {
6464

6565
const BottomBar = ({ state, descriptors, navigation }) => {
6666
const insets = useSafeAreaInsets()
67-
const config = React.useContext(ConfigContext)
68-
const theme = React.useContext(ThemeContext)
67+
const config = useConfig()
68+
const theme = useTheme()
6969
const keyboardIsOpen = useKeyboardIsOpen()
7070

7171
if (!config.url) return null

‎app/components/bar/SideBar.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import { useTranslation } from 'react-i18next'
66

77
import { useCachedAndApi } from '~/utils/api'
88
import { urlCover } from '~/utils/url'
9-
import { ConfigContext } from '~/contexts/config'
10-
import { ThemeContext } from '~/contexts/theme'
9+
import { useConfig } from '~/contexts/config'
10+
import { useTheme } from '~/contexts/theme'
1111
import pkg from '~/../package.json'
1212
import size from '~/styles/size'
1313
import mainStyles from '~/styles/main'
1414
import ImageError from '~/components/ImageError'
1515

1616
const FavoritedItem = ({ navigation, t }) => {
17-
const theme = React.useContext(ThemeContext)
17+
const theme = useTheme()
1818
const [isHover, setIsHover] = React.useState(false)
1919

2020
return (
@@ -52,8 +52,8 @@ const FavoritedItem = ({ navigation, t }) => {
5252
}
5353

5454
const PlaylistItem = ({ item, navigation, t }) => {
55-
const config = React.useContext(ConfigContext)
56-
const theme = React.useContext(ThemeContext)
55+
const config = useConfig()
56+
const theme = useTheme()
5757
const [isHover, setIsHover] = React.useState(false)
5858

5959
return (
@@ -99,8 +99,8 @@ const PlaylistItem = ({ item, navigation, t }) => {
9999

100100
const SideBar = ({ state, descriptors, navigation }) => {
101101
const insets = useSafeAreaInsets()
102-
const config = React.useContext(ConfigContext)
103-
const theme = React.useContext(ThemeContext)
102+
const config = useConfig()
103+
const theme = useTheme()
104104
const [hoverIndex, setHoverIndex] = React.useState(-1)
105105
const [refresh, setRefresh] = React.useState(0)
106106
const { t } = useTranslation()

‎app/components/bar/TabBar.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import React from 'react'
22

3-
import { ConfigContext } from '~/contexts/config'
4-
import { SettingsContext } from '~/contexts/settings'
3+
import { useConfig } from '~/contexts/config'
4+
import { useSettings } from '~/contexts/settings'
55
import Player from '~/components/player/Player'
66
import BottomBar from '~/components/bar/BottomBar'
77
import SideBar from '~/components/bar/SideBar'
88

99
const TabBar = ({ state, descriptors, navigation }) => {
10-
const config = React.useContext(ConfigContext)
11-
const settings = React.useContext(SettingsContext)
10+
const config = useConfig()
11+
const settings = useSettings()
1212

1313
React.useEffect(() => {
1414
if (config.query === null) {

‎app/components/button/ConnectButton.native.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import React from 'react'
22
import { ActivityIndicator } from 'react-native'
33

4-
import { ThemeContext } from '~/contexts/theme'
4+
import { useTheme } from '~/contexts/theme'
55
import { useRemote } from '~/contexts/remote'
66
import DiscoveryPanel from '~/components/popup/DiscoveryPanel'
77
import IconButton from '~/components/button/IconButton'
88

99
const ConnectButton = ({ size = 23, color = null, style = {} }) => {
10-
const theme = React.useContext(ThemeContext)
10+
const theme = useTheme()
1111
const remote = useRemote()
1212
const [modalVisible, setModalVisible] = React.useState(false)
1313

0 commit comments

Comments
 (0)