Skip to content

feat: add ItemsReorderAnimation to GridViews #342

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
huynhsontung merged 3 commits into from
Apr 12, 2026
Merged

feat: add ItemsReorderAnimation to GridViews #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3339f0e
add gridview reorder animation
United600 Mar 18, 2024
e351cf4
Merge branch 'main' into reorder
United600 Mar 22, 2026
1e55952
refactor reorder animations to respect system setting
United600 Mar 22, 2026
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
18 changes: 18 additions & 0 deletions Screenbox.Core/ViewModels/CommonViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
using Screenbox.Core.Messages;
using Screenbox.Core.Services;
using Windows.Storage;
using Windows.System;
using Windows.UI.ViewManagement;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;

Expand All @@ -31,13 +33,16 @@ public sealed partial class CommonViewModel : ObservableRecipient,
[ObservableProperty] private Thickness _scrollBarMargin;
[ObservableProperty] private Thickness _footerBottomPaddingMargin;
[ObservableProperty] private double _footerBottomPaddingHeight;
[ObservableProperty] private bool _animationsEnabled;

private readonly DispatcherQueue _dispatcherQueue;
private readonly INavigationService _navigationService;
private readonly IFilesService _filesService;
private readonly ISettingsService _settingsService;
private readonly IPlaylistService _playlistService;
private readonly PlaylistsContext _playlistsContext;
private readonly Dictionary<string, object> _pageStates;
private readonly UISettings _uiSettings;

