Skip to content
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

fix: fix build after updating themes #1075

Merged
merged 4 commits into from
Feb 2, 2024
Merged

fix: fix build after updating themes #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66ce1e6
fix: fix build after updating themes
kazo0 Jan 31, 2024
3538a70
chore: whitespace
kazo0 Jan 31, 2024
5335b47
build: packages
kazo0 Feb 1, 2024
765146a
chore: update themes
kazo0 Feb 1, 2024
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
124 changes: 62 additions & 62 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="CommunityToolkit.WinUI.Lottie" Version="7.1.2" />
<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageVersion Include="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23067.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageVersion Include="Microsoft.TypeScript.Compiler" Version="3.1.5" />
<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="4.6.4" />
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="6.0.6" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.3.230502000" />
<PackageVersion Include="NUnit" Version="3.13.3" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageVersion Include="NunitXml.TestLogger" Version="3.0.131" />
<PackageVersion Include="nventive.Nimue.Application.Packaging" Version="0.1.0-alpha.58" />
<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.6" />
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
<PackageVersion Include="Svg.Skia" Version="1.0.0.1" />
<PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200-dev.13.gef3f523648" />
<PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.200-dev.13.gef3f523648" />
<PackageVersion Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageVersion Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageVersion Include="Uno.Cupertino.WinUI" Version="4.1.0" />
<PackageVersion Include="Uno.Diagnostics.Eventing" Version="2.1.0-dev.1" />
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.6.0-dev.2" />
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.6.0-dev.2" />
<PackageVersion Include="Uno.Fonts.Fluent" Version="2.3.0" />
<PackageVersion Include="Uno.Material.WinUI" Version="4.1.0" />
<PackageVersion Include="Uno.ShowMeTheXAML" Version="2.0.0-dev0015" />
<PackageVersion Include="Uno.ShowMeTheXAML.MSBuild" Version="2.0.0-dev0015" />
<PackageVersion Include="Uno.Toolkit.Skia.WinUI" Version="5.1.3" />
<PackageVersion Include="Uno.Toolkit.WinUI" Version="5.1.3" />
<PackageVersion Include="Uno.Toolkit.WinUI.Cupertino" Version="5.1.3" />
<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.1.3" />
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.1.31" />
<PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.70" />
<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="9.0.0-dev.27" />
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.27" />
<PackageVersion Include="Uno.WinUI" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.Lottie" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.MediaPlayer.Skia.Gtk" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.MediaPlayer.WebAssembly" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.RemoteControl" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.Svg" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.1.31" />
<PackageVersion Include="VideoLAN.LibVLC.Windows" Version="3.0.18" />
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.6.0" />
<PackageVersion Include="Xamarin.UITest" Version="4.1.4" />
<PackageVersion Include="Xamarin.TestCloud.Agent" Version="0.23.2" />
</ItemGroup>
</Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="CommunityToolkit.WinUI.Lottie" Version="7.1.2" />
<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageVersion Include="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23067.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageVersion Include="Microsoft.TypeScript.Compiler" Version="3.1.5" />
<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="4.6.4" />
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="6.0.6" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.3.230502000" />
<PackageVersion Include="NUnit" Version="3.13.3" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageVersion Include="NunitXml.TestLogger" Version="3.0.131" />
<PackageVersion Include="nventive.Nimue.Application.Packaging" Version="0.1.0-alpha.58" />
<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.6" />
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
<PackageVersion Include="Svg.Skia" Version="1.0.0.1" />
<PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200-dev.13.gef3f523648" />
<PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.200-dev.13.gef3f523648" />
<PackageVersion Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageVersion Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageVersion Include="Uno.Cupertino.WinUI" Version="4.2.0-dev.9" />
<PackageVersion Include="Uno.Diagnostics.Eventing" Version="2.1.0-dev.1" />
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.6.0-dev.2" />
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.6.0-dev.2" />
<PackageVersion Include="Uno.Fonts.Fluent" Version="2.3.0" />
<PackageVersion Include="Uno.Material.WinUI" Version="4.2.0-dev.9" />
<PackageVersion Include="Uno.ShowMeTheXAML" Version="2.0.0-dev0015" />
<PackageVersion Include="Uno.ShowMeTheXAML.MSBuild" Version="2.0.0-dev0015" />
<PackageVersion Include="Uno.Toolkit.Skia.WinUI" Version="5.2.0-dev.9" />
<PackageVersion Include="Uno.Toolkit.WinUI" Version="5.2.0-dev.9" />
<PackageVersion Include="Uno.Toolkit.WinUI.Cupertino" Version="5.2.0-dev.9" />
<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.2.0-dev.9" />
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.1.31" />
<PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.70" />
<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="9.0.0-dev.27" />
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.27" />
<PackageVersion Include="Uno.WinUI" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.Lottie" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.MediaPlayer.Skia.Gtk" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.MediaPlayer.WebAssembly" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.RemoteControl" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.Svg" Version="5.1.31" />
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.1.31" />
<PackageVersion Include="VideoLAN.LibVLC.Windows" Version="3.0.18" />
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.6.0" />
<PackageVersion Include="Xamarin.UITest" Version="4.1.4" />
<PackageVersion Include="Xamarin.TestCloud.Agent" Version="0.23.2" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/OverviewPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:android="http:/uno.ui/android"
xmlns:converters="using:Uno.Gallery.Converters"
xmlns:um="using:Uno.Material"
xmlns:ut="using:Uno.Themes"
xmlns:local="using:Uno.Gallery"
xmlns:ios="http:/uno.ui/ios"
xmlns:wasm="http:/uno.ui/wasm"
Expand Down Expand Up @@ -65,19 +65,19 @@
<TextBox PlaceholderText="Filled with icon"
AutomationProperties.AutomationId="Material_FilledIconTextBox"
Style="{StaticResource FilledTextBoxStyle}">
<um:ControlExtensions.Icon>
<ut:ControlExtensions.Icon>
<SymbolIcon Symbol="Favorite" />
</um:ControlExtensions.Icon>
</ut:ControlExtensions.Icon>
</TextBox>
<TextBox PlaceholderText="Outlined"
AutomationProperties.AutomationId="Material_OutlinedTextBox"
Style="{StaticResource OutlinedTextBoxStyle}" />
<TextBox PlaceholderText="Outlined with icon"
AutomationProperties.AutomationId="Material_OutlinedWithIconTextBox"
Style="{StaticResource OutlinedTextBoxStyle}">
<um:ControlExtensions.Icon>
<ut:ControlExtensions.Icon>
<SymbolIcon Symbol="Favorite" />
</um:ControlExtensions.Icon>
</ut:ControlExtensions.Icon>
</TextBox>

