diff --git a/Uno.Gallery/Uno.Gallery.Mobile/Uno.Gallery.Mobile.csproj b/Uno.Gallery/Uno.Gallery.Mobile/Uno.Gallery.Mobile.csproj
index 1b7ca0b69..f073f8ba5 100644
--- a/Uno.Gallery/Uno.Gallery.Mobile/Uno.Gallery.Mobile.csproj
+++ b/Uno.Gallery/Uno.Gallery.Mobile/Uno.Gallery.Mobile.csproj
@@ -34,16 +34,17 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Controls/ContentPageLayout.cs b/Uno.Gallery/Uno.Gallery.Shared/Controls/ContentPageLayout.cs
index f9568e524..739b04bb8 100644
--- 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
index 0f1d1ee9c..a62fab2c8 100644
--- a/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/CupertinoPalettePage.xaml
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/CupertinoPalettePage.xaml
@@ -28,8 +28,7 @@
-
+
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/CupertinoPalettePage.xaml.cs b/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/CupertinoPalettePage.xaml.cs
index 47b79e1c2..0bc33df0f 100644
--- 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
///
/// An empty page that can be used on its own or navigated to within a Frame.
///
- [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
index 138f64470..15f8e441f 100644
--- a/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/FluentPalettePage.xaml
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/FluentPalettePage.xaml
@@ -20,7 +20,7 @@
-
+
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/MaterialPalettePage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/MaterialPalettePage.xaml
index cf16293a9..4641e9a76 100644
--- a/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/MaterialPalettePage.xaml
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/MaterialPalettePage.xaml
@@ -34,8 +34,7 @@
-
+
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/MaterialPalettePage.xaml.cs b/Uno.Gallery/Uno.Gallery.Shared/Views/GeneralPages/MaterialPalettePage.xaml.cs
index 3ef0bd774..de382afab 100644
--- 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();
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/NeumorphicColorsOverride.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/NeumorphicColorsOverride.xaml
new file mode 100644
index 000000000..f5df5ca95
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/NeumorphicColorsOverride.xaml
@@ -0,0 +1,1952 @@
+
+
+
+
+
+ #E6E1E5
+ #C9C5D0
+ #C7BFFF
+ #302D38
+ #E5E1E6
+ #FFFFFF
+ #2A009F
+ #2A009F
+ #4129BA
+ #E4DFFF
+ #C8BFFF
+ #4128BA
+ #CDC2DC
+ #332D41
+ #433C52
+ #EDDFFF
+ #1C1B1F
+ #E6E1E5
+ #C7BFFF
+ #47464F
+ #1C1B1F
+ #928F99
+ #57545D
+ #FFB4AB
+ #690005
+ #93000A
+ #FFDAD6
+ #9FCAFF
+ #003258
+ #00497D
+ #D1E4FF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #1C1B1F
+ #8A8494
+ #5946D2
+ #F0F0F3
+ #1C1B1F
+ #000000
+ #C8BFFF
+ #FFFFFF
+ #E5DEFF
+ #170065
+ #9679FF
+ #0021C1
+ #6B4EA2
+ #3B2574
+ #9B7BD5
+ #FFFFFF
+ #EBDDFF
+ #1F182B
+ #FCFBFF
+ #313033
+ #5946D2
+ #F4EFF4
+ #F2EFF5
+ #79747E
+ #C9C5D0
+ #B3261E
+ #FFFFFF
+ #F9DEDC
+ #410E0B
+ #0061A4
+ #FFFFFF
+ #CFE4FF
+ #001D36
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml
new file mode 100644
index 000000000..127993135
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml.cs b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml.cs
new file mode 100644
index 000000000..f6d3b17f7
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ShadowContainerSamplePage.xaml.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Uno.Gallery.Entities.Data;
+using Uno.Toolkit.UI;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+
+namespace Uno.Gallery.Views.SamplePages
+{
+ [SamplePage(SampleCategory.Toolkit, "ShadowContainer",
+ SourceSdk.UnoToolkit,
+ Description = "The ShadowContainer provides the possibility to add many-colored shadows to its content.",
+ DocumentationLink = "https://github.com/unoplatform/uno.toolkit.ui/blob/main/doc/controls/ShadowContainer.md",
+ DataType = typeof(TestCollections))]
+ public sealed partial class ShadowContainerSamplePage : Page
+ {
+ public ShadowContainerSamplePage()
+ {
+ this.InitializeComponent();
+ }
+
+ }
+}
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/NeumorphicStyles.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/NeumorphicStyles.xaml
new file mode 100644
index 000000000..556195aac
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/Styles/NeumorphicStyles.xaml
@@ -0,0 +1,225 @@
+
+
+
+
+
+
+ #3C3846
+ #24222A
+
+
+
+
+
+ #FFFFFF
+ #AEAEC0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Uno.Gallery/Uno.Gallery.Skia.Gtk/Uno.Gallery.Skia.Gtk.csproj b/Uno.Gallery/Uno.Gallery.Skia.Gtk/Uno.Gallery.Skia.Gtk.csproj
index 32877229c..50332aea1 100644
--- a/Uno.Gallery/Uno.Gallery.Skia.Gtk/Uno.Gallery.Skia.Gtk.csproj
+++ b/Uno.Gallery/Uno.Gallery.Skia.Gtk/Uno.Gallery.Skia.Gtk.csproj
@@ -1,4 +1,4 @@
-
+
WinExe
@@ -24,19 +24,20 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
diff --git a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
index 41c004caf..26b7772e0 100644
--- a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
+++ b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
@@ -108,12 +108,14 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -124,7 +126,7 @@
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/Uno.Gallery/Uno.Gallery.Windows/Uno.Gallery.Windows.csproj b/Uno.Gallery/Uno.Gallery.Windows/Uno.Gallery.Windows.csproj
index f0cd6c76a..e0a4db650 100644
--- a/Uno.Gallery/Uno.Gallery.Windows/Uno.Gallery.Windows.csproj
+++ b/Uno.Gallery/Uno.Gallery.Windows/Uno.Gallery.Windows.csproj
@@ -1,4 +1,4 @@
-
+
WinExe
net7.0-windows10.0.19041
@@ -36,14 +36,16 @@
+
+
- 4.0.0-dev.58
+ 4.0.0-dev.67
- 4.0.0-dev.58
+ 4.0.0-dev.67
- 5.0.0-dev.1706
+ 5.0.0-dev.1856