From b11fd13913f83b6b035e52622860855716ef1ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?= <kovacsadam07@outlook.hu>
Date: Tue, 11 Jul 2023 17:59:29 +0200
Subject: [PATCH] Timeline view animation

---
 .../Timeline/ParallelCommands.cs              |   1 +
 .../CommandScheduler.cs                       |  30 +++--
 .../FileTime.GuiApp/FileTime.GuiApp.csproj    |   3 +-
 .../FileTime.GuiApp/Views/MainWindow.axaml    | 122 ++++++++++++------
 4 files changed, 104 insertions(+), 52 deletions(-)

diff --git a/src/Core/FileTime.Core.Abstraction/Timeline/ParallelCommands.cs b/src/Core/FileTime.Core.Abstraction/Timeline/ParallelCommands.cs
index 85c90b1..bba72dd 100644
--- a/src/Core/FileTime.Core.Abstraction/Timeline/ParallelCommands.cs
+++ b/src/Core/FileTime.Core.Abstraction/Timeline/ParallelCommands.cs
@@ -16,6 +16,7 @@ public class ParallelCommands : IDisposable
     public IObservable<IChangeSet<CommandTimeState>> Commands { get; }
 
     public BindedCollection<CommandTimeState> CommandsCollection { get; }
+    public int CommandCount => _commands.Count;
 
     public PointInTime? Result { get; private set; }
 
diff --git a/src/Core/FileTime.Core.Timeline/CommandScheduler.cs b/src/Core/FileTime.Core.Timeline/CommandScheduler.cs
index 83478f8..cc9bc73 100644
--- a/src/Core/FileTime.Core.Timeline/CommandScheduler.cs
+++ b/src/Core/FileTime.Core.Timeline/CommandScheduler.cs
@@ -115,18 +115,28 @@ public class CommandScheduler : ICommandScheduler
 
     private async void ExecutorOnCommandFinished(object? sender, ICommand command)
     {
-        var firstCommandBlock = _commandsToRun
-            .Items
-            .FirstOrDefault();
-        var state = firstCommandBlock
-            ?.CommandsCollection
-            .Collection
-            ?.FirstOrDefault(c => c.Command == command);
+        await RunWithLockAsync(async () =>
+        {
+            var firstCommandBlock = _commandsToRun
+                .Items
+                .FirstOrDefault();
+            var state = firstCommandBlock
+                ?.CommandsCollection
+                .Collection
+                ?.FirstOrDefault(c => c.Command == command);
 
-        if (state is null) return;
+            if (state is null) return;
 
-        state.ExecutionState = ExecutionState.Finished;
-        if (firstCommandBlock is not null) await firstCommandBlock.RemoveCommand(command);
+            state.ExecutionState = ExecutionState.Finished;
+            if (firstCommandBlock is not null)
+            {
+                await firstCommandBlock.RemoveCommand(command);
+                if (firstCommandBlock.CommandCount == 0)
+                {
+                    _commandsToRun.Remove(firstCommandBlock);
+                }
+            }
+        });
     }
 
     private async Task RefreshCommands()
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp/FileTime.GuiApp.csproj b/src/GuiApp/Avalonia/FileTime.GuiApp/FileTime.GuiApp.csproj
index 77da032..c341a5e 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp/FileTime.GuiApp.csproj
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp/FileTime.GuiApp.csproj
@@ -25,8 +25,9 @@
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Svg.Skia" Version="11.0.0-rc1.1" />
+    <PackageReference Include="Avalonia.Svg.Skia" Version="11.0.0" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
+    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="MvvmGen" Version="1.2.1" />
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml b/src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml
index c047282..5005ddc 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml
@@ -1,4 +1,4 @@
-<Window
+<Window
     Background="Transparent"
     Closed="OnWindowClosed"
     ExtendClientAreaToDecorationsHint="True"
@@ -23,6 +23,8 @@
     xmlns:config="using:FileTime.GuiApp.Configuration"
     xmlns:corevm="using:FileTime.App.Core.ViewModels"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
+    xmlns:ia="clr-namespace:Avalonia.Xaml.Interactions.Core;assembly=Avalonia.Xaml.Interactions"
     xmlns:interactions="using:FileTime.Core.Interactions"
     xmlns:local="using:FileTime.GuiApp.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -258,46 +260,84 @@
                     Grid.Row="1"
                     RowDefinitions="Auto,40,*,Auto">
 