</StackPanel>
Expand Down
22 changes: 11 additions & 11 deletions Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ButtonSamplePage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:local="using:Uno.Gallery"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:um="using:Uno.Material"
xmlns:ut="using:Uno.Themes"
xmlns:smtx="using:ShowMeTheXAML"
xmlns:todo="what should be done"
mc:Ignorable="d todo">
Expand All @@ -26,9 +26,9 @@

<Button Content="ELEVATED" Style="{StaticResource ElevatedButtonStyle}" />
<Button Content="ICON ELEVATED" Style="{StaticResource ElevatedButtonStyle}">
<um:ControlExtensions.Icon>
<ut:ControlExtensions.Icon>
<PathIcon Data="M3,3H18V18H3V3M19,19H21V21H19V19M19,16H21V18H19V16M19,13H21V15H19V13M19,10H21V12H19V10M19,7H21V9H19V7M16,19H18V21H16V19M13,19H15V21H13V19M10,19H12V21H10V19M7,19H9V21H7V19Z" />
</um:ControlExtensions.Icon>
</ut:ControlExtensions.Icon>
</Button>
<Button Content="ELEVATED DISABLED"
IsEnabled="False"
Expand All @@ -46,9 +46,9 @@

<Button Content="FILLED" Style="{StaticResource FilledButtonStyle}" />
<Button Content="FILLED" Style="{StaticResource FilledButtonStyle}">
<um:ControlExtensions.Icon>
<ut:ControlExtensions.Icon>
<PathIcon Data="M21 3C21.53 3 22.04 3.21 22.41 3.59C22.79 3.96 23 4.47 23 5V15C23 15.53 22.79 16.04 22.41 16.41C22.04 16.79 21.53 17 21 17H7C6.47 17 5.96 16.79 5.59 16.41C5.21 16.04 5 15.53 5 15V5C5 4.47 5.21 3.96 5.59 3.59C5.96 3.21 6.47 3 7 3H21M3 19H18V21H3C2.47 21 1.96 20.79 1.59 20.41C1.21 20.04 1 19.53 1 19V8H3V19Z" />
</um:ControlExtensions.Icon>
</ut:ControlExtensions.Icon>
</Button>
<Button Content="FILLED DISABLED"
IsEnabled="False"
Expand All @@ -66,9 +66,9 @@

