Skip to content

Commit

Permalink
Update to Avalonia 11.2.0-beta1 (WalletWasabi#13334)
Browse files Browse the repository at this point in the history
  • Loading branch information
@turbolay
turbolay authored Aug 22, 2024
1 parent 20555e8 commit 8261622
Show file tree
Hide file tree
Showing 8 changed files with 170 additions and 188 deletions.
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<AvaloniaVersion>11.1.3</AvaloniaVersion>
<AvaloniaVersion>11.2.0-beta1</AvaloniaVersion>
</PropertyGroup>
<ItemGroup>
<!-- AspNetCore. -->
Expand Down
182 changes: 88 additions & 94 deletions WalletWasabi.Fluent.Desktop/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
"net8.0": {
"Avalonia.Desktop": {
"type": "Direct",
"requested": "[11.1.3, )",
"resolved": "11.1.3",
"contentHash": "GwvshQIXyka+JUmmAtwLSRnpSJZUIxcrV0XeV3secwnbRzl6ekwFEChAxbKFjte177eA76E/SI/425AWZEL6/w==",
"requested": "[11.2.0-beta1, )",
"resolved": "11.2.0-beta1",
"contentHash": "IsHZ/0GZnve5yUkV6leIQ5VNUmpZ8FRjREKCk6Op5j4wVP4vxPW5FUmjv8fVajNl8MXR1ySM1rwRbeWxN0piDA==",
"dependencies": {
"Avalonia": "11.1.3",
"Avalonia.Native": "11.1.3",
"Avalonia.Skia": "11.1.3",
"Avalonia.Win32": "11.1.3",
"Avalonia.X11": "11.1.3"
"Avalonia": "11.2.0-beta1",
"Avalonia.Native": "11.2.0-beta1",
"Avalonia.Skia": "11.2.0-beta1",
"Avalonia.Win32": "11.2.0-beta1",
"Avalonia.X11": "11.2.0-beta1"
}
},
"Avalonia.ReactiveUI": {
"type": "Direct",
"requested": "[11.1.3, )",
"resolved": "11.1.3",
"contentHash": "MJQw+16d3ipzmlgPw+tMaNEWzYfU+LXS8ewkmKOxRD7HAL1SHHmEtd9YF1hk9n8qkz1kapg1PzAJwP+ZXsY7Ig==",
"requested": "[11.2.0-beta1, )",
"resolved": "11.2.0-beta1",
"contentHash": "A/7tGzbyKKa/K6YWrRt2ny+dZYYuLsB5uD1I+ckTA0la+Kk1BO7Pe/VpZnWEdCr7R4wVhjkdkz7eDMDQdN+TyQ==",
"dependencies": {
"Avalonia": "11.1.3",
"Avalonia": "11.2.0-beta1",
"ReactiveUI": "18.3.1",
"System.Reactive": "5.0.0"
}
Expand All @@ -44,70 +44,69 @@
},
"Avalonia.Controls.ColorPicker": {
"type": "Transitive",
"resolved": "11.1.3",
"contentHash": "xhFYsnGUz/9O9X0iNzpNg1S1D3D5RdeYmF7T9jgAeGme6gY76tFJCYSWozzvtTKhLLXgpj8v2bTnIxd2DBIH9w==",
"resolved": "11.2.0-beta1",
"contentHash": "19JkZsVVFOt4fZ7ADdRmCIFd9YqpPbI2xMzO8tbnD62h0yOCy2o2o8j726EuJf2+dqrLkd09o7387VnRdLvRbQ==",
"dependencies": {
"Avalonia": "11.1.3",
"Avalonia.Remote.Protocol": "11.1.3"
"Avalonia": "11.2.0-beta1",
"Avalonia.Remote.Protocol": "11.2.0-beta1"
}
},
"Avalonia.Controls.DataGrid": {
"type": "Transitive",
"resolved": "11.1.3",
"contentHash": "Ypqjb74jzhxAYGW6DumBvJaxOsB1IB5XcXHL5KfhgkvMZ5aW3ol3q7IBwScBvkffo2wgYaVvxkwyaDEuyjlrmQ==",
"resolved": "11.2.0-beta1",
"contentHash": "bF19Qim4Js8k1TcfL5FQVytzgayOb7dcy7yTHTs0Z9V5L6GpUq+/OgM97sLlhVrotJ8bTjHjNgsBZrQD1viAdw==",
"dependencies": {
"Avalonia": "11.1.3",
"Avalonia.Remote.Protocol": "11.1.3"
"Avalonia": "11.2.0-beta1",
"Avalonia.Remote.Protocol": "11.2.0-beta1"
}
},
"Avalonia.FreeDesktop": {
"type": "Transitive",
"resolved": "11.1.3",
"contentHash": "dK7wxP00bJwh/kaAkjqnaIMA0ugNuaCGE92bJMBTDzh6hUStzkPri76x+/m+TKeep4JGeqGkvFhB8x4PbTbUVg==",
"resolved": "11.2.0-beta1",
"contentHash": "wQkf8/HGcGgmP85653D8KjIgynQLJu1JhQC5xQ4yFCQGzHXaRfqDVtr7IC6E/vSofRPaDSwgr2ToK95E4XPWxw==",
"dependencies": {
"Avalonia": "11.1.3",
"Tmds.DBus.Protocol": "0.16.0"
"Avalonia": "11.2.0-beta1",
"Tmds.DBus.Protocol": "0.20.0"
}
},
"Avalonia.Native": {
"type": "Transitive",
"resolved": "11.1.3",
"contentHash": "eIFIIri3F/C/ZaCRJQg8Mmlm/PfWeGxo4AHkhIRc6MWS8v78fTR9MbN3GCzZAp+Eo8IqMPh4FnxsAEqtoGjdMA==",
"resolved": "11.2.0-beta1",
"contentHash": "zr2JgBAPEgQKgM7Xl6yTXbj6Lm+lKq2/b+pYZOVy2UOPp2zoL1pZv0sylkJKZemKTJ7NUCs5Ktro/zaZz5I8kw==",
"dependencies": {
"Avalonia": "11.1.3"
"Avalonia": "11.2.0-beta1"
}
},
"Avalonia.Remote.Protocol": {
"type": "Transitive",
"resolved": "11.1.3",
"contentHash": "ByXwboJC1jg13Qdxfs3/aX/yY4wi9n1XKT+a6+ckLnpSeesjQ0J6N1+wix7ISuGwFo0cyT0nXpvI4s2Zo+rkSA=="
"resolved": "11.2.0-beta1",
"contentHash": "4/KUy3LmmMh4YeD5RwpSq6IUuH36JGy6Vtf0sshRS+c+auIH7/coRLPCJVDXFfAyqaQnrAHZYk2sg9ngy8Pp+A=="
},
"Avalonia.Themes.Simple": {
"type": "Transitive",
"resolved": "11.1.3",
"contentHash": "R/bLBXRzcKiDqq6unUL9zHsPFrnJezj4hK2+6hDtmRnd+JEHizEV/aK/fotP//0WROYFz23fJqH0SG0BOlXX6w==",
"resolved": "11.2.0-beta1",
"contentHash": "m4tFas75rNKDZ14BnQxX8PALLToOfbqtttpijJl31fr4hjyY3x9ZopO8rlTMp9JKxWNxtcn0LuKMzx5F79kRzQ==",
"dependencies": {
"Avalonia": "11.1.3"
"Avalonia": "11.2.0-beta1"
}
},
"Avalonia.Win32": {
"type": "Transitive",
"resolved": "11.1.3",
"contentHash": "Rls4lqr67/3vSrZz5/H9QoxuAmRWdzDMtSitLPkFLZAttZ9MfyC4gIl2gpRx5EkTYSwTfqnVD7hdg0wHPP320Q==",
"resolved": "11.2.0-beta1",
"contentHash": "WiWgsVtYWxA5T60N6Guef2/a3AZXdDnpdcBvIvk2rhifq7O2oXDIRc2eD7AZ+JXCZdi7hURcAO9cw+3mu17zzA==",
"dependencies": {
"Avalonia": "11.1.3",
"Avalonia.Angle.Windows.Natives": "2.1.22045.20230930",
"System.Numerics.Vectors": "4.5.0"
"Avalonia": "11.2.0-beta1",
"Avalonia.Angle.Windows.Natives": "2.1.22045.20230930"
}
},
"Avalonia.X11": {
"type": "Transitive",
"resolved": "11.1.3",
"contentHash": "aFkg6ZH2Xob/R3jjF6hWEwFudI4sRXLIxriW6OsMdnJ2V3nXqspCasf8yBltfUEfrZzjaF8524SykBWP7uuRoA==",
"resolved": "11.2.0-beta1",
"contentHash": "OoOPIUq4kHk0OBD4ow8bIQWN2Zo7jNLox6roSaeodWLzCIm97K3rq0zd9lFhZWtWh4lJ+7zq2oSqXawdAMa0zA==",
"dependencies": {
"Avalonia": "11.1.3",
"Avalonia.FreeDesktop": "11.1.3",
"Avalonia.Skia": "11.1.3"
"Avalonia": "11.2.0-beta1",
"Avalonia.FreeDesktop": "11.2.0-beta1",
"Avalonia.Skia": "11.2.0-beta1"
}
},
"Avalonia.Xaml.Interactions": {
Expand Down Expand Up @@ -460,11 +459,6 @@
"resolved": "4.5.3",
"contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA=="
},
"System.Numerics.Vectors": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
},
"System.Reactive": {
"type": "Transitive",
"resolved": "6.0.0",
Expand All @@ -482,10 +476,10 @@
},
"Tmds.DBus.Protocol": {
"type": "Transitive",
"resolved": "0.16.0",
"contentHash": "9Ne9AvrRWrDQvzbMcbTz3EaGRE1vQmkeeu0Xp7Ii0Wdlhwfjst8FDRas+RBslU5kdPWs2aeMLErzyT1DwH9zeA==",
"resolved": "0.20.0",
"contentHash": "2gkt2kuYPhDKd8gtl34jZSJOnn4nRJfFngCDcTZT/uySbK++ua0YQx2418l9Rn1Y4dE5XNq6zG9ZsE5ltLlNNw==",
"dependencies": {
"System.IO.Pipelines": "6.0.0"
"System.IO.Pipelines": "8.0.0"
}
},
"walletwasabi": {
Expand All @@ -507,13 +501,13 @@
"walletwasabi.fluent": {
"type": "Project",
"dependencies": {
"Avalonia": "[11.1.3, )",
"Avalonia": "[11.2.0-beta1, )",
"Avalonia.Controls.TreeDataGrid": "[11.0.10, )",
"Avalonia.Diagnostics": "[11.1.3, )",
"Avalonia.Fonts.Inter": "[11.1.3, )",
"Avalonia.ReactiveUI": "[11.1.3, )",
"Avalonia.Skia": "[11.1.3, )",
"Avalonia.Themes.Fluent": "[11.1.3, )",
"Avalonia.Diagnostics": "[11.2.0-beta1, )",
"Avalonia.Fonts.Inter": "[11.2.0-beta1, )",
"Avalonia.ReactiveUI": "[11.2.0-beta1, )",
"Avalonia.Skia": "[11.2.0-beta1, )",
"Avalonia.Themes.Fluent": "[11.2.0-beta1, )",
"Avalonia.Xaml.Behaviors": "[11.1.0, )",
"DynamicData": "[8.1.1, )",
"QRackers": "[1.1.0, )",
Expand All @@ -531,12 +525,12 @@
},
"Avalonia": {
"type": "CentralTransitive",
"requested": "[11.1.3, )",
"resolved": "11.1.3",
"contentHash": "kpVAnKTbg/ZVnWyYLGPYXR0Ce4uiHLT1y6BcgJYpdFfn3b0TmvbxFZV37lpc1wEjUyaU28V+DoNnRbYSLsv0nw==",
"requested": "[11.2.0-beta1, )",
"resolved": "11.2.0-beta1",
"contentHash": "MH3isQzljF5egh6OsK9WdO6b+ouBrkIZ+Vgb5SzghLplbuXkxdkvAJ1oJs7HfaKaFFBqvaSaawTan63rpVFQuQ==",
"dependencies": {
"Avalonia.BuildServices": "0.0.29",
"Avalonia.Remote.Protocol": "11.1.3",
"Avalonia.Remote.Protocol": "11.2.0-beta1",
"MicroCom.Runtime": "0.11.0"
}
},
Expand All @@ -552,32 +546,32 @@
},
"Avalonia.Diagnostics": {
"type": "CentralTransitive",
"requested": "[11.1.3, )",
"resolved": "11.1.3",
"contentHash": "1oJQivGbnBJL2a1TpQEt5jfvdn5+iclDdRn6JzPu54oPHv48iTnulT6mlKPTe4L9JX/bUjJsxhZxcyTh6dhhqQ==",
"requested": "[11.2.0-beta1, )",
"resolved": "11.2.0-beta1",
"contentHash": "2YQAD/eiGiH7ADVlEPqX3uoNpnNCUE4ljmW6cAxTc3jzEKDhqSzXJ9g0cqenM00URDhceqP8w6OT6qVbV8+iKg==",
"dependencies": {
"Avalonia": "11.1.3",
"Avalonia.Controls.ColorPicker": "11.1.3",
"Avalonia.Controls.DataGrid": "11.1.3",
"Avalonia.Themes.Simple": "11.1.3"
"Avalonia": "11.2.0-beta1",
"Avalonia.Controls.ColorPicker": "11.2.0-beta1",
"Avalonia.Controls.DataGrid": "11.2.0-beta1",
"Avalonia.Themes.Simple": "11.2.0-beta1"
}
},
"Avalonia.Fonts.Inter": {
"type": "CentralTransitive",
"requested": "[11.1.3, )",
"resolved": "11.1.3",
"contentHash": "HN50EoZV/6vkPYEGOlugAeEUhzy9rgkmyiZmSCLXIX5XhfoHj5LerRjVkfttWEdjCYqDzeGq4EKOSGZDCblIUQ==",
"requested": "[11.2.0-beta1, )",
"resolved": "11.2.0-beta1",
"contentHash": "sPcQyYLpXWv2ArRswOPBzwO+nrk0qsQD5gt5x6KoeB0am1Mj5h00qWocqf+173HwzOE3+5uqhgRWRy6lOaMqXg==",
"dependencies": {
"Avalonia": "11.1.3"
"Avalonia": "11.2.0-beta1"
}
},
"Avalonia.Skia": {
"type": "CentralTransitive",
"requested": "[11.1.3, )",
"resolved": "11.1.3",
"contentHash": "TmRbtvZGjtS4Ir9bhzMH/7k8oH2bdgel+QzvG0mrP+7c423/BdSFqXle0mnyg6DCkwF+tbNPdnKHBqkLdssVqw==",
"requested": "[11.2.0-beta1, )",
"resolved": "11.2.0-beta1",
"contentHash": "0z9fkfoMjONHq8NYLfnX7ZiSjxcAWr1nlmXEfOBZilyvm3+aYyIAj0P6PgdHBC5aUPGtjoI6psTEvcXC7q2QvA==",
"dependencies": {
"Avalonia": "11.1.3",
"Avalonia": "11.2.0-beta1",
"HarfBuzzSharp": "7.3.0.2",
"HarfBuzzSharp.NativeAssets.Linux": "7.3.0.2",
"HarfBuzzSharp.NativeAssets.WebAssembly": "7.3.0.2",
Expand All @@ -588,11 +582,11 @@
},
"Avalonia.Themes.Fluent": {
"type": "CentralTransitive",
"requested": "[11.1.3, )",
"resolved": "11.1.3",
"contentHash": "/2O9HXnnqRVGQ6VUjLLOkCNQx1/gXu69yyzUmDgS13Q0LdbGaYUYzSnPFnIBtOABuVCmdwbu+W+YI6jSwnT0uw==",
"requested": "[11.2.0-beta1, )",
"resolved": "11.2.0-beta1",
"contentHash": "E1GMWc1+T9iZxRj2ioJwzgHQZwcfmGBM5bmvTp7SoKSUlNanhzKhJOOPPGQumkqRj6RbXhrXTTSf0bCjOCQVGQ==",
"dependencies": {
"Avalonia": "11.1.3"
"Avalonia": "11.2.0-beta1"
}
},
"Avalonia.Xaml.Behaviors": {
Expand Down Expand Up @@ -789,10 +783,10 @@
},
"Avalonia.Native": {
"type": "Transitive",
"resolved": "11.1.3",
"contentHash": "eIFIIri3F/C/ZaCRJQg8Mmlm/PfWeGxo4AHkhIRc6MWS8v78fTR9MbN3GCzZAp+Eo8IqMPh4FnxsAEqtoGjdMA==",
"resolved": "11.2.0-beta1",
"contentHash": "zr2JgBAPEgQKgM7Xl6yTXbj6Lm+lKq2/b+pYZOVy2UOPp2zoL1pZv0sylkJKZemKTJ7NUCs5Ktro/zaZz5I8kw==",
"dependencies": {
"Avalonia": "11.1.3"
"Avalonia": "11.2.0-beta1"
}
},
"HarfBuzzSharp.NativeAssets.Linux": {
Expand Down Expand Up @@ -904,10 +898,10 @@
},
"Avalonia.Native": {
"type": "Transitive",
"resolved": "11.1.3",
"contentHash": "eIFIIri3F/C/ZaCRJQg8Mmlm/PfWeGxo4AHkhIRc6MWS8v78fTR9MbN3GCzZAp+Eo8IqMPh4FnxsAEqtoGjdMA==",
"resolved": "11.2.0-beta1",
"contentHash": "zr2JgBAPEgQKgM7Xl6yTXbj6Lm+lKq2/b+pYZOVy2UOPp2zoL1pZv0sylkJKZemKTJ7NUCs5Ktro/zaZz5I8kw==",
"dependencies": {
"Avalonia": "11.1.3"
"Avalonia": "11.2.0-beta1"
}
},
"HarfBuzzSharp.NativeAssets.Linux": {
Expand Down Expand Up @@ -1019,10 +1013,10 @@
},
"Avalonia.Native": {
"type": "Transitive",
"resolved": "11.1.3",
"contentHash": "eIFIIri3F/C/ZaCRJQg8Mmlm/PfWeGxo4AHkhIRc6MWS8v78fTR9MbN3GCzZAp+Eo8IqMPh4FnxsAEqtoGjdMA==",
"resolved": "11.2.0-beta1",
"contentHash": "zr2JgBAPEgQKgM7Xl6yTXbj6Lm+lKq2/b+pYZOVy2UOPp2zoL1pZv0sylkJKZemKTJ7NUCs5Ktro/zaZz5I8kw==",
"dependencies": {
"Avalonia": "11.1.3"
"Avalonia": "11.2.0-beta1"
}
},
"HarfBuzzSharp.NativeAssets.Linux": {
Expand Down Expand Up @@ -1134,10 +1128,10 @@
},
"Avalonia.Native": {
"type": "Transitive",
"resolved": "11.1.3",
"contentHash": "eIFIIri3F/C/ZaCRJQg8Mmlm/PfWeGxo4AHkhIRc6MWS8v78fTR9MbN3GCzZAp+Eo8IqMPh4FnxsAEqtoGjdMA==",
"resolved": "11.2.0-beta1",
"contentHash": "zr2JgBAPEgQKgM7Xl6yTXbj6Lm+lKq2/b+pYZOVy2UOPp2zoL1pZv0sylkJKZemKTJ7NUCs5Ktro/zaZz5I8kw==",
"dependencies": {
"Avalonia": "11.1.3"
"Avalonia": "11.2.0-beta1"
}
},
"HarfBuzzSharp.NativeAssets.Linux": {
Expand Down Expand Up @@ -1249,10 +1243,10 @@
},
"Avalonia.Native": {
"type": "Transitive",
"resolved": "11.1.3",
"contentHash": "eIFIIri3F/C/ZaCRJQg8Mmlm/PfWeGxo4AHkhIRc6MWS8v78fTR9MbN3GCzZAp+Eo8IqMPh4FnxsAEqtoGjdMA==",
"resolved": "11.2.0-beta1",
"contentHash": "zr2JgBAPEgQKgM7Xl6yTXbj6Lm+lKq2/b+pYZOVy2UOPp2zoL1pZv0sylkJKZemKTJ7NUCs5Ktro/zaZz5I8kw==",
"dependencies": {
"Avalonia": "11.1.3"
"Avalonia": "11.2.0-beta1"
}
},
"HarfBuzzSharp.NativeAssets.Linux": {
Expand Down
2 changes: 1 addition & 1 deletion WalletWasabi.Fluent/Behaviors/DialogTransitionAttachedBehavior.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ private static void AnimateImplicit(Control control, TimeSpan opacityDuration, b

var scaleAnimation = compositor.CreateVector3KeyFrameAnimation();
scaleAnimation.Target = "Scale";
if (enableScale)
if (enableScale && false) // TODO: Remove when Avalonia fixes
{
scaleAnimation.InsertExpressionKeyFrame(0f, "Vector3(0.96+(1.0-0.96)*this.Target.Opacity, 0.96+(1.0-0.96)*this.Target.Opacity, 0)", fluentEasing);
scaleAnimation.InsertExpressionKeyFrame(1f, "Vector3(0.96+(1.0-0.96)*this.Target.Opacity, 0.96+(1.0-0.96)*this.Target.Opacity, 0)", fluentEasing);
Expand Down
4 changes: 2 additions & 2 deletions WalletWasabi.Fluent/Extensions/DateTimeExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ public static string ToUserFacingFriendlyString(this DateTime value)

if (value.Date == DateTime.Today)
{
return $"Today at {time}";
return $"Today, {time}";
}

if (value.Date == DateTime.Today.AddDays(-1))
{
return $"Yesterday at {time}";
return $"Yesterday, {time}";
}

return value.ToString("MMM d, yyyy");
Expand Down
12 changes: 2 additions & 10 deletions WalletWasabi.Fluent/Views/AddWallet/AddWalletPageView.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,8 @@
<Grid.Styles>
<Style Selector="TileButton">
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Width">
<Setter.Value>
<system:Double>NaN</system:Double>
</Setter.Value>
</Setter>
<Setter Property="Height">
<Setter.Value>
<system:Double>NaN</system:Double>
</Setter.Value>
</Setter>
<Setter Property="Width">NaN</Setter>
<Setter Property="Height">NaN</Setter>
<Setter Property="Margin" Value="10" />
<Setter Property="Template">
<ControlTemplate>
Expand Down
Loading

0 comments on commit 8261622

Please sign in to comment.