diff --git a/src/library/Uno.Material/MaterialResourcesV2.cs b/src/library/Uno.Material/MaterialResourcesV2.cs
index 94fbbe175..a3ecb95b3 100644
--- a/src/library/Uno.Material/MaterialResourcesV2.cs
+++ b/src/library/Uno.Material/MaterialResourcesV2.cs
@@ -110,6 +110,8 @@ private IEnumerable<(string ResourceKey, string SharedKey, bool IsDefaultStyle)>
Add("M3MaterialCalendarDatePickerStyle", isImplicit: true);
Add("M3MaterialFlyoutPresenterStyle", isImplicit: true);
Add("M3MaterialMenuFlyoutPresenterStyle", isImplicit: true);
+ Add("M3MaterialNavigationViewStyle", isImplicit: true);
+ Add("M3MaterialNavigationViewItemStyle", isImplicit: true);
// ** TODO **
diff --git a/src/library/Uno.Material/Styles/Application/v2/SharedColorPalette.xaml b/src/library/Uno.Material/Styles/Application/v2/SharedColorPalette.xaml
index 29b048dca..5b8721265 100644
--- a/src/library/Uno.Material/Styles/Application/v2/SharedColorPalette.xaml
+++ b/src/library/Uno.Material/Styles/Application/v2/SharedColorPalette.xaml
@@ -13,87 +13,87 @@
- #5946D2
- #C8BFFF
- #FFFFFF
- #E5DEFF
- #160067
+ #6750A4
+ #D0BCFF
+ #FFFFFF
+ #EADDFF
+ #21005E
- #006C47
- #FFFFFF
- #81F9C1
- #002113
+ #625B71
+ #FFFFFF
+ #E8DEF8
+ #1E192B
- #0061A4
+ #7D5260
#FFFFFF
- #CFE4FF
- #001D36
+ #FFD8E4
+ #370B1E
- #B3261E
- #FFFFFF
- #F9DEDC
- #410E0B
+ #B3261E
+ #FFFFFF
+ #F9DEDC
+ #370B1E
- #FFFBFE
- #1C1B1F
+ #FFFBFE
+ #1C1B1F
- #FFFBFE
- #1C1B1F
- #E7E0EC
- #49454F
- #313033
- #F4EFF4
+ #FFFBFE
+ #1C1B1F
+ #E7E0EC
+ #49454E
+ #313033
+ #F4EFF4
- #79747E
+ #79747E
- #C8BFFF
- #2800A1
- #4128BA
- #E5DEFF
- #5946D2
+ #D0BCFF
+ #371E73
+ #4F378B
+ #EADDFF
+ #6750A4
- #63DCA6
- #003823
- #005235
- #81F9C1
+ #CCC2DC
+ #332D41
+ #4A4458
+ #E8DEF8
- #9BCAFF
- #003259
- #00497E
- #CFE4FF
+ #EFB8C8
+ #492532
+ #633B48
+ #FFD8E4
- #F2B8B5
- #601410
- #8C1D18
- #F9DEDC
+ #F2B8B5
+ #601410
+ #8C1D18
+ #F9DEDC
- #1C1B1F
- #E6E1E5
+ #1C1B1F
+ #E6E1E5
- #1C1B1F
- #E6E1E5
- #49454F
- #CAC4D0
- #E6E1E5
- #1C1B1F
+ #1C1B1F
+ #E6E1E5
+ #49454F
+ #CAC4D0
+ #E6E1E5
+ #313033
- #938F99
+ #938F99
diff --git a/src/library/Uno.Material/Styles/Controls/v2/NavigationView.xaml b/src/library/Uno.Material/Styles/Controls/v2/NavigationView.xaml
new file mode 100644
index 000000000..f473e8134
--- /dev/null
+++ b/src/library/Uno.Material/Styles/Controls/v2/NavigationView.xaml
@@ -0,0 +1,2589 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10,0,16,0
+ 12,0,12,0
+ 40
+ 40
+ 40
+ 40
+ 40
+ 48
+ 48
+ 40
+
+ 40
+ 4
+
+ 1
+ 1
+
+ 1
+ 1
+ 12,0,12,0
+ 10,0,0,0
+ 8,5,0,0
+ 12,5,0,11
+ 8,4,0,0
+ 0
+ 0
+ 16,10
+ 16,10
+ 10,0
+ 0
+ 0,0,20,0
+ 0,0,0,0
+ 8,0,16,0
+ 12,0
+ -20,0,6,0
+ -16,0,0,0
+ 0,0,0,0
+ -12,0,0,0
+ 12,0,20,0
+ 16,0,20,0
+ -4,0,6,0
+ 12,0,12,0
+
+
+ 0,8
+ 0,8
+
+
+ 12.0
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+ 8,2
+ 16
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Content/Controls/NavigationViewSamplePage_MUX.xaml b/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Content/Controls/NavigationViewSamplePage_MUX.xaml
index d2f951456..9d22cb7db 100644
--- a/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Content/Controls/NavigationViewSamplePage_MUX.xaml
+++ b/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Content/Controls/NavigationViewSamplePage_MUX.xaml
@@ -38,6 +38,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Controls/SamplePageLayout.cs b/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Controls/SamplePageLayout.cs
index bf4e1e4ea..abb905cd5 100644
--- a/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Controls/SamplePageLayout.cs
+++ b/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Controls/SamplePageLayout.cs
@@ -24,6 +24,7 @@ public partial class SamplePageLayout : ContentControl
private const string StickyTabsPartName = "PART_StickyTabs";
private const string ScrollViewerPartName = "PART_ScrollViewer";
private const string TopPartName = "PART_MobileTopBar";
+ private const string MaterialVersionComboBoxName = "MaterialVersionComboBox";
private static Design _design = Design.Material;
@@ -42,6 +43,7 @@ public partial class SamplePageLayout : ContentControl
private FrameworkElement _stickyTabs;
private FrameworkElement _top;
private ScrollViewer _scrollViewer;
+ private ComboBox _materialVersionComboBox;
private readonly SerialDisposable _subscriptions = new SerialDisposable();
@@ -73,6 +75,7 @@ protected override void OnApplyTemplate()
_stickyTabs = (FrameworkElement)GetTemplateChild(StickyTabsPartName);
_scrollViewer = (ScrollViewer)GetTemplateChild(ScrollViewerPartName);
_top = (FrameworkElement)GetTemplateChild(TopPartName);
+ _materialVersionComboBox = (ComboBox)GetTemplateChild(MaterialVersionComboBoxName);
// ensure previous subscriptions is removed before adding new ones, in case OnApplyTemplate is called multiple times
var disposables = new CompositeDisposable();
@@ -98,6 +101,11 @@ void BindOnClick(RadioButton radio)
.DisposeWith(disposables);
}
+ _materialVersionComboBox.Loaded += OnMaterialVersionComboBoxLoaded;
+ Disposable
+ .Create(() => _materialVersionComboBox.Loaded -= OnMaterialVersionComboBoxLoaded)
+ .DisposeWith(disposables);
+
void OnScrolled(object sender, ScrollViewerViewChangedEventArgs e)
{
var relativeOffset = GetRelativeOffset();
@@ -112,6 +120,11 @@ void OnScrolled(object sender, ScrollViewerViewChangedEventArgs e)
}
}
+ private void OnMaterialVersionComboBoxLoaded(object sender, RoutedEventArgs e)
+ {
+ _materialVersionComboBox.SelectedIndex = 1;
+ }
+
private void RegisterEvent(RoutedEventHandler click)
{
click += OnLayoutRadioButtonChecked;
diff --git a/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Styles/SamplePageLayout.xaml b/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Styles/SamplePageLayout.xaml
index 085ebfc9a..6ee11a790 100644
--- a/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Styles/SamplePageLayout.xaml
+++ b/src/samples/Uno.Themes.Samples/Uno.Themes.Samples.Shared/Styles/SamplePageLayout.xaml
@@ -162,8 +162,7 @@
+ SelectedIndex="1">
M2
M3