<Button Content="FILLED TONAL" Style="{StaticResource FilledTonalButtonStyle}" />
<Button Content="FILLED TONAL" Style="{StaticResource FilledTonalButtonStyle}">
<um:ControlExtensions.Icon>
<ut:ControlExtensions.Icon>
<PathIcon Data="M21 3C21.53 3 22.04 3.21 22.41 3.59C22.79 3.96 23 4.47 23 5V15C23 15.53 22.79 16.04 22.41 16.41C22.04 16.79 21.53 17 21 17H7C6.47 17 5.96 16.79 5.59 16.41C5.21 16.04 5 15.53 5 15V5C5 4.47 5.21 3.96 5.59 3.59C5.96 3.21 6.47 3 7 3H21M3 19H18V21H3C2.47 21 1.96 20.79 1.59 20.41C1.21 20.04 1 19.53 1 19V8H3V19Z" />
</um:ControlExtensions.Icon>
</ut:ControlExtensions.Icon>
</Button>
<Button Content="FILLED TONAL DISABLED"
IsEnabled="False"
Expand All @@ -86,9 +86,9 @@

<Button Content="OUTLINED" Style="{StaticResource OutlinedButtonStyle}" />
<Button Content="ICON OUTLINED" Style="{StaticResource OutlinedButtonStyle}">
<um:ControlExtensions.Icon>
<ut:ControlExtensions.Icon>
<PathIcon Data="M21 16V6H7V16H21M21 4C21.53 4 22.04 4.21 22.41 4.59C22.79 4.96 23 5.47 23 6V16C23 16.53 22.79 17.04 22.41 17.41C22.04 17.79 21.53 18 21 18H7C5.89 18 5 17.1 5 16V6C5 4.89 5.89 4 7 4H21M3 20H18V22H3C2.47 22 1.96 21.79 1.59 21.41C1.21 21.04 1 20.53 1 20V9H3V20Z" />
</um:ControlExtensions.Icon>
</ut:ControlExtensions.Icon>
</Button>
<Button Content="OUTLINED DISABLED"
IsEnabled="False"
Expand All @@ -106,9 +106,9 @@

<Button Content="TEXT" Style="{StaticResource TextButtonStyle}" />
<Button Content="ICON TEXT" Style="{StaticResource TextButtonStyle}">
<um:ControlExtensions.Icon>
<ut:ControlExtensions.Icon>
<PathIcon Data="M18.5,4L19.66,8.35L18.7,8.61C18.25,7.74 17.79,6.87 17.26,6.43C16.73,6 16.11,6 15.5,6H13V16.5C13,17 13,17.5 13.33,17.75C13.67,18 14.33,18 15,18V19H9V18C9.67,18 10.33,18 10.67,17.75C11,17.5 11,17 11,16.5V6H8.5C7.89,6 7.27,6 6.74,6.43C6.21,6.87 5.75,7.74 5.3,8.61L4.34,8.35L5.5,4H18.5Z" />
</um:ControlExtensions.Icon>
</ut:ControlExtensions.Icon>
</Button>
<Button Content="TEXT DISABLED"
IsEnabled="False"
Expand Down
6 changes: 3 additions & 3 deletions Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ComboBoxSamplePage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="using:Uno.Gallery"
xmlns:um="using:Uno.Material"
xmlns:ut="using:Uno.Themes"
xmlns:smtx="using:ShowMeTheXAML"
xmlns:android="http://uno.ui/android"
xmlns:ios="http://uno.ui/ios"
Expand Down Expand Up @@ -45,9 +45,9 @@
<ComboBox Style="{StaticResource ComboBoxStyle}"
PlaceholderText="ComboBox + Icon"
ItemsSource="{Binding Data.Items}">
<um:ControlExtensions.Icon>
<ut:ControlExtensions.Icon>
<SymbolIcon Symbol="Favorite" />
</um:ControlExtensions.Icon>
</ut:ControlExtensions.Icon>
</ComboBox>
<ComboBox Style="{StaticResource ComboBoxStyle}"
PlaceholderText="Disabled ComboBox"
Expand Down
Loading
Loading