Add additional controls to playerbar

This commit is contained in:
jeffvli 2023-01-30 02:39:25 -08:00
parent 5ddd0872ef
commit 85bf910d65
3 changed files with 238 additions and 49 deletions

View File

@ -1,19 +1,22 @@
import React from 'react';
import { Center } from '@mantine/core';
import { Center, Group } from '@mantine/core';
import { openContextModal } from '@mantine/modals';
import { motion, AnimatePresence, LayoutGroup } from 'framer-motion';
import { RiArrowUpSLine, RiDiscLine } from 'react-icons/ri';
import { RiArrowUpSLine, RiDiscLine, RiMore2Fill } from 'react-icons/ri';
import { generatePath, Link } from 'react-router-dom';
import styled from 'styled-components';
import { Button, Text } from '/@/renderer/components';
import { Button, DropdownMenu, Text } from '/@/renderer/components';
import { AppRoute } from '/@/renderer/router/routes';
import { useAppStoreActions, useAppStore, useCurrentSong } from '/@/renderer/store';
import { fadeIn } from '/@/renderer/styles';
import { useCreateFavorite, useDeleteFavorite } from '/@/renderer/features/shared';
import { LibraryItem } from '/@/renderer/api/types';
const LeftControlsContainer = styled.div`
display: flex;
width: 100%;
height: 100%;
margin-left: 1rem;
padding-left: 1rem;
`;
const ImageWrapper = styled.div`
@ -77,6 +80,44 @@ export const LeftControls = () => {
const title = currentSong?.name;
const artists = currentSong?.artists;
const isSongDefined = Boolean(currentSong?.id);
const openAddToPlaylistModal = () => {
openContextModal({
innerProps: {
songId: [currentSong?.id],
},
modal: 'addToPlaylist',
size: 'md',
title: 'Add to playlist',
});
};
const addToFavoritesMutation = useCreateFavorite();
const removeFromFavoritesMutation = useDeleteFavorite();
const handleAddToFavorites = () => {
if (!isSongDefined || !currentSong) return;
addToFavoritesMutation.mutate({
query: {
id: [currentSong.id],
type: LibraryItem.SONG,
},
});
};
const handleRemoveFromFavorites = () => {
if (!isSongDefined || !currentSong) return;
removeFromFavoritesMutation.mutate({
query: {
id: [currentSong.id],
type: LibraryItem.SONG,
},
});
};
return (
<LeftControlsContainer>
<LayoutGroup>
@ -139,16 +180,45 @@ export const LeftControls = () => {
</AnimatePresence>
<MetadataStack layout="position">
<LineItem>
<Text
$link
component={Link}
overflow="hidden"
size="sm"
to={AppRoute.NOW_PLAYING}
weight={500}
<Group
align="flex-start"
spacing="xs"
>
{title || '—'}
</Text>
<Text
$link
component={Link}
overflow="hidden"
size="md"
to={AppRoute.NOW_PLAYING}
weight={500}
>
{title || '—'}
</Text>
{isSongDefined && (
<DropdownMenu>
<DropdownMenu.Target>
<Button
compact
variant="subtle"
>
<RiMore2Fill size="1.2rem" />
</Button>
</DropdownMenu.Target>
<DropdownMenu.Dropdown>
<DropdownMenu.Item onClick={openAddToPlaylistModal}>
Add to playlist
</DropdownMenu.Item>
<DropdownMenu.Divider />
<DropdownMenu.Item onClick={handleAddToFavorites}>
Add to favorites
</DropdownMenu.Item>
<DropdownMenu.Item onClick={handleRemoveFromFavorites}>
Remove from favorites
</DropdownMenu.Item>
</DropdownMenu.Dropdown>
</DropdownMenu>
)}
</Group>
</LineItem>
<LineItem $secondary>
{artists?.map((artist, index) => (
@ -157,7 +227,7 @@ export const LeftControls = () => {
<Text
$link
$secondary
size="xs"
size="md"
style={{ display: 'inline-block' }}
>
,
@ -167,7 +237,7 @@ export const LeftControls = () => {
$link
component={Link}
overflow="hidden"
size="xs"
size="md"
to={
artist.id
? generatePath(AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL, {
@ -187,7 +257,7 @@ export const LeftControls = () => {
$link
component={Link}
overflow="hidden"
size="xs"
size="md"
to={
currentSong?.albumId
? generatePath(AppRoute.LIBRARY_ALBUMS_DETAIL, {

View File

@ -1,11 +1,28 @@
import { Group } from '@mantine/core';
import { Flex, Group } from '@mantine/core';
import { HiOutlineQueueList } from 'react-icons/hi2';
import { RiVolumeUpFill, RiVolumeDownFill, RiVolumeMuteFill } from 'react-icons/ri';
import {
RiVolumeUpFill,
RiVolumeDownFill,
RiVolumeMuteFill,
RiHeartLine,
RiHeartFill,
} from 'react-icons/ri';
import styled from 'styled-components';
import { useAppStoreActions, useMuted, useSidebarStore, useVolume } from '/@/renderer/store';
import {
useAppStoreActions,
useCurrentServer,
useCurrentSong,
useMuted,
useSetQueueFavorite,
useSidebarStore,
useVolume,
} from '/@/renderer/store';
import { useRightControls } from '../hooks/use-right-controls';
import { PlayerButton } from './player-button';
import { Slider } from './slider';
import { LibraryItem, ServerType } from '/@/renderer/api/types';
import { useCreateFavorite, useDeleteFavorite } from '/@/renderer/features/shared';
import { Rating } from '/@/renderer/components';
const RightControlsContainer = styled.div`
display: flex;
@ -13,7 +30,6 @@ const RightControlsContainer = styled.div`
justify-content: flex-end;
width: 100%;
height: 100%;
padding-right: 1rem;
`;
const VolumeSliderWrapper = styled.div`
@ -35,47 +51,141 @@ const MetadataStack = styled.div`
export const RightControls = () => {
const volume = useVolume();
const muted = useMuted();
const server = useCurrentServer();
const currentSong = useCurrentSong();
const { setSidebar } = useAppStoreActions();
const { rightExpanded: isQueueExpanded } = useSidebarStore();
const { handleVolumeSlider, handleVolumeSliderState, handleMute } = useRightControls();
const addToFavoritesMutation = useCreateFavorite();
const removeFromFavoritesMutation = useDeleteFavorite();
const setFavorite = useSetQueueFavorite();
const handleAddToFavorites = () => {
if (!currentSong) return;
addToFavoritesMutation.mutate(
{
query: {
id: [currentSong.id],
type: LibraryItem.SONG,
},
},
{
onSuccess: () => {
setFavorite([currentSong.id], true);
},
},
);
};
const handleRemoveFromFavorites = () => {
if (!currentSong) return;
removeFromFavoritesMutation.mutate(
{
query: {
id: [currentSong.id],
type: LibraryItem.SONG,
},
},
{
onSuccess: () => {
setFavorite([currentSong.id], false);
},
},
);
};
const handleToggleFavorite = () => {
if (!currentSong) return;
if (currentSong.userFavorite) {
handleRemoveFromFavorites();
} else {
handleAddToFavorites();
}
};
const isSongDefined = Boolean(currentSong?.id);
const showRating = isSongDefined && server?.type === ServerType.NAVIDROME;
return (
<RightControlsContainer>
<Group>
<PlayerButton
icon={<HiOutlineQueueList />}
tooltip={{ label: 'View queue', openDelay: 500 }}
variant="secondary"
onClick={() => setSidebar({ rightExpanded: !isQueueExpanded })}
/>
</Group>
<MetadataStack>
<VolumeSliderWrapper>
<Flex
align="flex-end"
direction="column"
h="100%"
p="1rem"
>
{showRating && (
<Group>
<Rating
readOnly
size="sm"
value={currentSong?.userRating ?? 0}
/>
</Group>
)}
<RightControlsContainer>
<Group spacing="xs">
<PlayerButton
icon={
muted ? (
<RiVolumeMuteFill size={15} />
) : volume > 50 ? (
<RiVolumeUpFill size={15} />
currentSong?.userFavorite ? (
<RiHeartFill
color="var(--primary-color)"
size="1.3rem"
/>
) : (
<RiVolumeDownFill size={15} />
<RiHeartLine size="1.3rem" />
)
}
tooltip={{ label: muted ? 'Muted' : volume, openDelay: 500 }}
sx={{
svg: {
fill: !currentSong?.userFavorite ? undefined : 'var(--primary-color) !important',
},
}}
tooltip={{
label: currentSong?.userFavorite ? 'Unfavorite' : 'Favorite',
openDelay: 500,
}}
variant="secondary"
onClick={handleMute}
onClick={handleToggleFavorite}
/>
<Slider
hasTooltip
height="60%"
max={100}
min={0}
value={volume}
onAfterChange={handleVolumeSliderState}
onChange={handleVolumeSlider}
<PlayerButton
icon={<HiOutlineQueueList size="1.3rem" />}
tooltip={{ label: 'View queue', openDelay: 500 }}
variant="secondary"
onClick={() => setSidebar({ rightExpanded: !isQueueExpanded })}
/>
</VolumeSliderWrapper>
</MetadataStack>
</RightControlsContainer>
</Group>
<MetadataStack>
<VolumeSliderWrapper>
<PlayerButton
icon={
muted ? (
<RiVolumeMuteFill size="1.2rem" />
) : volume > 50 ? (
<RiVolumeUpFill size="1.2rem" />
) : (
<RiVolumeDownFill size="1.2rem" />
)
}
tooltip={{ label: muted ? 'Muted' : volume, openDelay: 500 }}
variant="secondary"
onClick={handleMute}
/>
<Slider
hasTooltip
height="60%"
max={100}
min={0}
value={volume}
onAfterChange={handleVolumeSliderState}
onChange={handleVolumeSlider}
/>
</VolumeSliderWrapper>
</MetadataStack>
</RightControlsContainer>
</Flex>
);
};

View File

@ -659,6 +659,15 @@ export const usePlayerStore = create<PlayerSlice>()(
}
}
const currentSongId = get().current.song?.id;
if (currentSongId && ids.includes(currentSongId)) {
set((state) => {
if (state.current.song) {
state.current.song.userFavorite = favorite;
}
});
}
return foundUniqueIds;
},
setMuted: (muted: boolean) => {