public CommonViewModel(INavigationService navigationService,
IFilesService filesService,
Expand All @@ -50,10 +55,15 @@ public CommonViewModel(INavigationService navigationService,
_settingsService = settingsService;
_playlistService = playlistService;
_playlistsContext = playlistsContext;
_dispatcherQueue = DispatcherQueue.GetForCurrentThread();
_navigationViewDisplayMode = Messenger.Send<NavigationViewDisplayModeRequestMessage>();
NavigationStates = new Dictionary<Type, string>();
_pageStates = new Dictionary<string, object>();

_uiSettings = new UISettings();
_uiSettings.AnimationsEnabledChanged += UISettings_OnAnimationsEnabledChanged;
_animationsEnabled = _uiSettings.AnimationsEnabled;

// Activate the view model's messenger
IsActive = true;
}
Expand Down Expand Up @@ -97,6 +107,14 @@ public bool TryGetPageState(string pageTypeName, int backStackDepth, out object
return _pageStates.TryGetValue(pageTypeName + backStackDepth, out state);
}

private void UISettings_OnAnimationsEnabledChanged(UISettings sender, UISettingsAnimationsEnabledChangedEventArgs args)
{
_dispatcherQueue.TryEnqueue(() =>
{
AnimationsEnabled = sender.AnimationsEnabled;
});
}

[RelayCommand]
private void PlayNext(MediaViewModel media)
{
Expand Down
12 changes: 12 additions & 0 deletions Screenbox/Pages/AlbumsPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:behaviors="using:Screenbox.Behaviors"
xmlns:controls="using:Screenbox.Controls"
xmlns:ctAnimations="using:CommunityToolkit.WinUI.Animations"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down Expand Up @@ -226,6 +227,17 @@
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="SystemEffectsStates">
<VisualState x:Name="AnimationsEnabled">
<VisualState.StateTriggers>
<StateTrigger IsActive="{x:Bind Common.AnimationsEnabled, Mode=OneWay}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="AlbumGridView.(ctAnimations:ItemsReorderAnimation.Duration)" Value="{StaticResource ControlNormalAnimationDuration}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</Page>
12 changes: 12 additions & 0 deletions Screenbox/Pages/AllVideosPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:behaviors="using:Screenbox.Behaviors"
xmlns:commands="using:Screenbox.Commands"
xmlns:ctAnimations="using:CommunityToolkit.WinUI.Animations"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down Expand Up @@ -120,6 +121,17 @@
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="SystemEffectsStates">
<VisualState x:Name="AnimationsEnabled">
<VisualState.StateTriggers>
<StateTrigger IsActive="{x:Bind Common.AnimationsEnabled, Mode=OneWay}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="VideosGridView.(ctAnimations:ItemsReorderAnimation.Duration)" Value="{StaticResource ControlNormalAnimationDuration}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</Page>
12 changes: 12 additions & 0 deletions Screenbox/Pages/ArtistsPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:behaviors="using:Screenbox.Behaviors"
xmlns:ctAnimations="using:CommunityToolkit.WinUI.Animations"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down Expand Up @@ -156,6 +157,17 @@
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="SystemEffectsStates">
<VisualState x:Name="AnimationsEnabled">
<VisualState.StateTriggers>
<StateTrigger IsActive="{x:Bind Common.AnimationsEnabled, Mode=OneWay}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="ArtistGridView.(ctAnimations:ItemsReorderAnimation.Duration)" Value="{StaticResource ControlNormalAnimationDuration}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</Page>
12 changes: 12 additions & 0 deletions Screenbox/Pages/FolderViewPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:behaviors="using:Screenbox.Behaviors"
xmlns:commands="using:Screenbox.Commands"
xmlns:controls="using:Screenbox.Controls"
xmlns:ctAnimations="using:CommunityToolkit.WinUI.Animations"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down Expand Up @@ -189,6 +190,17 @@
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="SystemEffectsStates">
<VisualState x:Name="AnimationsEnabled">
<VisualState.StateTriggers>
<StateTrigger IsActive="{x:Bind Common.AnimationsEnabled, Mode=OneWay}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="FolderView.(ctAnimations:ItemsReorderAnimation.Duration)" Value="{StaticResource ControlNormalAnimationDuration}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</Page>
12 changes: 12 additions & 0 deletions Screenbox/Pages/HomePage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:behaviors="using:Screenbox.Behaviors"
xmlns:commands="using:Screenbox.Commands"
xmlns:controls="using:Screenbox.Controls"
xmlns:ctAnimations="using:CommunityToolkit.WinUI.Animations"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:extensions="using:Screenbox.Extensions"
xmlns:helpers="using:Screenbox.Helpers"
Expand Down Expand Up @@ -333,6 +334,17 @@
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="SystemEffectsStates">
<VisualState x:Name="AnimationsEnabled">
<VisualState.StateTriggers>
<StateTrigger IsActive="{x:Bind Common.AnimationsEnabled, Mode=OneWay}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="RecentFilesGridView.(ctAnimations:ItemsReorderAnimation.Duration)" Value="{StaticResource ControlNormalAnimationDuration}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</Page>
12 changes: 12 additions & 0 deletions Screenbox/Pages/PlaylistsPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:behaviors="using:Screenbox.Behaviors"
xmlns:commands="using:Screenbox.Commands"
xmlns:controls="using:Screenbox.Controls"
xmlns:ctAnimations="using:CommunityToolkit.WinUI.Animations"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:local="using:Screenbox.Pages"
Expand Down Expand Up @@ -151,6 +152,17 @@
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="SystemEffectsStates">
<VisualState x:Name="AnimationsEnabled">
<VisualState.StateTriggers>
<StateTrigger IsActive="{x:Bind Common.AnimationsEnabled, Mode=OneWay}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="PlaylistsGridView.(ctAnimations:ItemsReorderAnimation.Duration)" Value="{StaticResource ControlNormalAnimationDuration}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</Page>
12 changes: 12 additions & 0 deletions Screenbox/Pages/Search/AlbumSearchResultPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:behaviors="using:Screenbox.Behaviors"
xmlns:commands="using:Screenbox.Commands"
xmlns:controls="using:Screenbox.Controls"
xmlns:ctAnimations="using:CommunityToolkit.WinUI.Animations"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down Expand Up @@ -81,6 +82,17 @@
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="SystemEffectsStates">
<VisualState x:Name="AnimationsEnabled">
<VisualState.StateTriggers>
<StateTrigger IsActive="{x:Bind Common.AnimationsEnabled, Mode=OneWay}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="AlbumGridView.(ctAnimations:ItemsReorderAnimation.Duration)" Value="{StaticResource ControlNormalAnimationDuration}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</Page>
12 changes: 12 additions & 0 deletions Screenbox/Pages/Search/ArtistSearchResultPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:behaviors="using:Screenbox.Behaviors"
xmlns:ctAnimations="using:CommunityToolkit.WinUI.Animations"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down Expand Up @@ -75,6 +76,17 @@
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="SystemEffectsStates">
<VisualState x:Name="AnimationsEnabled">
<VisualState.StateTriggers>
<StateTrigger IsActive="{x:Bind Common.AnimationsEnabled, Mode=OneWay}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="ArtistGridView.(ctAnimations:ItemsReorderAnimation.Duration)" Value="{StaticResource ControlNormalAnimationDuration}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</Page>
14 changes: 14 additions & 0 deletions Screenbox/Pages/Search/SearchResultPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:behaviors="using:Screenbox.Behaviors"
xmlns:commands="using:Screenbox.Commands"
xmlns:controls="using:Screenbox.Controls"
xmlns:ctAnimations="using:CommunityToolkit.WinUI.Animations"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down Expand Up @@ -277,6 +278,19 @@
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="SystemEffectsStates">
<VisualState x:Name="AnimationsEnabled">
<VisualState.StateTriggers>
<StateTrigger IsActive="{x:Bind Common.AnimationsEnabled, Mode=OneWay}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="ArtistGridView.(ctAnimations:ItemsReorderAnimation.Duration)" Value="{StaticResource ControlNormalAnimationDuration}" />
<Setter Target="AlbumGridView.(ctAnimations:ItemsReorderAnimation.Duration)" Value="{StaticResource ControlNormalAnimationDuration}" />
<Setter Target="VideosGridView.(ctAnimations:ItemsReorderAnimation.Duration)" Value="{StaticResource ControlNormalAnimationDuration}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</Page>
12 changes: 12 additions & 0 deletions Screenbox/Pages/Search/VideoSearchResultPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:behaviors="using:Screenbox.Behaviors"
xmlns:commands="using:Screenbox.Commands"
xmlns:controls="using:Screenbox.Controls"
xmlns:ctAnimations="using:CommunityToolkit.WinUI.Animations"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down Expand Up @@ -127,6 +128,17 @@
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="SystemEffectsStates">
<VisualState x:Name="AnimationsEnabled">
<VisualState.StateTriggers>
<StateTrigger IsActive="{x:Bind Common.AnimationsEnabled, Mode=OneWay}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="VideosGridView.(ctAnimations:ItemsReorderAnimation.Duration)" Value="{StaticResource ControlNormalAnimationDuration}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</Page>
Loading