-                    <Grid>
-                        <ItemsControl ItemsSource="{Binding AppState.TimelineViewModel.ParallelCommandsGroups.Collection}">
-                            <ItemsControl.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <StackPanel Orientation="Horizontal" />
-                                </ItemsPanelTemplate>
-                            </ItemsControl.ItemsPanel>
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate>
-                                    <Border
-                                        Background="{DynamicResource ContainerBackgroundColor}"
-                                        CornerRadius="10"
-                                        Margin="0,0,10,0"
-                                        MaxHeight="200"
-                                        Padding="5">
-                                        <ScrollViewer>
-                                            <ItemsControl ItemsSource="{Binding Commands.Collection}">
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <Border BorderThickness="1" Classes.SelectedTimelineCommand="{Binding IsSelected}">
-                                                            <StackPanel>
-                                                                <TextBlock Text="{Binding DisplayLabel^}" />
-                                                                <ProgressBar
-                                                                    Margin="0,5,0,0"
-                                                                    Maximum="100"
-                                                                    Value="{Binding CurrentProgress^}" />
-                                                                <ProgressBar
-                                                                    Margin="0,5,0,0"
-                                                                    Maximum="100"
-                                                                    Value="{Binding TotalProgress^}" />
-                                                            </StackPanel>
-                                                        </Border>
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
-                                        </ScrollViewer>
-                                    </Border>
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
-                        </ItemsControl>
+                    <Grid x:Name="CommandGroupsContainer">
+                        <Grid.Transitions>
+                            <Transitions>
+                                <DoubleTransition Duration="0:0:.2" Property="Height" />
+                            </Transitions>
+                        </Grid.Transitions>
+                        <i:Interaction.Behaviors>
+                            <ia:DataTriggerBehavior
+                                Binding="{Binding #CommandGroups.ItemCount}"
+                                ComparisonCondition="GreaterThan"
+                                Value="0">
+                                <ia:ChangePropertyAction
+                                    PropertyName="Height"
+                                    TargetObject="CommandGroupsContainer"
+                                    Value="180" />
+                            </ia:DataTriggerBehavior>
+                            <ia:DataTriggerBehavior
+                                Binding="{Binding #CommandGroups.ItemCount}"
+                                ComparisonCondition="LessThanOrEqual"
+                                Value="0">
+                                <ia:ChangePropertyAction
+                                    PropertyName="Height"
+                                    TargetObject="CommandGroupsContainer"
+                                    Value="0" />
+                            </ia:DataTriggerBehavior>
+                        </i:Interaction.Behaviors>
+                        <Grid ColumnDefinitions="Auto,10">
+                            <ItemsControl
+                                ItemsSource="{Binding AppState.TimelineViewModel.ParallelCommandsGroups.Collection}"
+                                VerticalAlignment="Top"
+                                x:Name="CommandGroups">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <StackPanel Orientation="Horizontal" />
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Border
+                                            Background="{DynamicResource ContainerBackgroundColor}"
+                                            CornerRadius="10"
+                                            Height="50"
+                                            Margin="0,0,10,0"
+                                            Padding="5">
+                                            <ScrollViewer>
+                                                <ItemsControl ItemsSource="{Binding Commands.Collection}">
+                                                    <ItemsControl.ItemTemplate>
+                                                        <DataTemplate>
+                                                            <Border BorderThickness="1" Classes.SelectedTimelineCommand="{Binding IsSelected}">
+                                                                <StackPanel>
+                                                                    <TextBlock Text="{Binding DisplayLabel^}" />
+                                                                    <ProgressBar
+                                                                        Margin="0,5,0,0"
+                                                                        Maximum="100"
+                                                                        Value="{Binding CurrentProgress^}" />
+                                                                    <ProgressBar
+                                                                        Margin="0,5,0,0"
+                                                                        Maximum="100"
+                                                                        Value="{Binding TotalProgress^}" />
+                                                                </StackPanel>
+                                                            </Border>
+                                                        </DataTemplate>
+                                                    </ItemsControl.ItemTemplate>
+                                                </ItemsControl>
+                                            </ScrollViewer>
+                                        </Border>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+
+                            <Rectangle
+                                Fill="{DynamicResource ContentSeparatorBrush}"
+                                Grid.Column="1"
+                                HorizontalAlignment="Center"
+                                Margin="0,10,0,10"
+                                VerticalAlignment="Stretch"
+                                Width="1" />
+                        </Grid>
                     </Grid>
 
                     <ItemsControl Grid.Row="1" ItemsSource="{Binding AppState.Tabs}">