Makussu/subtracks
1
0
Fork 0
mirror of https://github.com/austinried/subtracks.git synced 2026-02-10 15:02:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

reorg, remove old music slice files

Browse Source
This commit is contained in:
austinried
2022-03-20 16:16:16 +09:00
parent 2969b6c768
commit ba37348fc3
23 changed files with 139 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/ContextMenu.tsx
View File

@@ -1,6 +1,6 @@
import PressableOpacity from '@app/components/PressableOpacity'
import { useStar } from '@app/hooks/music'
import { AlbumListItem, Artist, Song, StarrableItemType } from '@app/models/music'
import { StarrableItemType, Song, Artist, Album } from '@app/models/library'
import colors from '@app/styles/colors'
import font from '@app/styles/font'
import { NavigationProp, useNavigation } from '@react-navigation/native'
@@ -199,7 +199,7 @@ const OptionViewAlbum = React.memo<{
// ))
export type AlbumContextPressableProps = ContextMenuProps & {
album: AlbumListItem
album: Album
}
export const AlbumContextPressable: React.FC<AlbumContextPressableProps> = props => {

4
app/components/HeaderBar.tsx
View File

@@ -8,10 +8,10 @@ import Animated from 'react-native-reanimated'
import PressableOpacity from './PressableOpacity'
import IconMat from 'react-native-vector-icons/MaterialIcons'
import { ReactComponentLike } from 'prop-types'
import { AlbumListItem, Song } from '@app/models/music'
import { AlbumContextPressable, NowPlayingContextPressable } from './ContextMenu'
import { Album, Song } from '@app/models/library'
export type HeaderContextItem = Song | AlbumListItem
export type HeaderContextItem = Song | Album
const More = React.memo<{ contextItem?: HeaderContextItem }>(({ contextItem }) => {
const moreIcon = <IconMat name="more-vert" color="white" size={25} />

4
app/components/ListItem.tsx
View File

@@ -1,5 +1,5 @@
import { useIsPlaying } from '@app/hooks/trackplayer'
import { AlbumListItem, Artist, ListableItem, Song } from '@app/models/music'
import { Album, Artist, ListableItem, Song } from '@app/models/library'
import colors from '@app/styles/colors'
import font from '@app/styles/font'
import { useNavigation } from '@react-navigation/native'
@@ -97,7 +97,7 @@ const ListItem: React.FC<{
)
const albumPressable = useCallback(
({ children }) => (
<AlbumContextPressable album={item as AlbumListItem} onPress={onPress} triggerWrapperStyle={styles.item}>
<AlbumContextPressable album={item as Album} onPress={onPress} triggerWrapperStyle={styles.item}>
{children}
</AlbumContextPressable>
),

2
app/components/ListPlayerControls.tsx
View File

@@ -1,5 +1,5 @@
import Button from '@app/components/Button'
import { Song } from '@app/models/music'
import { Song } from '@app/models/library'
import { useStore } from '@app/state/store'
import { QueueContextType, selectTrackPlayer } from '@app/state/trackplayer'
import colors from '@app/styles/colors'