From 689560a7a532058cd971216b7ba3a98c25d37189 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Sun, 30 Oct 2022 20:20:04 -0700
Subject: [PATCH] Adjust playerbar

---
 .../player/components/center-controls.tsx     |   1 +
 .../player/components/left-controls.tsx       | 119 ++++++++++++------
 .../player/components/right-controls.tsx      |  24 +++-
 3 files changed, 102 insertions(+), 42 deletions(-)

diff --git a/src/renderer/features/player/components/center-controls.tsx b/src/renderer/features/player/components/center-controls.tsx
index 8f771cf2f..066b6497d 100644
--- a/src/renderer/features/player/components/center-controls.tsx
+++ b/src/renderer/features/player/components/center-controls.tsx
@@ -25,6 +25,7 @@ interface CenterControlsProps {
 
 const ControlsContainer = styled.div`
   display: flex;
+  align-items: center;
   justify-content: center;
   height: 35px;
 `;
diff --git a/src/renderer/features/player/components/left-controls.tsx b/src/renderer/features/player/components/left-controls.tsx
index cb4865387..661f85695 100644
--- a/src/renderer/features/player/components/left-controls.tsx
+++ b/src/renderer/features/player/components/left-controls.tsx
@@ -1,12 +1,12 @@
 import styled from '@emotion/styled';
-import { Group } from '@mantine/core';
+import { Box, Group } from '@mantine/core';
 import { motion, AnimatePresence, LayoutGroup } from 'framer-motion';
 import { RiArrowUpSLine } from 'react-icons/ri';
-import { Link } from 'react-router-dom';
+import { generatePath, Link } from 'react-router-dom';
 import { Button, Text } from '@/renderer/components';
 import { AppRoute } from '@/renderer/router/routes';
 import { useAppStore, usePlayerStore } from '@/renderer/store';
-import { fadeIn, Font } from '@/renderer/styles';
+import { fadeIn } from '@/renderer/styles';
 
 const LeftControlsContainer = styled.div`
   display: flex;
@@ -33,11 +33,12 @@ const MetadataStack = styled(motion.div)`
 
 const Image = styled(motion(Link))<{ url: string }>`
   ${fadeIn};
-  width: 60px;
-  height: 60px;
+  width: 70px;
+  height: 70px;
   background-image: url(${(props) => props.url});
   background-repeat: no-repeat;
   background-size: cover;
+  filter: drop-shadow(0 0 5px rgb(0, 0, 0, 100%));
 
   button {
     display: none;
@@ -48,12 +49,26 @@ const Image = styled(motion(Link))<{ url: string }>`
   }
 `;
 
+const LineItem = styled(Box)<{ secondary?: boolean }>`
+  display: inline-block;
+  width: 95%;
+  max-width: 30vw;
+  overflow: hidden;
+  color: ${(props) => props.secondary && 'var(--main-fg-secondary)'};
+  white-space: nowrap;
+  text-overflow: ellipsis;
+
+  a {
+    color: ${(props) => props.secondary && 'var(--text-secondary)'};
+  }
+`;
+
 export const LeftControls = () => {
   const hideImage = useAppStore((state) => state.sidebar.image);
   const setSidebar = useAppStore((state) => state.setSidebar);
   const song = usePlayerStore((state) => state.current.song);
   const title = song?.name;
-  const artists = song?.artists?.map((artist) => artist?.name).join(', ');
+  const artists = song?.artists;
   const album = song?.album;
 
   return (
@@ -88,38 +103,66 @@ export const LeftControls = () => {
           )}
         </AnimatePresence>
         <MetadataStack layout>
-          <Text
-            font={Font.POPPINS}
-            link={!!title}
-            overflow="hidden"
-            size="sm"
-            to="/nowplaying"
-            weight={500}
-          >
-            {title || '—'}
-          </Text>
-          <Text
-            secondary
-            font={Font.POPPINS}
-            link={!!artists}
-            overflow="hidden"
-            size="sm"
-            to="/nowplaying"
-            weight={500}
-          >
-            {artists || '—'}
-          </Text>
-          <Text
-            secondary
-            font={Font.POPPINS}
-            link={!!album}
-            overflow="hidden"
-            size="sm"
-            to="/nowplaying"
-            weight={500}
-          >
-            {album?.name || '—'}
-          </Text>
+          <LineItem>
+            <Text
+              component={Link}
+              overflow="hidden"
+              size="sm"
+              sx={{ '&:hover': { textDecoration: 'underline' } }}
+              to={AppRoute.NOW_PLAYING}
+              weight={500}
+            >
+              {title || '—'}
+            </Text>
+          </LineItem>
+          <LineItem secondary>
+            {artists?.map((artist, index) => (
+              <>
+                {index > 0 && (
+                  <Text secondary style={{ display: 'inline-block' }}>
+                    ,
+                  </Text>
+                )}{' '}
+                <Text
+                  component={Link}
+                  overflow="hidden"
+                  size="sm"
+                  sx={{
+                    '&:hover': { textDecoration: 'underline' },
+                    width: 'inherit',
+                  }}
+                  to={
+                    artist.id
+                      ? generatePath(AppRoute.LIBRARY_ARTISTS_DETAIL, {
+                          artistId: artist.id,
+                        })
+                      : ''
+                  }
+                  weight={500}
+                >
+                  {artist.name || '—'}
+                </Text>
+              </>
+            ))}
+          </LineItem>
+          <LineItem secondary>
+            <Text
+              component={Link}
+              overflow="hidden"
+              size="sm"
+              sx={{ '&:hover': { textDecoration: 'underline' } }}
+              to={
+                album?.id
+                  ? generatePath(AppRoute.LIBRARY_ALBUMS_DETAIL, {
+                      albumId: album?.id,
+                    })
+                  : ''
+              }
+              weight={500}
+            >
+              {album?.name || '—'}
+            </Text>
+          </LineItem>
         </MetadataStack>
       </LayoutGroup>
     </LeftControlsContainer>
diff --git a/src/renderer/features/player/components/right-controls.tsx b/src/renderer/features/player/components/right-controls.tsx
index fa37edfc2..100d63979 100644
--- a/src/renderer/features/player/components/right-controls.tsx
+++ b/src/renderer/features/player/components/right-controls.tsx
@@ -1,15 +1,22 @@
 import styled from '@emotion/styled';
-import { RiVolumeUpFill, RiVolumeMuteFill } from 'react-icons/ri';
-import { usePlayerStore } from '../../../store';
+import { Group } from '@mantine/core';
+import {
+  RiVolumeUpFill,
+  RiVolumeMuteFill,
+  RiPlayListFill,
+} from 'react-icons/ri';
+import { usePlayerStore, useAppStore } from '@/renderer/store';
 import { useRightControls } from '../hooks/use-right-controls';
 import { PlayerButton } from './player-button';
 import { Slider } from './slider';
 
 const RightControlsContainer = styled.div`
   display: flex;
+  flex-direction: row;
+  justify-content: flex-end;
   width: 100%;
   height: 100%;
-  padding: 0.5rem;
+  padding-right: 1rem;
 `;
 
 const VolumeSliderWrapper = styled.div`
@@ -25,18 +32,27 @@ const MetadataStack = styled.div`
   gap: 0.3rem;
   align-items: flex-end;
   justify-content: center;
-  width: 100%;
   overflow: visible;
 `;
 
 export const RightControls = () => {
   const volume = usePlayerStore((state) => state.settings.volume);
   const muted = usePlayerStore((state) => state.settings.muted);
+  const setSidebar = useAppStore((state) => state.setSidebar);
+  const isQueueExpanded = useAppStore((state) => state.sidebar.rightExpanded);
   const { handleVolumeSlider, handleVolumeSliderState, handleMute } =
     useRightControls();
 
   return (
     <RightControlsContainer>
+      <Group>
+        <PlayerButton
+          icon={<RiPlayListFill size={15} />}
+          tooltip={{ label: 'View queue' }}
+          variant="secondary"
+          onClick={() => setSidebar({ rightExpanded: !isQueueExpanded })}
+        />
+      </Group>
       <MetadataStack>
         <VolumeSliderWrapper>
           <PlayerButton