feat: Add ShadowContainer Sample Page & TextBox Shadow Style

unoplatform · Aug 11, 2023 · 6fdfd38 · 6fdfd38
1 parent 81c2e40
commit 6fdfd38
Show file tree

Hide file tree

Showing 14 changed files with 2,350 additions and 40 deletions.
diff --git a/Uno.Gallery/Uno.Gallery.Mobile/Uno.Gallery.Mobile.csproj b/Uno.Gallery/Uno.Gallery.Mobile/Uno.Gallery.Mobile.csproj
@@ -34,16 +34,17 @@
 		<PackageReference Include="Uno.Material.WinUI" Version="3.0.0-dev.325" />
 		<PackageReference Include="Uno.ShowMeTheXAML" Version="2.0.0-dev0012" />
 		<PackageReference Include="Uno.ShowMeTheXAML.MSBuild" Version="2.0.0-dev0012" />
-		<PackageReference Include="Uno.WinUI" Version="5.0.0-dev.1728" />
-		<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.0.0-dev.1728" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1728" />
+		<PackageReference Include="Uno.WinUI" Version="5.0.0-dev.1856" />
+		<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.0.0-dev.1856" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1856" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
 		<PackageReference Include="Uno.Diagnostics.Eventing" Version="2.1.0-dev.1" />
-
-		<PackageReference Include="Uno.Toolkit.WinUI.Cupertino" Version="4.0.0-dev.58" />
-		<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="4.0.0-dev.58" />
-		<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.0-dev.1728" />
+		<PackageReference Include="Uno.Toolkit.Skia.WinUI" Version="4.0.0-dev.67" />
+		<PackageReference Include="Uno.Toolkit.WinUI" Version="4.0.0-dev.67" />
+		<PackageReference Include="Uno.Toolkit.WinUI.Cupertino" Version="4.0.0-dev.67" />
+		<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="4.0.0-dev.67" />
+		<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.0-dev.1856" />
 		<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 	</ItemGroup>

diff --git a/Uno.Gallery/Uno.Gallery.Shared/Controls/ContentPageLayout.cs b/Uno.Gallery/Uno.Gallery.Shared/Controls/ContentPageLayout.cs
@@ -28,5 +28,19 @@ public string Description
 
 		public static readonly DependencyProperty DescriptionProperty =
 			DependencyProperty.Register("Description", typeof(string), typeof(ContentPageLayout), new PropertyMetadata(null));
+
+		public ContentPageLayout()
+		{
+			DataContextChanged += OnDataContextChanged;
+
+			void OnDataContextChanged(object sender, DataContextChangedEventArgs args)
+			{
+				if (args.NewValue is Sample sample)
+				{
+					Title = sample.Title;
+					Description = sample.Description;
+				}
+			}
+		}
 	}
 }
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/CupertinoPalettePage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/CupertinoPalettePage.xaml
@@ -28,8 +28,7 @@
 		</Style>
 	</Page.Resources>
 	<Grid>
-		<local:ContentPageLayout Title="Cupertino Palette"
-								 Description="Uno.Cupertino comes with a built-in set of named Color and Brush resources. They are used in most control styles provided by Uno.Cupertino, meaning that you can easily style most controls just by changing a few colors.">
+		<local:ContentPageLayout>
 			<StackPanel>
 				<VisualStateManager.VisualStateGroups>
 					<VisualStateGroup>

diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/CupertinoPalettePage.xaml.cs b/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/CupertinoPalettePage.xaml.cs
@@ -20,11 +20,11 @@ namespace Uno.Gallery.Views.GeneralPages
 	/// <summary>
 	/// An empty page that can be used on its own or navigated to within a Frame.
 	/// </summary>
-	[SamplePage(SampleCategory.Theming, "Cupertino Palette", SortOrder = 3, Description = Description)]
+	[SamplePage(SampleCategory.Theming, "Cupertino Palette",
+		SortOrder = 3,
+		Description = "Uno.Cupertino comes with a built-in set of named Color and Brush resources. They are used in most control styles provided by Uno.Cupertino, meaning that you can easily style most controls just by changing a few colors.")]
 	public sealed partial class CupertinoPalettePage : Page
 	{
-		private const string Description = "View the Uno palette applied to Cupertino's styles.";
-
 		public CupertinoPalettePage()
 		{
 			this.InitializeComponent();

diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/FluentPalettePage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/FluentPalettePage.xaml
@@ -20,7 +20,7 @@
 	</Page.Resources>
 
 	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-		<local:ContentPageLayout Title="Fluent Palette">
+		<local:ContentPageLayout>
 			<StackPanel Spacing="16">
 
 				<!-- Overview -->

diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/MaterialPalettePage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/MaterialPalettePage.xaml
@@ -34,8 +34,7 @@
 	</Page.Resources>
 
 	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-		<local:ContentPageLayout Title="Material Palette"
-								 Description="Uno.Material comes with a built-in set of named Color and Brush resources. They are used in most control styles provided by Uno.Material, meaning that you can easily style most controls just by changing a few colors.">
+		<local:ContentPageLayout>
 			<StackPanel Spacing="20">
 
 				<!-- Accent roles -->

diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/MaterialPalettePage.xaml.cs b/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/MaterialPalettePage.xaml.cs
@@ -15,11 +15,11 @@
 
 namespace Uno.Gallery
 {
-	[SamplePage(SampleCategory.Theming, "Material Palette", SortOrder = 1, Description = Description)]
+	[SamplePage(SampleCategory.Theming, "Material Palette",
+		SortOrder = 1,
+		Description = "Uno.Material comes with a built-in set of named Color and Brush resources. They are used in most control styles provided by Uno.Material, meaning that you can easily style most controls just by changing a few colors.")]
 	public sealed partial class MaterialPalettePage : Page
 	{
-		private const string Description = "View the Uno palette adapted to Material's styles.";
-
 		public MaterialPalettePage()
 		{
 			this.InitializeComponent();