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.

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

feat: add common theme constants library (Uno.Toolkit.WinUI.Themes.Markup) #437

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
5 changes: 3 additions & 2 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
<PackageVersion Include="Uno.Cupertino" Version="2.4.1" />
<PackageVersion Include="Uno.Cupertino.WinUI" Version="2.4.1" />
<PackageVersion Include="Uno.Extensions.Markup.Generators" Version="1.0.0-dev.125" />
<PackageVersion Include="Uno.WinUI.Markup" Version="4.6.0-dev.12" />
<PackageVersion Include="Uno.Themes.WinUI.Markup" Version="2.5.0-dev.3" />
<PackageVersion Include="Uno.WinUI.Markup" Version="4.6.0-dev.14" />
Comment on lines +12 to +13
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these will need to be updated due to breaking changes in Uno.Extensions.Markup. See unoplatform/Uno.Themes/pull/906

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's be sure to update these dependencies

<PackageVersion Include="Uno.Material" Version="2.4.1" />
<PackageVersion Include="Uno.Material.WinUI" Version="2.4.1" />
<PackageVersion Include="Uno.UI" Version="4.6.19" />
Expand All @@ -30,4 +31,4 @@
<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.4.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22518.1" />
</ItemGroup>
</Project>
</Project>
115 changes: 115 additions & 0 deletions src/Uno.Toolkit.sln
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{5D8F2DC4
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Markup", "Markup", "{558EEC70-D98E-491B-9652-F1376168004C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Toolkit.WinUI.Themes.Markup", "library\Uno.Toolkit.WinUI.Themes.Markup\Uno.Toolkit.WinUI.Themes.Markup.csproj", "{93E7BA9F-E1DE-48C6-8185-454942B6C034}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Android = Ad-Hoc|Android
Expand Down Expand Up @@ -2798,6 +2800,118 @@ Global
{83C3F373-8CAA-4127-9E7E-6474D9E9BCD4}.Release|WASM.ActiveCfg = Release|Any CPU
{83C3F373-8CAA-4127-9E7E-6474D9E9BCD4}.Release|x64.ActiveCfg = Release|Any CPU
{83C3F373-8CAA-4127-9E7E-6474D9E9BCD4}.Release|x86.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Android.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Android.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|macOS.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|macOS.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Packages.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Packages.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Packages_WinUI.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Packages_WinUI.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Samples.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Samples.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Samples_WinUI.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Samples_WinUI.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|WASM.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|WASM.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Android.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Android.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|ARM.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|ARM64.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|iPhone.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|macOS.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|macOS.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Packages.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Packages.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Packages_WinUI.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Packages_WinUI.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Samples.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Samples.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Samples_WinUI.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Samples_WinUI.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|WASM.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|WASM.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|x64.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|x64.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|x86.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|x86.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Android.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Android.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Any CPU.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|ARM.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|ARM.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|ARM64.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|iPhone.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|macOS.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|macOS.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Packages.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Packages.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Packages_WinUI.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Packages_WinUI.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Samples.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Samples.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Samples_WinUI.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Samples_WinUI.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|WASM.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|WASM.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|x64.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|x64.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|x86.ActiveCfg = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|x86.Build.0 = Debug|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Android.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Android.Build.0 = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Any CPU.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Any CPU.Build.0 = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|ARM.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|ARM.Build.0 = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|ARM64.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|ARM64.Build.0 = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|iPhone.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|iPhone.Build.0 = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|macOS.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|macOS.Build.0 = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Packages.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Packages.Build.0 = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Packages_WinUI.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Packages_WinUI.Build.0 = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Samples.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Samples.Build.0 = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Samples_WinUI.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Samples_WinUI.Build.0 = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|WASM.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|WASM.Build.0 = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|x64.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|x64.Build.0 = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|x86.ActiveCfg = Release|Any CPU
{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -2826,6 +2940,7 @@ Global
{04A5011F-DC76-4BD6-9994-FC1C9E937A6D} = {39BDC5B9-2807-409B-A8CB-B41B33E05C5D}
{83C3F373-8CAA-4127-9E7E-6474D9E9BCD4} = {558EEC70-D98E-491B-9652-F1376168004C}
{558EEC70-D98E-491B-9652-F1376168004C} = {39BDC5B9-2807-409B-A8CB-B41B33E05C5D}
{93E7BA9F-E1DE-48C6-8185-454942B6C034} = {558EEC70-D98E-491B-9652-F1376168004C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {EEF2F9D4-91C2-4F1A-BF0C-654FD02D3E2A}
Expand Down
5 changes: 5 additions & 0 deletions src/library/Uno.Toolkit.WinUI.Themes.Markup/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
using System.Reflection;
using Microsoft.UI.Xaml.MarkupHelpers.Internals;

[assembly: AssemblyMetadata("IsTrimmable", "True")]
[assembly: ResourceDefinitionClass(typeof(Uno.Toolkit.Themes.Markup.Theme))]
Loading