diff --git a/babel.config.js b/babel.config.js index 8573d0e..c0851cb 100644 --- a/babel.config.js +++ b/babel.config.js @@ -19,13 +19,7 @@ module.exports = { '.json', ], alias: { - store: './src/store', - components: './src/components', - utility: './src/utility', - screens: './src/screens', - assets: './src/assets', - '@localisation': './src/localisation', - CONSTANTS: './src/CONSTANTS', + '@': './src', } } ], diff --git a/src/components/CoverImage.tsx b/src/components/CoverImage.tsx index 7f9e690..935349a 100644 --- a/src/components/CoverImage.tsx +++ b/src/components/CoverImage.tsx @@ -48,7 +48,7 @@ function CoverImage({ const colorScheme = useColorScheme(); const image = useImage(src || null); - const fallback = useImage(colorScheme === 'light' ? require('assets/images/empty-album-light.png') : require('assets/images/empty-album-dark.png')); + const fallback = useImage(colorScheme === 'light' ? require('@/assets/images/empty-album-light.png') : require('@/assets/images/empty-album-dark.png')); const { canvasSize, imageSize } = useMemo(() => { const imageSize = Screen.width - margin; const canvasSize = imageSize + blurRadius * 2; diff --git a/src/components/DownloadIcon.tsx b/src/components/DownloadIcon.tsx index 732e39a..8e457bb 100644 --- a/src/components/DownloadIcon.tsx +++ b/src/components/DownloadIcon.tsx @@ -1,9 +1,9 @@ import React, { useEffect, useMemo, useRef } from 'react'; import { useTypedSelector } from '@/store'; -import CloudIcon from 'assets/icons/cloud.svg'; -import CloudDownArrow from 'assets/icons/cloud-down-arrow.svg'; -import CloudExclamationMarkIcon from 'assets/icons/cloud-exclamation-mark.svg'; -import InternalDriveIcon from 'assets/icons/internal-drive.svg'; +import CloudIcon from '@/assets/icons/cloud.svg'; +import CloudDownArrow from '@/assets/icons/cloud-down-arrow.svg'; +import CloudExclamationMarkIcon from '@/assets/icons/cloud-exclamation-mark.svg'; +import InternalDriveIcon from '@/assets/icons/internal-drive.svg'; import useDefaultStyles from './Colors'; import { EntityId } from '@reduxjs/toolkit'; import Svg, { Circle, CircleProps } from 'react-native-svg'; diff --git a/src/components/ListButton.tsx b/src/components/ListButton.tsx index 3b48685..5abfc19 100644 --- a/src/components/ListButton.tsx +++ b/src/components/ListButton.tsx @@ -1,6 +1,6 @@ import React, { useCallback, useState } from 'react'; import { TouchableOpacityProps } from 'react-native'; -import ChevronRight from 'assets/icons/chevron-right.svg'; +import ChevronRight from '@/assets/icons/chevron-right.svg'; import styled from 'styled-components/native'; import { THEME_COLOR } from '@/CONSTANTS'; import useDefaultStyles from './Colors'; diff --git a/src/screens/Downloads/index.tsx b/src/screens/Downloads/index.tsx index c8f42fe..b868351 100644 --- a/src/screens/Downloads/index.tsx +++ b/src/screens/Downloads/index.tsx @@ -4,8 +4,8 @@ import { FlatListProps, View } from 'react-native'; import { SafeAreaView } from 'react-native-safe-area-context'; import { useAppDispatch, useTypedSelector } from '@/store'; import formatBytes from '@/utility/formatBytes'; -import TrashIcon from 'assets/icons/trash.svg'; -import ArrowClockwise from 'assets/icons/arrow-clockwise.svg'; +import TrashIcon from '@/assets/icons/trash.svg'; +import ArrowClockwise from '@/assets/icons/arrow-clockwise.svg'; import { EntityId } from '@reduxjs/toolkit'; import { queueTrackForDownload, removeDownloadedTrack } from '@/store/downloads/actions'; import Button from '@/components/Button'; diff --git a/src/screens/Music/index.tsx b/src/screens/Music/index.tsx index 8b2ed80..ef6ffaf 100644 --- a/src/screens/Music/index.tsx +++ b/src/screens/Music/index.tsx @@ -5,7 +5,7 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler'; import { THEME_COLOR } from '@/CONSTANTS'; import { t } from '@/localisation'; import useDefaultStyles, { ColoredBlurView } from '@/components/Colors'; -import { StackParams } from 'screens/types'; +import { StackParams } from '@/screens/types'; import NowPlaying from './overlays/NowPlaying'; import RecentAlbums from './stacks/RecentAlbums'; diff --git a/src/screens/Music/overlays/NowPlaying/index.tsx b/src/screens/Music/overlays/NowPlaying/index.tsx index 6514ca9..0e19134 100644 --- a/src/screens/Music/overlays/NowPlaying/index.tsx +++ b/src/screens/Music/overlays/NowPlaying/index.tsx @@ -3,8 +3,8 @@ import { ActivityIndicator, Animated, Dimensions, Platform, Pressable, View } fr import FastImage from 'react-native-fast-image'; import styled, { css } from 'styled-components/native'; -import PlayIcon from 'assets/icons/play.svg'; -import PauseIcon from 'assets/icons/pause.svg'; +import PlayIcon from '@/assets/icons/play.svg'; +import PauseIcon from '@/assets/icons/pause.svg'; import useCurrentTrack from '@/utility/useCurrentTrack'; import TrackPlayer, { State, usePlaybackState, useProgress } from 'react-native-track-player'; import { Shadow } from 'react-native-shadow-2'; @@ -15,7 +15,7 @@ import useDefaultStyles, { ColoredBlurView } from '@/components/Colors'; import { useNavigation } from '@react-navigation/native'; import { calculateProgressTranslation } from '@/components/Progresstrack'; import { THEME_COLOR } from '@/CONSTANTS'; -import { NavigationProp } from 'screens/types'; +import { NavigationProp } from '@/screens/types'; import { ShadowWrapper } from '@/components/Shadow'; import { useBottomTabBarHeight } from '@react-navigation/bottom-tabs'; diff --git a/src/screens/Music/stacks/Album.tsx b/src/screens/Music/stacks/Album.tsx index c122b02..c917583 100644 --- a/src/screens/Music/stacks/Album.tsx +++ b/src/screens/Music/stacks/Album.tsx @@ -6,7 +6,7 @@ import { fetchAlbum, fetchTracksByAlbum } from '@/store/music/actions'; import { differenceInDays } from 'date-fns'; import { ALBUM_CACHE_AMOUNT_OF_DAYS } from '@/CONSTANTS'; import { t } from '@/localisation'; -import { NavigationProp, StackParams } from 'screens/types'; +import { NavigationProp, StackParams } from '@/screens/types'; import { SubHeader, Text } from '@/components/Typography'; import { ScrollView } from 'react-native-gesture-handler'; import { useGetImage } from '@/utility/JellyfinApi'; diff --git a/src/screens/Music/stacks/Albums.tsx b/src/screens/Music/stacks/Albums.tsx index d59a13e..1a510d6 100644 --- a/src/screens/Music/stacks/Albums.tsx +++ b/src/screens/Music/stacks/Albums.tsx @@ -16,7 +16,7 @@ import useDefaultStyles, { ColoredBlurView } from '@/components/Colors'; import { Album } from '@/store/music/types'; import { Text } from '@/components/Typography'; import { ShadowWrapper } from '@/components/Shadow'; -import { NavigationProp } from 'screens/types'; +import { NavigationProp } from '@/screens/types'; import { SafeSectionList } from '@/components/SafeNavigatorView'; const HeadingHeight = 50; diff --git a/src/screens/Music/stacks/Artist.tsx b/src/screens/Music/stacks/Artist.tsx index b6da482..572201a 100644 --- a/src/screens/Music/stacks/Artist.tsx +++ b/src/screens/Music/stacks/Artist.tsx @@ -14,7 +14,7 @@ import useDefaultStyles from '@/components/Colors'; import { Album } from '@/store/music/types'; import { Text } from '@/components/Typography'; import { ShadowWrapper } from '@/components/Shadow'; -import { NavigationProp, StackParams } from 'screens/types'; +import { NavigationProp, StackParams } from '@/screens/types'; import { SafeFlatList } from '@/components/SafeNavigatorView'; import { chunk } from 'lodash'; diff --git a/src/screens/Music/stacks/Artists.tsx b/src/screens/Music/stacks/Artists.tsx index 570095d..b2da955 100644 --- a/src/screens/Music/stacks/Artists.tsx +++ b/src/screens/Music/stacks/Artists.tsx @@ -12,7 +12,7 @@ import AlphabetScroller from '@/components/AlphabetScroller'; import styled from 'styled-components/native'; import useDefaultStyles, { ColoredBlurView } from '@/components/Colors'; import { Text } from '@/components/Typography'; -import { NavigationProp } from 'screens/types'; +import { NavigationProp } from '@/screens/types'; import { SafeSectionList } from '@/components/SafeNavigatorView'; import { Gap } from '@/components/Utility'; diff --git a/src/screens/Music/stacks/Playlist.tsx b/src/screens/Music/stacks/Playlist.tsx index 3d51c24..2b7d507 100644 --- a/src/screens/Music/stacks/Playlist.tsx +++ b/src/screens/Music/stacks/Playlist.tsx @@ -6,7 +6,7 @@ import { fetchTracksByPlaylist } from '@/store/music/actions'; import { differenceInDays } from 'date-fns'; import { ALBUM_CACHE_AMOUNT_OF_DAYS } from '@/CONSTANTS'; import { t } from '@/localisation'; -import { StackParams } from 'screens/types'; +import { StackParams } from '@/screens/types'; type Route = RouteProp; diff --git a/src/screens/Music/stacks/Playlists.tsx b/src/screens/Music/stacks/Playlists.tsx index b715d0e..f4a7de0 100644 --- a/src/screens/Music/stacks/Playlists.tsx +++ b/src/screens/Music/stacks/Playlists.tsx @@ -10,7 +10,7 @@ import TouchableHandler from '@/components/TouchableHandler'; import AlbumImage, { AlbumItem } from './components/AlbumImage'; import { EntityId } from '@reduxjs/toolkit'; import useDefaultStyles from '@/components/Colors'; -import { NavigationProp } from 'screens/types'; +import { NavigationProp } from '@/screens/types'; import { SafeFlatList, useNavigationOffsets } from '@/components/SafeNavigatorView'; interface GeneratedAlbumItemProps { diff --git a/src/screens/Music/stacks/RecentAlbums.tsx b/src/screens/Music/stacks/RecentAlbums.tsx index 2675f58..a41f702 100644 --- a/src/screens/Music/stacks/RecentAlbums.tsx +++ b/src/screens/Music/stacks/RecentAlbums.tsx @@ -16,7 +16,7 @@ import { Album } from '@/store/music/types'; import Divider from '@/components/Divider'; import styled from 'styled-components/native'; import { ShadowWrapper } from '@/components/Shadow'; -import { NavigationProp } from 'screens/types'; +import { NavigationProp } from '@/screens/types'; import { SafeFlatList } from '@/components/SafeNavigatorView'; const styles = StyleSheet.create({ diff --git a/src/screens/Music/stacks/components/AlbumImage.tsx b/src/screens/Music/stacks/components/AlbumImage.tsx index de08cb4..58a9962 100644 --- a/src/screens/Music/stacks/components/AlbumImage.tsx +++ b/src/screens/Music/stacks/components/AlbumImage.tsx @@ -27,7 +27,7 @@ function AlbumImage(props: FastImageProps) { if (!props.source || hasError) { return ( - + ); } diff --git a/src/screens/Music/stacks/components/TrackListView.tsx b/src/screens/Music/stacks/components/TrackListView.tsx index 0be6cff..9f6bd81 100644 --- a/src/screens/Music/stacks/components/TrackListView.tsx +++ b/src/screens/Music/stacks/components/TrackListView.tsx @@ -8,16 +8,16 @@ import { THEME_COLOR } from '@/CONSTANTS'; import TouchableHandler from '@/components/TouchableHandler'; import useCurrentTrack from '@/utility/useCurrentTrack'; import TrackPlayer from 'react-native-track-player'; -import Play from 'assets/icons/play.svg'; -import Shuffle from 'assets/icons/shuffle.svg'; +import Play from '@/assets/icons/play.svg'; +import Shuffle from '@/assets/icons/shuffle.svg'; import useDefaultStyles from '@/components/Colors'; import usePlayTracks from '@/utility/usePlayTracks'; import { EntityId } from '@reduxjs/toolkit'; import { WrappableButtonRow, WrappableButton } from '@/components/WrappableButtonRow'; -import { NavigationProp } from 'screens/types'; +import { NavigationProp } from '@/screens/types'; import DownloadIcon from '@/components/DownloadIcon'; -import CloudDownArrow from 'assets/icons/cloud-down-arrow.svg'; -import Trash from 'assets/icons/trash.svg'; +import CloudDownArrow from '@/assets/icons/cloud-down-arrow.svg'; +import Trash from '@/assets/icons/trash.svg'; import { queueTrackForDownload, removeDownloadedTrack } from '@/store/downloads/actions'; import { selectDownloadedTracks } from '@/store/downloads/selectors'; import { Header, SubHeader } from '@/components/Typography'; diff --git a/src/screens/Onboarding/index.tsx b/src/screens/Onboarding/index.tsx index b4837db..feb0f44 100644 --- a/src/screens/Onboarding/index.tsx +++ b/src/screens/Onboarding/index.tsx @@ -1,7 +1,7 @@ import React, { useCallback, useEffect } from 'react'; import styled from 'styled-components/native'; import { useNavigation } from '@react-navigation/native'; -import { NavigationProp } from 'screens'; +import { NavigationProp } from '@/screens'; import { useAppDispatch, useTypedSelector } from '@/store'; import { setOnboardingStatus } from '@/store/settings/actions'; import { t } from '@/localisation'; diff --git a/src/screens/Search/index.tsx b/src/screens/Search/index.tsx index d233dea..bb7c6ba 100644 --- a/src/screens/Search/index.tsx +++ b/src/screens/Search/index.tsx @@ -3,11 +3,11 @@ import { createStackNavigator } from '@react-navigation/stack'; import { THEME_COLOR } from '@/CONSTANTS'; import { t } from '@/localisation'; import useDefaultStyles, { ColoredBlurView } from '@/components/Colors'; -import { StackParams } from 'screens/types'; +import { StackParams } from '@/screens/types'; import Search from './stacks/Search'; -import Album from 'screens/Music/stacks/Album'; +import Album from '@/screens/Music/stacks/Album'; import { StyleSheet } from 'react-native'; -import NowPlaying from 'screens/Music/overlays/NowPlaying'; +import NowPlaying from '@/screens/Music/overlays/NowPlaying'; import { GestureHandlerRootView } from 'react-native-gesture-handler'; const Stack = createStackNavigator(); diff --git a/src/screens/Search/stacks/Search/index.tsx b/src/screens/Search/stacks/Search/index.tsx index a37c01f..c900954 100644 --- a/src/screens/Search/stacks/Search/index.tsx +++ b/src/screens/Search/stacks/Search/index.tsx @@ -16,18 +16,18 @@ import { searchAndFetchAlbums } from '@/store/music/actions'; import { debounce } from 'lodash'; import { Text } from '@/components/Typography'; import DownloadIcon from '@/components/DownloadIcon'; -import ChevronRight from 'assets/icons/chevron-right.svg'; -import SearchIcon from 'assets/icons/magnifying-glass.svg'; +import ChevronRight from '@/assets/icons/chevron-right.svg'; +import SearchIcon from '@/assets/icons/magnifying-glass.svg'; import { ShadowWrapper } from '@/components/Shadow'; import { useKeyboardHeight } from '@/utility/useKeyboardHeight'; -import { NavigationProp } from 'screens/types'; +import { NavigationProp } from '@/screens/types'; import { useNavigationOffsets } from '@/components/SafeNavigatorView'; -// import MicrophoneIcon from 'assets/icons/microphone.svg'; -// import AlbumIcon from 'assets/icons/collection.svg'; -// import TrackIcon from 'assets/icons/note.svg'; -// import PlaylistIcon from 'assets/icons/note-list.svg'; -// import StreamIcon from 'assets/icons/cloud.svg'; -// import LocalIcon from 'assets/icons/internal-drive.svg'; +// import MicrophoneIcon from '@/assets/icons/microphone.svg'; +// import AlbumIcon from '@/assets/icons/collection.svg'; +// import TrackIcon from '@/assets/icons/note.svg'; +// import PlaylistIcon from '@/assets/icons/note-list.svg'; +// import StreamIcon from '@/assets/icons/cloud.svg'; +// import LocalIcon from '@/assets/icons/internal-drive.svg'; // import SelectableFilter from './components/SelectableFilter'; const SEARCH_INPUT_HEIGHT = 62; diff --git a/src/screens/Settings/components/Radio.tsx b/src/screens/Settings/components/Radio.tsx index 3d628b6..eb6cc57 100644 --- a/src/screens/Settings/components/Radio.tsx +++ b/src/screens/Settings/components/Radio.tsx @@ -1,6 +1,6 @@ import React, { useCallback } from 'react'; import styled from 'styled-components/native'; -import CheckmarkIcon from 'assets/icons/checkmark.svg'; +import CheckmarkIcon from '@/assets/icons/checkmark.svg'; import { Text } from '@/components/Typography'; import useDefaultStyles from '@/components/Colors'; import { THEME_COLOR } from '@/CONSTANTS'; diff --git a/src/screens/Settings/stacks/Sentry.tsx b/src/screens/Settings/stacks/Sentry.tsx index bc98514..b9d3355 100644 --- a/src/screens/Settings/stacks/Sentry.tsx +++ b/src/screens/Settings/stacks/Sentry.tsx @@ -5,7 +5,7 @@ import { Switch } from 'react-native-gesture-handler'; import styled, { css } from 'styled-components/native'; import { isSentryEnabled, setSentryStatus } from '@/utility/Sentry'; import Accordion from 'react-native-collapsible/Accordion'; -import ChevronIcon from 'assets/icons/chevron-right.svg'; +import ChevronIcon from '@/assets/icons/chevron-right.svg'; import { THEME_COLOR } from '@/CONSTANTS'; import useDefaultStyles, { DefaultStylesProvider } from '@/components/Colors'; import { t } from '@/localisation'; diff --git a/src/screens/index.tsx b/src/screens/index.tsx index 28acf25..ff508cd 100644 --- a/src/screens/index.tsx +++ b/src/screens/index.tsx @@ -13,10 +13,10 @@ import Onboarding from './Onboarding'; import TrackPopupMenu from './modals/TrackPopupMenu'; import SetJellyfinServer from './modals/SetJellyfinServer'; -import SearchIcon from 'assets/icons/magnifying-glass.svg'; -import NotesIcon from 'assets/icons/notes.svg'; -import GearIcon from 'assets/icons/gear.svg'; -import DownloadsIcon from 'assets/icons/arrow-down-to-line.svg'; +import SearchIcon from '@/assets/icons/magnifying-glass.svg'; +import NotesIcon from '@/assets/icons/notes.svg'; +import GearIcon from '@/assets/icons/gear.svg'; +import DownloadsIcon from '@/assets/icons/arrow-down-to-line.svg'; import { useTypedSelector } from '@/store'; import { t } from '@/localisation'; import ErrorReportingAlert from '@/utility/ErrorReportingAlert'; diff --git a/src/screens/modals/ErrorReportingPopup.tsx b/src/screens/modals/ErrorReportingPopup.tsx index d12c6f8..6664560 100644 --- a/src/screens/modals/ErrorReportingPopup.tsx +++ b/src/screens/modals/ErrorReportingPopup.tsx @@ -1,6 +1,6 @@ import React from 'react'; import Modal from '@/components/Modal'; -import Sentry from 'screens/Settings/stacks/Sentry'; +import Sentry from '@/screens/Settings/stacks/Sentry'; export default function ErrorReportingPopup() { return ( diff --git a/src/screens/modals/Player/components/Backbutton.tsx b/src/screens/modals/Player/components/Backbutton.tsx index 89f29de..6639969 100644 --- a/src/screens/modals/Player/components/Backbutton.tsx +++ b/src/screens/modals/Player/components/Backbutton.tsx @@ -1,6 +1,6 @@ import React, { useCallback } from 'react'; import { useNavigation } from '@react-navigation/native'; -import XmarkIcon from 'assets/icons/xmark.svg'; +import XmarkIcon from '@/assets/icons/xmark.svg'; import { TouchableOpacity } from 'react-native'; import styled from 'styled-components/native'; diff --git a/src/screens/modals/Player/components/Casting.ios.tsx b/src/screens/modals/Player/components/Casting.ios.tsx index c96781b..c4fb774 100644 --- a/src/screens/modals/Player/components/Casting.ios.tsx +++ b/src/screens/modals/Player/components/Casting.ios.tsx @@ -4,7 +4,7 @@ import React, { useCallback } from 'react'; import { showRoutePicker, useAirplayRoutes } from 'react-airplay'; import { TouchableOpacity } from 'react-native'; import styled, { css } from 'styled-components/native'; -import AirplayAudioIcon from 'assets/icons/airplay-audio.svg'; +import AirplayAudioIcon from '@/assets/icons/airplay-audio.svg'; import useDefaultStyles from '@/components/Colors'; import { t } from '@/localisation'; diff --git a/src/screens/modals/Player/components/ConnectionNotice.tsx b/src/screens/modals/Player/components/ConnectionNotice.tsx index 42fb21c..36c0c9d 100644 --- a/src/screens/modals/Player/components/ConnectionNotice.tsx +++ b/src/screens/modals/Player/components/ConnectionNotice.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { useNetInfo } from '@react-native-community/netinfo'; import { THEME_COLOR } from '@/CONSTANTS'; import styled from 'styled-components/native'; -import CloudSlash from 'assets/icons/cloud-slash.svg'; +import CloudSlash from '@/assets/icons/cloud-slash.svg'; import { Text } from 'react-native'; import { t } from '@/localisation'; import useDefaultStyles from '@/components/Colors'; diff --git a/src/screens/modals/Player/components/MediaControls.tsx b/src/screens/modals/Player/components/MediaControls.tsx index c129a66..c457068 100644 --- a/src/screens/modals/Player/components/MediaControls.tsx +++ b/src/screens/modals/Player/components/MediaControls.tsx @@ -3,10 +3,10 @@ import TrackPlayer, { State, usePlaybackState } from 'react-native-track-player' import { TouchableOpacity, useColorScheme } from 'react-native'; import styled from 'styled-components/native'; import { useHasNextQueue, useHasPreviousQueue } from '@/utility/useQueue'; -import ForwardIcon from 'assets/icons/forward-end.svg'; -import BackwardIcon from 'assets/icons/backward-end.svg'; -import PlayIcon from 'assets/icons/play.svg'; -import PauseIcon from 'assets/icons/pause.svg'; +import ForwardIcon from '@/assets/icons/forward-end.svg'; +import BackwardIcon from '@/assets/icons/backward-end.svg'; +import PlayIcon from '@/assets/icons/play.svg'; +import PauseIcon from '@/assets/icons/pause.svg'; const BUTTON_SIZE = 40; diff --git a/src/screens/modals/Player/components/Queue.tsx b/src/screens/modals/Player/components/Queue.tsx index 151bad6..e57b492 100644 --- a/src/screens/modals/Player/components/Queue.tsx +++ b/src/screens/modals/Player/components/Queue.tsx @@ -8,8 +8,8 @@ import TrackPlayer, { RepeatMode, Track } from 'react-native-track-player'; import { t } from '@/localisation'; import useDefaultStyles from '@/components/Colors'; import { Text } from '@/components/Typography'; -import RepeatIcon from 'assets/icons/repeat.svg'; -import RepeatSingleIcon from 'assets/icons/repeat.1.svg'; +import RepeatIcon from '@/assets/icons/repeat.svg'; +import RepeatSingleIcon from '@/assets/icons/repeat.1.svg'; import Button from '@/components/Button'; import { THEME_COLOR } from '@/CONSTANTS'; import DownloadIcon from '@/components/DownloadIcon'; diff --git a/src/screens/modals/Player/components/StreamStatus.tsx b/src/screens/modals/Player/components/StreamStatus.tsx index b91cfff..04497eb 100644 --- a/src/screens/modals/Player/components/StreamStatus.tsx +++ b/src/screens/modals/Player/components/StreamStatus.tsx @@ -1,7 +1,7 @@ import React, { useMemo } from 'react'; import useCurrentTrack from '@/utility/useCurrentTrack'; -import CloudIcon from 'assets/icons/cloud.svg'; -import InternalDriveIcon from 'assets/icons/internal-drive.svg'; +import CloudIcon from '@/assets/icons/cloud.svg'; +import InternalDriveIcon from '@/assets/icons/internal-drive.svg'; import useDefaultStyles from '@/components/Colors'; import { Text } from '@/components/Typography'; import styled from 'styled-components/native'; diff --git a/src/screens/modals/TrackPopupMenu.tsx b/src/screens/modals/TrackPopupMenu.tsx index 9923121..4a78045 100644 --- a/src/screens/modals/TrackPopupMenu.tsx +++ b/src/screens/modals/TrackPopupMenu.tsx @@ -1,14 +1,14 @@ import React, { useCallback } from 'react'; import { useNavigation, StackActions, useRoute, RouteProp } from '@react-navigation/native'; -import { StackParams } from 'screens/types'; +import { StackParams } from '@/screens/types'; import { useAppDispatch, useTypedSelector } from '@/store'; import { Header, SubHeader } from '@/components/Typography'; import styled from 'styled-components/native'; import { t } from '@/localisation'; -import PlayIcon from 'assets/icons/play.svg'; -import DownloadIcon from 'assets/icons/cloud-down-arrow.svg'; -import QueueAppendIcon from 'assets/icons/queue-append.svg'; -import TrashIcon from 'assets/icons/trash.svg'; +import PlayIcon from '@/assets/icons/play.svg'; +import DownloadIcon from '@/assets/icons/cloud-down-arrow.svg'; +import QueueAppendIcon from '@/assets/icons/queue-append.svg'; +import TrashIcon from '@/assets/icons/trash.svg'; import { WrappableButton, WrappableButtonRow } from '@/components/WrappableButtonRow'; import CoverImage from '@/components/CoverImage'; diff --git a/src/utility/ErrorReportingAlert.ts b/src/utility/ErrorReportingAlert.ts index 34d35a0..a793fb7 100644 --- a/src/utility/ErrorReportingAlert.ts +++ b/src/utility/ErrorReportingAlert.ts @@ -5,7 +5,7 @@ import { t } from '@/localisation'; import { setReceivedErrorReportingAlert } from '@/store/settings/actions'; import { setSentryStatus } from './Sentry'; import { useNavigation } from '@react-navigation/native'; -import { NavigationProp } from 'screens/types'; +import { NavigationProp } from '@/screens/types'; /** * This will send out an alert message asking the user if they want to enable