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

Jump to bottom

build: Disable XAML fuzzy matching #1072

Merged
merged 3 commits into from
Jul 21, 2023
Merged

build: Disable XAML fuzzy matching #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
135afc6
build: Disable XAML fuzzy matching
Youssef1313 Jul 21, 2023
eb0e808
chore: Fix BindableUISwitch namespace
Youssef1313 Jul 21, 2023
6e0f31e
chore: Fix for lottie namespace difference between UWP/WinUI
Youssef1313 Jul 21, 2023
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
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<!-- Required until xamarin targets are used (defined by MSBuild.SDK.Extras)-->
<DisableImplicitFrameworkDefines>false</DisableImplicitFrameworkDefines>
<UnoEnableXamlFuzzyMatching>false</UnoEnableXamlFuzzyMatching>
</PropertyGroup>

<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
Expand Down
2 changes: 1 addition & 1 deletion src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:lottie_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
mc:Ignorable="d not_win lottie_not_win">

<lottie_win:LottieVisualSource x:Key="CupertinoDeterminateAnimation_Win"
Expand Down
4 changes: 2 additions & 2 deletions src/library/Uno.Cupertino/Styles/Controls/ProgressRingWinUI.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:not_win="http://uno.ui/not_win"
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
mc:Ignorable="d not_win lottie_not_win">
<ResourceDictionary.MergedDictionaries>
<not_win:ResourceDictionary>
Expand All @@ -16,7 +16,7 @@

</not_win:ResourceDictionary>
</ResourceDictionary.MergedDictionaries>

<not_win:Style x:Key="CupertinoProgressRingStyle"
TargetType="muxc:ProgressRing">
<Setter Property="DeterminateSource"
Expand Down
6 changes: 3 additions & 3 deletions src/library/Uno.Material/Styles/Controls/v1/ProgressRing.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:lottie_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:not_win="http://uno.ui/not_win"
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
mc:Ignorable="d not_win lottie_not_win">

<lottie_win:LottieVisualSource x:Key="MaterialDeterminateAnimation_Win"
UriSource="ms-appx:///Uno.Material/Assets/MaterialDeterminate.json" />
<lottie_win:LottieVisualSource x:Key="MaterialIndeterminateAnimation_Win"
UriSource="ms-appx:///Uno.Material/Assets/MaterialIndeterminate.json" />

<lottie_not_win:LottieVisualSource x:Key="MaterialDeterminateAnimation_Uno"
UriSource="embedded://Uno.Material/Uno.Material.Assets.MaterialDeterminate.json" />
<lottie_not_win:LottieVisualSource x:Key="MaterialIndeterminateAnimation_Uno"
Expand Down
2 changes: 1 addition & 1 deletion src/library/Uno.Material/Styles/Controls/v1/ProgressRingWinUI.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
xmlns:lottie_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
Expand Down
3 changes: 2 additions & 1 deletion src/library/Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
xmlns:toolkit="using:Uno.UI.Toolkit"
xmlns:macos="http://uno.ui/macos"
xmlns:uuc="using:Uno.UI.Controls"
xmlns:uuvc="using:Uno.UI.Views.Controls"
mc:Ignorable="ios android xamarin wasm macos">

<ios:Style x:Key="MaterialToggleSwitchStyle"
Expand Down Expand Up @@ -51,7 +52,7 @@
Margin="0,8,0,5" />

<!-- Do not add x:Name to BindableUiSwitch or else page will not load -->
<uuc:BindableUISwitch Background="{TemplateBinding Foreground}"
<uuvc:BindableUISwitch Background="{TemplateBinding Foreground}"
IsOn="{TemplateBinding IsOn, Mode=TwoWay}"
Enabled="{TemplateBinding IsEnabled}" />
</StackPanel>
Expand Down
4 changes: 2 additions & 2 deletions src/library/Uno.Material/Styles/Controls/v2/ProgressRing.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:lottie_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:not_win="http://uno.ui/not_win"
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down Expand Up @@ -36,7 +36,7 @@
ResourceKey="SystemControlTransparentBrush" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>

<!-- WinUI 3 currently does not support the DeterminateSource and IndeterminateSource properties on Windows -->
<Style x:Key="MaterialProgressRingStyle"
TargetType="muxc:ProgressRing">
Expand Down
2 changes: 1 addition & 1 deletion src/library/Uno.Material/Styles/Controls/v2/ProgressRingWinUI.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:lottie_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie"
xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:not_win="http://uno.ui/not_win"
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand Down
3 changes: 2 additions & 1 deletion src/library/Uno.Material/Styles/Controls/v2/ToggleSwitch.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
xmlns:not_mobile="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:todo="what should be done"
xmlns:uuc="using:Uno.UI.Controls"
xmlns:uuvc="using:Uno.UI.Views.Controls"
xmlns:toolkit="using:Uno.UI.Toolkit"
mc:Ignorable="ios android todo">

Expand Down Expand Up @@ -521,7 +522,7 @@
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />

<!-- note: BindableUISwitch is a native control and does not support any attached properties nor common FrameworkElement/UIElement properties -->
<uuc:BindableUISwitch Background="{TemplateBinding Foreground}"
<uuvc:BindableUISwitch Background="{TemplateBinding Foreground}"
Enabled="{TemplateBinding IsEnabled}"
IsOn="{TemplateBinding IsOn, Mode=TwoWay}" />
</StackPanel>
Expand Down
Loading