Skip to content

Commit

Permalink
Avalonia 11.2 (#262)
Browse files Browse the repository at this point in the history 
* Update to 11.2

* Use Fabulous pre11

* WIP

* Remove SceneDelegate

* Use Fabulous pre12

* TimePicker page

* Use pre15

* PolyBezierSegment

* BoolTransition

* simplify widget constructors

* use Fabulous pre16

* Move RenderDemo pages to Gallery
  • Loading branch information
@edgarfgp
edgarfgp authored Nov 22, 2024
1 parent 731aabf commit bceb150
Show file tree
Hide file tree
Showing 303 changed files with 1,324 additions and 2,239 deletions.
26 changes: 13 additions & 13 deletions Directory.Packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Fabulous" Version="3.0.0-pre9" />
<PackageVersion Include="Avalonia.iOS" Version="11.2.1" />
<PackageVersion Include="Fabulous" Version="3.0.0-pre16" />
<PackageVersion Include="FsCheck.NUnit" Version="2.16.4" />
<PackageVersion Include="FSharp.Core" Version="8.0.301" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="NUnit" Version="3.13.3" />
<PackageVersion Include="FsUnit" Version="5.2.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="Avalonia" Version="11.1.0" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.1.0" />
<PackageVersion Include="Avalonia.Android" Version="11.1.0" />
<PackageVersion Include="Avalonia.iOS" Version="11.1.0" />
<PackageVersion Include="Avalonia.Desktop" Version="11.1.0" />
<PackageVersion Include="Avalonia.Browser" Version="11.1.0" />
<PackageVersion Include="Avalonia.Skia" Version="11.1.0" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.1.0" />
<PackageVersion Include="Avalonia.Controls.ItemsRepeater" Version="11.1.0" />
<PackageVersion Include="Avalonia.Controls.ColorPicker" Version="11.1.0" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.1.0" />
<PackageVersion Include="Avalonia" Version="11.2.1" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.2.1" />
<PackageVersion Include="Avalonia.Android" Version="11.2.1" />
<PackageVersion Include="Avalonia.iOS" Version="11.2.1" />
<PackageVersion Include="Avalonia.Desktop" Version="11.2.1" />
<PackageVersion Include="Avalonia.Browser" Version="11.2.1" />
<PackageVersion Include="Avalonia.Skia" Version="11.2.1" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.2.1" />
<PackageVersion Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
<PackageVersion Include="Avalonia.Controls.ColorPicker" Version="11.2.1" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.1" />
<PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.0.10" />
</ItemGroup>
</Project>
35 changes: 0 additions & 35 deletions Fabulous.Avalonia.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fabulous.Avalonia.ItemsRepe
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fabulous.Avalonia.TreeDataGrid", "extensions\Fabulous.Avalonia.TreeDataGrid\Fabulous.Avalonia.TreeDataGrid.fsproj", "{88BF2500-3A9E-406C-8726-40CE837D0F36}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "RenderDemo", "samples\RenderDemo\RenderDemo.fsproj", "{12DDD968-AFB5-4B24-B1EE-518C997E2FCF}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "RenderDemo.Android", "samples\RenderDemo.Android\RenderDemo.Android.fsproj", "{60B3D448-6CEF-4A27-B8FB-53FF2A19C4BC}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "RenderDemo.Browser", "samples\RenderDemo.Browser\RenderDemo.Browser.fsproj", "{E65144B7-CDCA-4AA9-93DB-2FF0C9EE2050}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "RenderDemo.Desktop", "samples\RenderDemo.Desktop\RenderDemo.Desktop.fsproj", "{3720F6BA-CD15-4D80-A7D5-5EDF762705E8}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "RenderDemo.iOS", "samples\RenderDemo.iOS\RenderDemo.iOS.fsproj", "{F739E63D-0B56-4E92-B8B4-440FA95E2A27}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Playground", "samples\Playground\Playground.fsproj", "{482078C3-C228-42A4-9778-1FE856A95D82}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fabulous.Avalonia.Diagnostics", "extensions\Fabulous.Avalonia.Diagnostics\Fabulous.Avalonia.Diagnostics.fsproj", "{C4B5FB7F-D3A9-46A7-9EDF-317914F7172A}"
Expand Down Expand Up @@ -107,26 +97,6 @@ Global
{88BF2500-3A9E-406C-8726-40CE837D0F36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{88BF2500-3A9E-406C-8726-40CE837D0F36}.Release|Any CPU.ActiveCfg = Release|Any CPU
{88BF2500-3A9E-406C-8726-40CE837D0F36}.Release|Any CPU.Build.0 = Release|Any CPU
{12DDD968-AFB5-4B24-B1EE-518C997E2FCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{12DDD968-AFB5-4B24-B1EE-518C997E2FCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{12DDD968-AFB5-4B24-B1EE-518C997E2FCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{12DDD968-AFB5-4B24-B1EE-518C997E2FCF}.Release|Any CPU.Build.0 = Release|Any CPU
{60B3D448-6CEF-4A27-B8FB-53FF2A19C4BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{60B3D448-6CEF-4A27-B8FB-53FF2A19C4BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{60B3D448-6CEF-4A27-B8FB-53FF2A19C4BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{60B3D448-6CEF-4A27-B8FB-53FF2A19C4BC}.Release|Any CPU.Build.0 = Release|Any CPU
{E65144B7-CDCA-4AA9-93DB-2FF0C9EE2050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E65144B7-CDCA-4AA9-93DB-2FF0C9EE2050}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E65144B7-CDCA-4AA9-93DB-2FF0C9EE2050}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E65144B7-CDCA-4AA9-93DB-2FF0C9EE2050}.Release|Any CPU.Build.0 = Release|Any CPU
{3720F6BA-CD15-4D80-A7D5-5EDF762705E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3720F6BA-CD15-4D80-A7D5-5EDF762705E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3720F6BA-CD15-4D80-A7D5-5EDF762705E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3720F6BA-CD15-4D80-A7D5-5EDF762705E8}.Release|Any CPU.Build.0 = Release|Any CPU
{F739E63D-0B56-4E92-B8B4-440FA95E2A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F739E63D-0B56-4E92-B8B4-440FA95E2A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F739E63D-0B56-4E92-B8B4-440FA95E2A27}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F739E63D-0B56-4E92-B8B4-440FA95E2A27}.Release|Any CPU.Build.0 = Release|Any CPU
{482078C3-C228-42A4-9778-1FE856A95D82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{482078C3-C228-42A4-9778-1FE856A95D82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{482078C3-C228-42A4-9778-1FE856A95D82}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -145,11 +115,6 @@ Global
{F78C6BA2-5867-442D-AAC7-81110892AE05} = {B672FB45-6577-4721-8711-0EC28EE2E834}
{AFA2343C-1250-4B81-9E6F-48001BA9A516} = {B672FB45-6577-4721-8711-0EC28EE2E834}
{88BF2500-3A9E-406C-8726-40CE837D0F36} = {B672FB45-6577-4721-8711-0EC28EE2E834}
{12DDD968-AFB5-4B24-B1EE-518C997E2FCF} = {8D513303-98F9-40AA-AFA7-D92D920F96DF}
{60B3D448-6CEF-4A27-B8FB-53FF2A19C4BC} = {8D513303-98F9-40AA-AFA7-D92D920F96DF}
{E65144B7-CDCA-4AA9-93DB-2FF0C9EE2050} = {8D513303-98F9-40AA-AFA7-D92D920F96DF}
{3720F6BA-CD15-4D80-A7D5-5EDF762705E8} = {8D513303-98F9-40AA-AFA7-D92D920F96DF}
{F739E63D-0B56-4E92-B8B4-440FA95E2A27} = {8D513303-98F9-40AA-AFA7-D92D920F96DF}
{482078C3-C228-42A4-9778-1FE856A95D82} = {8D513303-98F9-40AA-AFA7-D92D920F96DF}
{C4B5FB7F-D3A9-46A7-9EDF-317914F7172A} = {B672FB45-6577-4721-8711-0EC28EE2E834}
EndGlobalSection
Expand Down
4 changes: 2 additions & 2 deletions extensions/Fabulous.Avalonia.ColorPicker/ColorPicker.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ module ColorPickerBuilders =

/// <summary>Creates a ColorPicker widget.</summary>
static member ColorPicker() =
WidgetBuilder<'msg, IFabColorPicker>(ColorPicker.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
WidgetBuilder<'msg, IFabColorPicker>(ColorPicker.WidgetKey)

/// <summary>Creates a ColorPicker widget.</summary>
/// <param name="color">The Color value.</param>
static member ColorPicker(color: Color) =
WidgetBuilder<'msg, IFabColorPicker>(ColorPicker.WidgetKey, AttributesBundle(StackList.one(ColorView.Color.WithValue(color)), ValueNone, ValueNone))
WidgetBuilder<'msg, IFabColorPicker>(ColorPicker.WidgetKey, ColorView.Color.WithValue(color))

type ColorPickerModifiers =
/// <summary>Link a ViewRef to access the direct ColorPicker control instance</summary>
Expand Down
2 changes: 1 addition & 1 deletion extensions/Fabulous.Avalonia.ColorPicker/ColorPreviewer.Components.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ open Fabulous.Avalonia

module ComponentColorPreviewer =
let ColorChanged =
Attributes.defineEventNoDispatch "ColorPreviewer_ColorChanged" (fun target -> (target :?> ColorPreviewer).ColorChanged)
Attributes.Component.defineEvent "ColorPreviewer_ColorChanged" (fun target -> (target :?> ColorPreviewer).ColorChanged)

[<AutoOpen>]
module ComponentColorPreviewerBuilders =
Expand Down
2 changes: 1 addition & 1 deletion extensions/Fabulous.Avalonia.ColorPicker/ColorPreviewer.Mvu.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ open Fabulous.Avalonia

module MvuColorPreviewer =
let ColorChanged =
Attributes.defineEvent "ColorPreviewer_ColorChanged" (fun target -> (target :?> ColorPreviewer).ColorChanged)
Attributes.Mvu.defineEvent "ColorPreviewer_ColorChanged" (fun target -> (target :?> ColorPreviewer).ColorChanged)

[<AutoOpen>]
module MvuColorPreviewerBuilders =
Expand Down
2 changes: 1 addition & 1 deletion extensions/Fabulous.Avalonia.ColorPicker/ColorPreviewer.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module ColorPreviewerBuilders =

/// <summary>Creates a ColorPreviewer widget.</summary>
static member ColorPreviewer() =
WidgetBuilder<'msg, IFabColorPreviewer>(ColorPreviewer.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
WidgetBuilder<'msg, IFabColorPreviewer>(ColorPreviewer.WidgetKey)


type ColorPreviewerModifiers =
Expand Down
2 changes: 1 addition & 1 deletion extensions/Fabulous.Avalonia.ColorPicker/ColorSlider.Components.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ open Fabulous.Avalonia

module ComponentColorSlider =
let ColorChanged =
Attributes.defineAvaloniaPropertyWithChangedEventNoDispatch' "ColorSlider_ColorChanged" ColorSlider.ColorProperty
Attributes.Component.defineAvaloniaPropertyWithChangedEvent' "ColorSlider_ColorChanged" ColorSlider.ColorProperty

[<AutoOpen>]
module ComponentColorSliderBuilders =
Expand Down
2 changes: 1 addition & 1 deletion extensions/Fabulous.Avalonia.ColorPicker/ColorSlider.Mvu.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ open Fabulous.StackAllocatedCollections.StackList

module MvuColorSlider =
let ColorChanged =
Attributes.defineAvaloniaPropertyWithChangedEvent' "ColorSlider_ColorChanged" ColorSlider.ColorProperty
Attributes.Mvu.defineAvaloniaPropertyWithChangedEvent' "ColorSlider_ColorChanged" ColorSlider.ColorProperty

[<AutoOpen>]
module MvuColorSliderBuilders =
Expand Down
7 changes: 2 additions & 5 deletions extensions/Fabulous.Avalonia.ColorPicker/ColorSlider.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,12 @@ module ColorSliderBuilders =

/// <summary>Creates a ColorSlider widget.</summary>
static member ColorSlider() =
WidgetBuilder<'msg, IFabColorSlider>(ColorSlider.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
WidgetBuilder<'msg, IFabColorSlider>(ColorSlider.WidgetKey)

/// <summary>Creates a ColorSlider widget.</summary>
/// <param name="color">The Color value.</param>
static member ColorSlider(color: Color) =
WidgetBuilder<'msg, IFabColorSlider>(
ColorSlider.WidgetKey,
AttributesBundle(StackList.one(ColorSlider.Color.WithValue(color)), ValueNone, ValueNone)
)
WidgetBuilder<'msg, IFabColorSlider>(ColorSlider.WidgetKey, ColorSlider.Color.WithValue(color))

type ColorSliderModifiers =
/// <summary>Link a ViewRef to access the direct ColorSlider control instance</summary>
Expand Down
2 changes: 1 addition & 1 deletion extensions/Fabulous.Avalonia.ColorPicker/ColorSpectrum.Components.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ open Fabulous.Avalonia

module ComponentColorSpectrum =
let ColorChanged =
Attributes.defineAvaloniaPropertyWithChangedEventNoDispatch' "ColorSpectrum_ColorChanged" ColorSpectrum.ColorProperty
Attributes.Component.defineAvaloniaPropertyWithChangedEvent' "ColorSpectrum_ColorChanged" ColorSpectrum.ColorProperty

[<AutoOpen>]
module ComponentColorSpectrumBuilders =
Expand Down
2 changes: 1 addition & 1 deletion extensions/Fabulous.Avalonia.ColorPicker/ColorSpectrum.Mvu.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ open Fabulous.Avalonia

module MvuColorSpectrum =
let ColorChanged =
Attributes.defineAvaloniaPropertyWithChangedEvent' "ColorSpectrum_ColorChanged" ColorSpectrum.ColorProperty
Attributes.Mvu.defineAvaloniaPropertyWithChangedEvent' "ColorSpectrum_ColorChanged" ColorSpectrum.ColorProperty

[<AutoOpen>]
module MvuColorSpectrumBuilders =
Expand Down
7 changes: 2 additions & 5 deletions extensions/Fabulous.Avalonia.ColorPicker/ColorSpectrum.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,12 @@ module ColorSpectrumBuilders =

/// <summary>Creates a ColorSpectrum widget.</summary>
static member ColorSpectrum() =
WidgetBuilder<'msg, IFabColorSpectrum>(ColorSpectrum.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
WidgetBuilder<'msg, IFabColorSpectrum>(ColorSpectrum.WidgetKey)

/// <summary>Creates a ColorSpectrum widget.</summary>
/// <param name="color">The Color value.</param>
static member ColorSpectrum(color: Color) =
WidgetBuilder<'msg, IFabColorSpectrum>(
ColorSpectrum.WidgetKey,
AttributesBundle(StackList.one(ColorSpectrum.Color.WithValue(color)), ValueNone, ValueNone)
)
WidgetBuilder<'msg, IFabColorSpectrum>(ColorSpectrum.WidgetKey, ColorSpectrum.Color.WithValue(color))

type ColorSpectrumModifiers =
/// <summary>Link a ViewRef to access the direct ColorSpectrum control instance</summary>
Expand Down
2 changes: 1 addition & 1 deletion extensions/Fabulous.Avalonia.ColorPicker/ColorView.Components.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ open Fabulous.Avalonia

module ComponentColorView =
let ColorChanged =
Attributes.defineAvaloniaPropertyWithChangedEventNoDispatch' "ColorView_ColorChanged" ColorView.ColorProperty
Attributes.Component.defineAvaloniaPropertyWithChangedEvent' "ColorView_ColorChanged" ColorView.ColorProperty

[<AutoOpen>]
module ComponentColorViewBuilders =
Expand Down
2 changes: 1 addition & 1 deletion extensions/Fabulous.Avalonia.ColorPicker/ColorView.Mvu.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ open Fabulous.Avalonia

module MvuColorView =
let ColorChanged =
Attributes.defineAvaloniaPropertyWithChangedEvent' "ColorView_ColorChanged" ColorView.ColorProperty
Attributes.Mvu.defineAvaloniaPropertyWithChangedEvent' "ColorView_ColorChanged" ColorView.ColorProperty

[<AutoOpen>]
module MvuColorViewBuilders =
Expand Down
4 changes: 2 additions & 2 deletions extensions/Fabulous.Avalonia.ColorPicker/ColorView.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ module ColorViewBuilders =

/// <summary>Creates a ColorView widget.</summary>
static member ColorView() =
WidgetBuilder<'msg, IFabColorView>(ColorView.WidgetKey, AttributesBundle(StackList.empty(), ValueNone, ValueNone))
WidgetBuilder<'msg, IFabColorView>(ColorView.WidgetKey)

/// <summary>Creates a ColorView widget.</summary>
/// <param name="color">The Color value.</param>
static member ColorView(color: Color) =
WidgetBuilder<'msg, IFabColorView>(ColorView.WidgetKey, AttributesBundle(StackList.one(ColorView.Color.WithValue(color)), ValueNone, ValueNone))
WidgetBuilder<'msg, IFabColorView>(ColorView.WidgetKey, ColorView.Color.WithValue(color))

type ColorViewModifiers =
/// <summary>Link a ViewRef to access the direct ColorView control instance</summary>
Expand Down
3 changes: 1 addition & 2 deletions extensions/Fabulous.Avalonia.ColorPicker/Fabulous.Avalonia.ColorPicker.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
<Compile Include="ColorPreviewer.Components.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia.Controls.ColorPicker" VersionOverride="11.1.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
<PackageReference Include="Avalonia.Controls.ColorPicker" VersionOverride="11.2.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Fabulous.Avalonia\Fabulous.Avalonia.fsproj" />
Expand Down
Loading

0 comments on commit bceb150

Please sign in to comment.