Browse Source

Added lottie loading indicator

Krzysztof Krysiński 1 year ago
parent
commit
3635c0378b

+ 1 - 0
src/PixiEditor.AvaloniaUI/PixiEditor.AvaloniaUI.csproj

@@ -25,6 +25,7 @@
         <PackageReference Include="AsyncImageLoader.Avalonia" Version="3.2.1" />
         <PackageReference Include="AsyncImageLoader.Avalonia" Version="3.2.1" />
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Headless" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Headless" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Labs.Lottie" Version="11.0.10.1" />
         <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
       <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
       <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
       <PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
       <PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />

+ 2 - 1
src/PixiEditor.AvaloniaUI/Views/Indicators/LoadingIndicator.axaml

@@ -2,7 +2,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:lottie="clr-namespace:Avalonia.Labs.Lottie;assembly=Avalonia.Labs.Lottie"
              mc:Ignorable="d" d:DesignWidth="50" d:DesignHeight="50"
              mc:Ignorable="d" d:DesignWidth="50" d:DesignHeight="50"
              x:Class="PixiEditor.AvaloniaUI.Views.Indicators.LoadingIndicator">
              x:Class="PixiEditor.AvaloniaUI.Views.Indicators.LoadingIndicator">
-    <Image Source="avares://PixiEditor.UI.Common/Assets/Processing.gif"/>
+    <lottie:Lottie Path="avares://PixiEditor.UI.Common/Assets/Animations/LoadingIndicator.json"/>
 </UserControl>
 </UserControl>

File diff suppressed because it is too large
+ 0 - 0
src/PixiEditor.UI.Common/Assets/Animations/LoadingIndicator.json


BIN
src/PixiEditor.UI.Common/Assets/Processing.gif


+ 1 - 1
src/PixiEditor.UI.Common/PixiEditor.UI.Common.csproj

@@ -7,9 +7,9 @@
     </PropertyGroup>
     </PropertyGroup>
 
 
     <ItemGroup>
     <ItemGroup>
+      <AvaloniaResource Include="Assets\Animations\LoadingIndicator.json" />
       <AvaloniaResource Include="Assets\ChevronDown.png" />
       <AvaloniaResource Include="Assets\ChevronDown.png" />
       <AvaloniaResource Include="Assets\PixiEditorLogo.png" />
       <AvaloniaResource Include="Assets\PixiEditorLogo.png" />
-      <AvaloniaResource Include="Assets\Processing.gif" />
       <None Remove="Assets\Fonts\Oxygen-Bold.ttf" />
       <None Remove="Assets\Fonts\Oxygen-Bold.ttf" />
       <None Remove="Assets\Fonts\Oxygen-Light.ttf" />
       <None Remove="Assets\Fonts\Oxygen-Light.ttf" />
       <None Remove="Assets\Fonts\Oxygen-Regular.ttf" />
       <None Remove="Assets\Fonts\Oxygen-Regular.ttf" />

Some files were not shown because too many files changed in this diff