From 66ce1e673ea65feb7cabbd75e99739a800e1b1b7 Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Wed, 31 Jan 2024 14:21:58 -0500 Subject: [PATCH 1/4] fix: fix build after updating themes --- Directory.Packages.props | 124 +++++++++--------- .../Views/GeneralPages/OverviewPage.xaml | 10 +- .../Views/SamplePages/ButtonSamplePage.xaml | 22 ++-- .../Views/SamplePages/ComboBoxSamplePage.xaml | 6 +- .../Views/SamplePages/FabSamplePage.xaml | 66 +++++----- .../LightweightStylingSamplePage.xaml | 2 +- .../ShadowContainerSamplePage.xaml | 110 ++++++++-------- .../Views/SamplePages/TextBoxSamplePage.xaml | 10 +- .../Views/Styles/Button.xaml | 1 + .../Views/Styles/NavigationView.xaml | 1 + .../Views/Styles/NeumorphicStyles.xaml | 70 +++++----- .../Views/Styles/ToggleButton.xaml | 1 + 12 files changed, 211 insertions(+), 212 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 760d704f2..cfb3b621a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,63 +1,63 @@ - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/OverviewPage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/OverviewPage.xaml index d6fae6ed5..118476652 100644 --- a/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/OverviewPage.xaml +++ b/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/OverviewPage.xaml @@ -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" @@ -65,9 +65,9 @@ - + - + - + - + diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ButtonSamplePage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ButtonSamplePage.xaml index 7b2ac40a7..8a7c59191 100644 --- a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ButtonSamplePage.xaml +++ b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ButtonSamplePage.xaml @@ -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"> @@ -26,9 +26,9 @@ @@ -109,24 +109,24 @@ @@ -138,24 +138,24 @@ diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/LightweightStylingSamplePage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/LightweightStylingSamplePage.xaml index 72ae966fd..d72ea9012 100644 --- a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/LightweightStylingSamplePage.xaml +++ b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/LightweightStylingSamplePage.xaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:Uno.Gallery" - xmlns:um="using:Uno.Material" + xmlns:ut="using:Uno.Themes" xmlns:smtx="using:ShowMeTheXAML" mc:Ignorable="d" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml index ed91d022f..6a974b71d 100644 --- a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml +++ b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml @@ -7,7 +7,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="using:CommunityToolkit.WinUI.UI.Controls" xmlns:utu="using:Uno.Toolkit.UI" - xmlns:um="using:Uno.Material" + xmlns:ut="using:Uno.Themes" xmlns:smtx="using:ShowMeTheXAML" xmlns:sample="using:Uno.Gallery" xmlns:converters="using:Uno.Gallery.Converters" @@ -47,9 +47,9 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -208,17 +208,17 @@ @@ -239,16 +239,16 @@ @@ -259,17 +259,17 @@ @@ -286,22 +286,22 @@ VerticalSpacing="16"> @@ -324,9 +324,9 @@ - + - + - + - + @@ -347,9 +347,9 @@ - + - + - + - + @@ -377,9 +377,9 @@ - + - + - + - + @@ -401,9 +401,9 @@ - + - + - + - + @@ -996,13 +996,13 @@ - + - + - + - + diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/TextBoxSamplePage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/TextBoxSamplePage.xaml index 8aed57a8f..13707ba70 100644 --- a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/TextBoxSamplePage.xaml +++ b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/TextBoxSamplePage.xaml @@ -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" mc:Ignorable="d"> @@ -78,9 +78,9 @@ - + - + - + - + diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/NavigationView.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/NavigationView.xaml index 5ef856178..de6bfbfb8 100644 --- a/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/NavigationView.xaml +++ b/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/NavigationView.xaml @@ -4,6 +4,7 @@ xmlns:contract4Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:ut="using:Uno.Themes" xmlns:um="using:Uno.Material" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:media="using:Microsoft.UI.Xaml.Media" diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/NeumorphicStyles.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/NeumorphicStyles.xaml index 072248445..4546dffef 100644 --- a/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/NeumorphicStyles.xaml +++ b/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/NeumorphicStyles.xaml @@ -6,7 +6,7 @@ xmlns:converters="using:Uno.Gallery.Converters" xmlns:not_mobile="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation" - xmlns:um="using:Uno.Material" + xmlns:ut="using:Uno.Themes" mc:Ignorable="d"> @@ -408,7 +408,7 @@ - @@ -420,23 +420,23 @@ NotNullValue="Collapsed" NullValue="Visible" /> - - - - - @@ -465,7 +465,7 @@ - + @@ -563,13 +563,13 @@ + Visibility="{Binding Path=(ut:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" /> - + @@ -746,13 +746,13 @@ + Visibility="{Binding Path=(ut:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" /> - + @@ -947,7 +947,7 @@ - @@ -965,8 +965,8 @@ HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{ThemeResource PrimaryBrush}" - Content="{Binding Path=(um:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}}" - Visibility="{Binding Path=(um:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" /> + Content="{Binding Path=(ut:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}}" + Visibility="{Binding Path=(ut:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" /> + Visibility="{Binding Path=(ut:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}"> @@ -1282,9 +1282,9 @@ + Visibility="{Binding Path=(ut:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}"> - - + + - + @@ -1412,19 +1412,19 @@ Margin="{TemplateBinding Padding}"> - - + + Visibility="{Binding Path=(ut:ControlExtensions.Icon), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" /> @@ -1466,8 +1466,8 @@ - - + + @@ -1684,7 +1684,7 @@ - + @@ -1783,7 +1783,7 @@ - - @@ -2256,8 +2254,6 @@ - - diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/ToggleButton.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/ToggleButton.xaml index e641f385b..8ce137a2e 100644 --- a/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/ToggleButton.xaml +++ b/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/ToggleButton.xaml @@ -1,4 +1,5 @@  From 3538a704db453ac2d3d3985ef51a3ebe001ba7c8 Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Wed, 31 Jan 2024 14:43:43 -0500 Subject: [PATCH 2/4] chore: whitespace --- Directory.Packages.props | 124 +++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index cfb3b621a..67e5dc5da 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,63 +1,63 @@ - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 5335b478e601fa65be6893edd55856d2323edb3e Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Thu, 1 Feb 2024 09:35:01 -0500 Subject: [PATCH 3/4] build: packages --- Directory.Packages.props | 124 +++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 67e5dc5da..5f660fbdc 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,63 +1,63 @@ - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 765146af5be32d605d35267b83736fda596faac7 Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Thu, 1 Feb 2024 17:55:43 -0500 Subject: [PATCH 4/4] chore: update themes --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 5f660fbdc..583f7fbef 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -30,12 +30,12 @@ - + - +