From 60690c52cb0a12b1b7979f9afe8b9dcb697ebc9c Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Wed, 31 Jan 2024 15:49:12 -0500 Subject: [PATCH 1/2] fix: adjust for themes breaking changes --- samples/Directory.Packages.props | 8 ++++---- .../NestedSamples/SafeAreaSamplePage_NestedPage.xaml | 6 ++++-- .../NestedSamples/SafeArea_Control_NestedPage.xaml | 5 +++-- src/Directory.Packages.props | 8 ++++---- .../Styles/Controls/v1/TopTabBar.xaml | 3 ++- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props index 01c6a08c9..3b10b96eb 100644 --- a/samples/Directory.Packages.props +++ b/samples/Directory.Packages.props @@ -23,12 +23,12 @@ - - + + - - + + diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeAreaSamplePage_NestedPage.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeAreaSamplePage_NestedPage.xaml index 1221d5c27..cbe3186ed 100644 --- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeAreaSamplePage_NestedPage.xaml +++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeAreaSamplePage_NestedPage.xaml @@ -8,6 +8,8 @@ xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:toolkit="using:Uno.UI.Toolkit" xmlns:utu="using:Uno.Toolkit.UI" + xmlns:utu="using:Uno.Toolkit.UI" + xmlns:ut="using:Uno.Themes" Background="Green" mc:Ignorable="d"> - + - + diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeArea_Control_NestedPage.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeArea_Control_NestedPage.xaml index c3ae4beba..c93ac5588 100644 --- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeArea_Control_NestedPage.xaml +++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeArea_Control_NestedPage.xaml @@ -8,6 +8,7 @@ xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:toolkit="using:Uno.UI.Toolkit" xmlns:utu="using:Uno.Toolkit.UI" + xmlns:ut="using:Uno.Themes" Background="Green" mc:Ignorable="d"> - + - + diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 521a35de8..fc709978e 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -15,13 +15,13 @@ - - + + - - + + diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v1/TopTabBar.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v1/TopTabBar.xaml index e47dc23e0..2edf6ccfc 100644 --- a/src/library/Uno.Toolkit.Material/Styles/Controls/v1/TopTabBar.xaml +++ b/src/library/Uno.Toolkit.Material/Styles/Controls/v1/TopTabBar.xaml @@ -3,12 +3,13 @@ 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:utu="using:Uno.Toolkit.UI" xmlns:not_mobile="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:mobile="http://uno.ui/mobile" mc:Ignorable="d mobile"> - + Date: Wed, 31 Jan 2024 15:55:26 -0500 Subject: [PATCH 2/2] chore: fix build --- .../Content/NestedSamples/SafeAreaSamplePage_NestedPage.xaml | 1 - 1 file changed, 1 deletion(-) diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeAreaSamplePage_NestedPage.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeAreaSamplePage_NestedPage.xaml index cbe3186ed..8712c29ac 100644 --- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeAreaSamplePage_NestedPage.xaml +++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/SafeAreaSamplePage_NestedPage.xaml @@ -8,7 +8,6 @@ xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:toolkit="using:Uno.UI.Toolkit" xmlns:utu="using:Uno.Toolkit.UI" - xmlns:utu="using:Uno.Toolkit.UI" xmlns:ut="using:Uno.Themes" Background="Green" mc:Ignorable="d">