Skip to content

Port loading animations and defer gallery sections #34

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
tobitege merged 1 commit into from
Jun 6, 2026
Merged

Port loading animations and defer gallery sections #34

Show file tree
Hide file tree
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
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2.0.7] - 2026-06-06

### Added

- **DaisyLoading**: Added segmented battery loading variants for charging and emptying states.
- **DaisyLoading**: Added directional traffic-light loading variants for up, right, down, and left cycles.
- **Gallery App**: Added examples for the new battery and traffic-light loading variants, including `DaisyIndicator` marker scenarios.
- **Gallery App**: Improved the browser Loading page by routing it to a dedicated view that loads later animation groups as they near the viewport.

## [2.0.6] - 2026-05-14

### Fixed
Expand Down
6 changes: 3 additions & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<Version Condition="'$(Version)' == ''">2.0.6</Version>
<AssemblyVersion Condition="'$(AssemblyVersion)' == ''">2.0.6.0</AssemblyVersion>
<FileVersion Condition="'$(FileVersion)' == ''">2.0.6.0</FileVersion>
<Version Condition="'$(Version)' == ''">2.0.7</Version>
<AssemblyVersion Condition="'$(AssemblyVersion)' == ''">2.0.7.0</AssemblyVersion>
<FileVersion Condition="'$(FileVersion)' == ''">2.0.7.0</FileVersion>
<BaseOutputPath>$(MSBuildThisFileDirectory)bin\$(Configuration)\</BaseOutputPath>
<BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
<OutputPath>$(BaseOutputPath)$(MSBuildProjectName)\</OutputPath>
Expand Down
37 changes: 18 additions & 19 deletions Flowery.NET.Gallery/Examples/FeedbackExamples.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,23 @@
<controls:DaisyLoading Variant="BriefcaseSpin" Size="ExtraLarge" Color="Accent" />
</StackPanel>
</StackPanel>
<StackPanel Spacing="10" Margin="0,0,40,12">
<TextBlock Text="Battery (charge/drain)" FontWeight="SemiBold" FontSize="14" Opacity="0.8"/>
<StackPanel Orientation="Horizontal" Spacing="16" VerticalAlignment="Center">
<controls:DaisyLoading Variant="BatteryCharging" Size="Medium" Color="Success" />
<controls:DaisyLoading Variant="BatteryEmptying" Size="Large" Color="Warning" />
<controls:DaisyLoading Variant="BatteryCharging" Size="ExtraLarge" Color="Primary" />
</StackPanel>
</StackPanel>
<StackPanel Spacing="10" Margin="0,0,40,12">
<TextBlock Text="TrafficLight (directional)" FontWeight="SemiBold" FontSize="14" Opacity="0.8"/>
<StackPanel Orientation="Horizontal" Spacing="16" VerticalAlignment="Center">
<controls:DaisyLoading Variant="TrafficLightUp" Size="Medium" />
<controls:DaisyLoading Variant="TrafficLightRight" Size="Large" />
<controls:DaisyLoading Variant="TrafficLightDown" Size="Large" />
<controls:DaisyLoading Variant="TrafficLightLeft" Size="ExtraLarge" />
</StackPanel>
</StackPanel>
</WrapPanel>
</StackPanel>
</Border>
Expand Down Expand Up @@ -504,25 +521,7 @@
<controls:DaisyDivider />

<!-- Progress (Linear) -->
<StackPanel Spacing="12">
<local:SectionHeader SectionId="progress" Title="Progress (Linear)" />
<WrapPanel Orientation="Horizontal">
<StackPanel Spacing="10" Margin="0,0,40,20" Width="200">
<TextBlock Text="Variants and sizes" FontWeight="SemiBold" FontSize="14" Opacity="0.8"/>
<controls:DaisyProgress Value="40" />
<controls:DaisyProgress Value="70" Variant="Primary" />
<controls:DaisyProgress Value="100" Variant="Accent" Size="Small" />
<controls:DaisyProgress IsIndeterminate="True" Variant="Secondary" />
</StackPanel>
<StackPanel Spacing="10" Margin="0,0,40,20" Width="260">
<TextBlock Text="Animated value updates" FontWeight="SemiBold" FontSize="14" Opacity="0.8"/>
<Slider x:Name="ProgressDemoSlider" Minimum="0" Maximum="100" Value="40" />
<TextBlock Text="{Binding Value, ElementName=ProgressDemoSlider, StringFormat={}{0:0}%}" Opacity="0.7" controls:FlowerySizeManager.ResponsiveFont="Secondary" />
<controls:DaisyProgress Value="{Binding Value, ElementName=ProgressDemoSlider}" />
<controls:DaisyProgress Value="{Binding Value, ElementName=ProgressDemoSlider}" Variant="Primary" />
</StackPanel>
</WrapPanel>
</StackPanel>
<local:ProgressSection />

<controls:DaisyDivider />

Expand Down
2 changes: 1 addition & 1 deletion Flowery.NET.Gallery/Examples/FeedbackExamples.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Avalonia;
Expand Down
37 changes: 37 additions & 0 deletions Flowery.NET.Gallery/Examples/LayoutExamples.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,43 @@
<controls:DaisyButton Content="Inbox" Variant="Primary" Size="Large" />
</controls:DaisyIndicator>
</StackPanel>

<StackPanel Spacing="10" Margin="0,0,24,16">
<controls:DaisyIndicator MarkerPosition="TopRight" MarkerAlignment="Outside">
<controls:DaisyIndicator.Marker>
<Border Width="28" Height="28"
CornerRadius="14"
Background="{DynamicResource DaisyBase100Brush}"
BorderBrush="{DynamicResource DaisySuccessBrush}"
BorderThickness="1"
Padding="4">
<controls:DaisyLoading Variant="BatteryCharging"
Size="Small"
Color="Success"
controls:FlowerySizeManager.IgnoreGlobalSize="True" />
</Border>
</controls:DaisyIndicator.Marker>
<controls:DaisyButton Content="Device" ButtonStyle="Outline" Size="Large" />
</controls:DaisyIndicator>
</StackPanel>

<StackPanel Spacing="10" Margin="0,0,24,16">
<controls:DaisyIndicator MarkerPosition="BottomLeft" MarkerAlignment="Edge">
<controls:DaisyIndicator.Marker>
<Border Width="28" Height="28"
CornerRadius="14"
Background="{DynamicResource DaisyBase100Brush}"
BorderBrush="{DynamicResource DaisyInfoBrush}"
BorderThickness="1"
Padding="3">
<controls:DaisyLoading Variant="TrafficLightRight"
Size="Small"
controls:FlowerySizeManager.IgnoreGlobalSize="True" />
</Border>
</controls:DaisyIndicator.Marker>
<controls:DaisyButton Content="Queue" Variant="Info" Size="Large" />
</controls:DaisyIndicator>
</StackPanel>
</WrapPanel>
</StackPanel>

Expand Down
Loading
Loading