Skip to content

Commit 1b2313b

Browse files
committed
Refactor UI: popups, animations, and detail navigation
- Replace SidePanel with popup-based SingleSongDetailsPopupView and SmokeViewQueueGrid for song details and queue, using connected animations for transitions - Refactor and centralize animation logic with AnimationHelper; add support for multiple animation keys and coordinated elements - Add middle mouse button support for quick detail popup access - Update context menu actions (add to next, love/unlove, info) and navigation to use new animation flows - Resize NowPlayingPage image, remove inline lyrics ListView, and move lyrics to popup - Simplify ArtistPage album loading logic - Wrap SingleSongLyrics in ScrollViewer for better UX - Remove unused code, improve naming, and streamline event handling for maintainability
1 parent b015d55 commit 1b2313b

File tree

8 files changed

+356
-344
lines changed

8 files changed

+356
-344
lines changed

Dimmer/Dimmer.WinUI/Views/WinuiPages/AllSongsListPage.xaml

Lines changed: 19 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
Orientation="Horizontal"
8686
Spacing="10">
8787
<Button
88-
x:Name="ViewQueue"
88+
x:Name="ViewQueueBtn"
8989
Click="ViewQueue_Click"
9090
Content="View Queue" />
9191

@@ -189,7 +189,7 @@
189189
<Grid Grid.Row="1" Visibility="Visible">
190190
<Grid.ColumnDefinitions>
191191
<ColumnDefinition Width="*" />
192-
<ColumnDefinition Width="auto" />
192+
193193
</Grid.ColumnDefinitions>
194194

195195
<dgView:TableView
@@ -292,6 +292,7 @@
292292
Width="55"
293293
HorizontalAlignment="Left"
294294
x:FieldModifier="Public"
295+
Loaded="CoverArtImage_Loaded"
295296
PointerPressed="coverArtImage_PointerPressed"
296297
RightTapped="coverArtImage_RightTapped"
297298
Source="{Binding CoverImagePath}"
@@ -472,67 +473,34 @@
472473
</dgView:TableView.Columns>
473474
</dgView:TableView>
474475

475-
<ScrollViewer
476-
Grid.Column="1">
477-
478-
<StackPanel
479-
x:Name="SidePanel"
480-
Width="250"
481-
HorizontalAlignment="Center"
482-
PointerEntered="SidePanel_PointerEntered"
483-
PointerExited="SidePanel_PointerExited"
484-
Spacing="10"
485-
Visibility="{x:Bind MyViewModel.SelectedSong, Mode=OneWay, Converter={StaticResource IsObjNullToVisInverseConverter}}">
486-
487-
<Grid>
488-
<Button
489-
x:Name="ClosePanel"
490-
HorizontalAlignment="Right"
491-
VerticalAlignment="Top"
492-
Background="Transparent"
493-
Canvas.ZIndex="1"
494-
Click="ClosePanel_Click"
495-
Content="X" />
496-
<Image
497-
x:Name="SelectedSongImg"
498-
Canvas.ZIndex="0"
499-
Loaded="SelectedSongImg_Loaded"
500-
PointerPressed="SelectedSongImg_PointerPressed"
501-
Visibility="Visible">
502-
503-
</Image>
504-
505-
</Grid>
506-
<Button HorizontalAlignment="Center" Content="{x:Bind MyViewModel.SelectedSong.Title, Mode=OneWay}" />
507-
<Button HorizontalAlignment="Center" Content="{x:Bind MyViewModel.SelectedSong.GenreName, Mode=OneWay}" />
508-
<Button HorizontalAlignment="Center" Content="{x:Bind MyViewModel.SelectedSong.PlayCompletedCount, Mode=OneWay}" />
509-
<Button HorizontalAlignment="Center" Content="{x:Bind MyViewModel.SelectedSong.ReleaseYear, Mode=OneWay}" />
510-
<Button HorizontalAlignment="Center" Content="{x:Bind MyViewModel.SelectedSong.UserNoteAggregatedText, Mode=OneWay}" />
511-
</StackPanel>
512-
513-
</ScrollViewer>
514476
</Grid>
515477

516478

517479
<StackPanel x:Name="BtmLogPanel" Grid.Row="2">
518480

519-
481+
<Button HorizontalAlignment="Center" Background="Transparent"
482+
BorderThickness="1">
483+
<StackPanel Spacing="10" Orientation="Horizontal">
484+
<TextBlock Text="{x:Bind MyViewModel.SearchResults.Count , Mode=OneWay}"/>
485+
<TextBlock Text="Songs"/>
486+
</StackPanel>
487+
</Button>
520488
<StackPanel Orientation="Horizontal">
521-
<Button
522-
x:Name="HideBtmPart"
523-
VerticalAlignment="Top"
524-
Background="Transparent"
525-
BorderBrush="Transparent"
526-
Click="HideBtmPart_Click"
527-
Content="X"
528-
FontSize="9" />
489+
490+
529491
<TextBlock VerticalAlignment="Center" Text="{Binding LatestAppLog.Message}" />
530492
</StackPanel>
531493
</StackPanel>
532494
</Grid>
533495

534-
<local:SmokeViewQueueGrid x:Name="SmokeGrid" Visibility="Collapsed"
496+
<local:SmokeViewQueueGrid x:Name="SmokeGrid" Visibility="Collapsed" DismissRequested="SmokeGrid_DismissRequested"
535497
Loaded="SmokeGrid_Loaded"/>
498+
499+
500+
<local:SingleSongDetailsPopupView x:Name="SingleSongPopup"
501+
Visibility="Collapsed"
502+
DismissedRequested="SingleSongPopup_DismissedRequested"
503+
Loaded="SingleSongPopup_Loaded"/>
536504
</Grid>
537505
</Page>
538506

0 commit comments

Comments
 (0)