Skip to content

Swap position of item count and play all controls in library toolbar #8196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thornbill merged 1 commit into from
Jul 11, 2026
Merged

Swap position of item count and play all controls in library toolbar #8196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 61 additions & 56 deletions src/apps/modern/features/libraries/components/LibraryToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,61 +104,21 @@ const LibraryToolbar: FC = () => {
>
<LibraryViewMenu />

<Box
sx={{
display: 'flex',
flexGrow: {
xs: 1,
sm: 0
},
justifyContent: 'flex-end',
marginLeft: 1
}}
>
<ButtonGroup
variant='contained'
{!MENU_ONLY_VIEWS.includes(viewType) && (
<Box
sx={{
display: 'flex',
flexGrow: {
xs: 1,
sm: 0
},
justifyContent: 'flex-end',
marginLeft: 1
}}
>
{isBtnPlayAllEnabled && (
<PlayAllButton
item={item}
items={items}
viewType={viewType}
collectionType={collectionType}
hasFilters={hasFilters}
isTextVisible={isSmallScreen}
libraryViewSettings={libraryViewSettings}
/>
)}

{isBtnShuffleEnabled && (
<ShuffleButton
item={item}
items={items}
viewType={viewType}
collectionType={collectionType}
hasFilters={hasFilters}
isTextVisible={isSmallScreen && !isBtnPlayAllEnabled}
libraryViewSettings={libraryViewSettings}
/>
)}

{isBtnQueueEnabled && item && playbackManager.canQueue(item) && (
<QueueButton
item={item}
items={items}
hasFilters={hasFilters}
isTextVisible={isSmallScreen && !isBtnPlayAllEnabled && !isBtnShuffleEnabled}
/>
)}
</ButtonGroup>

{isBtnNewCollectionEnabled && canCreateCollections && (
<NewCollectionButton isTextVisible={isSmallScreen} queryKey={allItemsQueryKey} />
)}
{isBtnNewPlaylistEnabled && (
<NewPlaylistButton isTextVisible={isSmallScreen} queryKey={allItemsQueryKey} />
)}
</Box>
<Chip label={itemCountDisplay} />
</Box>
)}

{!MENU_ONLY_VIEWS.includes(viewType) && (
<Stack
Expand All @@ -174,7 +134,10 @@ const LibraryToolbar: FC = () => {
sm: 'auto'
},
flexGrow: 1,
marginTop: 0.5,
marginTop: {
xs: 1,
sm: 0.5
},
marginBottom: 0.5
}}
>
Expand All @@ -188,7 +151,49 @@ const LibraryToolbar: FC = () => {
}
}}
>
<Chip label={itemCountDisplay} />
<ButtonGroup
variant='contained'
>
{isBtnPlayAllEnabled && (
<PlayAllButton
item={item}
items={items}
viewType={viewType}
collectionType={collectionType}
hasFilters={hasFilters}
isTextVisible={isSmallScreen}
libraryViewSettings={libraryViewSettings}
/>
)}

{isBtnShuffleEnabled && (
<ShuffleButton
item={item}
items={items}
viewType={viewType}
collectionType={collectionType}
hasFilters={hasFilters}
isTextVisible={isSmallScreen && !isBtnPlayAllEnabled}
libraryViewSettings={libraryViewSettings}
/>
)}

{isBtnQueueEnabled && item && playbackManager.canQueue(item) && (
<QueueButton
item={item}
items={items}
hasFilters={hasFilters}
isTextVisible={isSmallScreen && !isBtnPlayAllEnabled && !isBtnShuffleEnabled}
/>
)}
</ButtonGroup>

{isBtnNewCollectionEnabled && canCreateCollections && (
<NewCollectionButton isTextVisible={isSmallScreen} queryKey={allItemsQueryKey} />
)}
{isBtnNewPlaylistEnabled && (
<NewPlaylistButton isTextVisible={isSmallScreen} queryKey={allItemsQueryKey} />
)}
</Box>

<ButtonGroup
Expand Down
Loading