From 765090603203d7c6f97c52418a9ff3829cc3ff89 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Mon, 1 Feb 2021 16:50:55 -0500 Subject: [PATCH 01/12] Move StaggeredLayout and WrapLayout to Primitives --- .../Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj | 4 ---- .../Properties/AssemblyInfo.cs | 1 - .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj | 4 ++++ .../Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml | 2 +- .../StaggeredLayout/StaggeredColumnLayout.cs | 0 .../StaggeredLayout/StaggeredItem.cs | 0 .../StaggeredLayout/StaggeredLayout.cs | 0 .../StaggeredLayout/StaggeredLayoutState.cs | 0 .../WrapLayout/UvBounds.cs | 0 .../WrapLayout/UvMeasure.cs | 0 .../WrapLayout/WrapItem.cs | 0 .../WrapLayout/WrapLayout.cs | 0 .../WrapLayout/WrapLayoutState.cs | 0 13 files changed, 5 insertions(+), 6 deletions(-) rename Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/Microsoft.Windows.Toolkit.UI.Controls.Layout.rd.xml => Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml (68%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/StaggeredLayout/StaggeredColumnLayout.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/StaggeredLayout/StaggeredItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/StaggeredLayout/StaggeredLayout.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/StaggeredLayout/StaggeredLayoutState.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapLayout/UvBounds.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapLayout/UvMeasure.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapLayout/WrapItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapLayout/WrapLayout.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Layout => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapLayout/WrapLayoutState.cs (100%) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj index dd10bade86a..35bf0f9683c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj @@ -14,10 +14,6 @@ - - - - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/AssemblyInfo.cs index 64a4e43ebc0..c24479258df 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/AssemblyInfo.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/AssemblyInfo.cs @@ -8,5 +8,4 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: InternalsVisibleTo("UnitTests")] [assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj index aad78b95e6b..bc7372a702b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj @@ -24,6 +24,10 @@ + + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/Microsoft.Windows.Toolkit.UI.Controls.Layout.rd.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml similarity index 68% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/Microsoft.Windows.Toolkit.UI.Controls.Layout.rd.xml rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml index 342912dbe1c..9d262a0cde6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Properties/Microsoft.Windows.Toolkit.UI.Controls.Layout.rd.xml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/Microsoft.Windows.Toolkit.UI.Controls.Primitives.rd.xml @@ -1,5 +1,5 @@ - + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredColumnLayout.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredColumnLayout.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredColumnLayout.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredColumnLayout.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredLayout.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayout.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredLayout.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayout.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredLayoutState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayoutState.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/StaggeredLayout/StaggeredLayoutState.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayoutState.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/UvBounds.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/UvBounds.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/UvBounds.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/UvBounds.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/UvMeasure.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/UvMeasure.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/UvMeasure.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/UvMeasure.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapLayout.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapLayout.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapLayout.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapLayout.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapLayoutState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapLayoutState.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Layout/WrapLayout/WrapLayoutState.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapLayout/WrapLayoutState.cs From 049e26cf91223a4e858c26ef0849925e9fa46471 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Mon, 1 Feb 2021 17:10:48 -0500 Subject: [PATCH 02/12] Move Layout controls to Layout Package --- ...rosoft.Toolkit.Uwp.UI.Controls.Core.csproj | 1 + .../Strings/en-US/Resources.resw | 14 +- .../BladeView/BladeItem.Events.cs | 0 .../BladeView/BladeItem.Properties.cs | 0 .../BladeView/BladeItem.cs | 0 .../BladeView/BladeItemAutomationPeer.cs | 0 .../BladeView/BladeMode.cs | 0 .../BladeView/BladeView.Events.cs | 0 .../BladeView/BladeView.Properties.cs | 0 .../BladeView/BladeView.cs | 0 .../BladeView/BladeView.xaml | 0 .../BladeView/BladeViewAutomationPeer.cs | 0 .../Carousel/Carousel.cs | 0 .../Carousel/Carousel.xaml | 0 .../Carousel/CarouselItem.cs | 0 .../Carousel/CarouselPanel.cs | 0 .../Expander/ExpandDirection.cs | 0 .../Expander/Expander.Constants.cs | 0 .../Expander/Expander.Events.cs | 0 .../Expander/Expander.Properties.cs | 0 .../Expander/Expander.cs | 0 .../Expander/Expander.xaml | 0 .../Expander/ExpanderAutomationPeer.cs | 0 .../GridSplitter/GridSplitter.Data.cs | 0 .../GridSplitter/GridSplitter.Events.cs | 0 .../GridSplitter/GridSplitter.Helper.cs | 0 .../GridSplitter/GridSplitter.Options.cs | 0 .../GridSplitter/GridSplitter.cs | 0 .../GridSplitter/GridSplitter.xaml | 0 .../GridSplitter/GripperHoverWrapper.cs | 0 .../HeaderedContentControl.cs | 0 .../HeaderedContentControl.xaml | 0 .../HeaderedItemsControl.cs | 0 .../HeaderedItemsControl.xaml | 0 .../LayoutTransformControl.Properties.cs | 0 .../LayoutTransformControl.cs | 0 .../LayoutTransformControl.xaml | 0 .../PropertyChangeEventSource.cs | 0 .../ListDetailsView/BackButtonBehavior.cs | 0 .../ListDetailsView/ListDetailsView.Events.cs | 0 .../ListDetailsView.Properties.cs | 0 .../ListDetailsView/ListDetailsView.cs | 0 .../ListDetailsView/ListDetailsView.xaml | 0 .../ListDetailsView/ListDetailsViewState.cs | 0 ...soft.Toolkit.Uwp.UI.Controls.Layout.csproj | 14 +- .../OrbitView/OrbitView.cs | 0 .../OrbitView/OrbitView.xaml | 0 .../OrbitView/OrbitViewDataItem.cs | 0 .../OrbitView/OrbitViewDataItemCollection.cs | 0 .../OrbitView/OrbitViewElementProperties.cs | 0 .../OrbitView/OrbitViewItem.cs | 0 .../OrbitViewItemClickedEventArgs.cs | 0 .../OrbitView/OrbitViewPanel.cs | 0 .../OrbitViewPanelItemArrangedArgs.cs | 0 .../OrbitViewPanelItemsArrangedArgs.cs | 0 .../Strings/en-US/Resources.resw | 132 ++++++++++++++++++ UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 4 + 57 files changed, 150 insertions(+), 15 deletions(-) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeItem.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeItem.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeItemAutomationPeer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeMode.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeView.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeView.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeView.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeView.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/BladeView/BladeViewAutomationPeer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Carousel/Carousel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Carousel/Carousel.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Carousel/CarouselItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Carousel/CarouselPanel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/ExpandDirection.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/Expander.Constants.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/Expander.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/Expander.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/Expander.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/Expander.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/Expander/ExpanderAutomationPeer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GridSplitter.Data.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GridSplitter.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GridSplitter.Helper.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GridSplitter.Options.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GridSplitter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GridSplitter.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/GridSplitter/GripperHoverWrapper.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/HeaderedContentControl/HeaderedContentControl.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/HeaderedContentControl/HeaderedContentControl.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/HeaderedItemsControl/HeaderedItemsControl.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/HeaderedItemsControl/HeaderedItemsControl.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/LayoutTransformControl/LayoutTransformControl.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/LayoutTransformControl/LayoutTransformControl.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/LayoutTransformControl/LayoutTransformControl.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/LayoutTransformControl/PropertyChangeEventSource.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/ListDetailsView/BackButtonBehavior.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/ListDetailsView/ListDetailsView.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/ListDetailsView/ListDetailsView.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/ListDetailsView/ListDetailsView.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/ListDetailsView/ListDetailsView.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/ListDetailsView/ListDetailsViewState.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitView.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitView.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewDataItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewDataItemCollection.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewElementProperties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewItemClickedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewPanel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewPanelItemArrangedArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Core => Microsoft.Toolkit.Uwp.UI.Controls.Layout}/OrbitView/OrbitViewPanelItemsArrangedArgs.cs (100%) create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj index 4537d59aaf6..a53c32f0ce1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj @@ -39,6 +39,7 @@ + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw index bcad38e26ee..484e3eb498b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw @@ -193,18 +193,6 @@ Warning Label for TextToolbar Control Warning message. - - Collapse Blade - Narrator Resource for BladeView collapsed status - - - Expand Blade - Narrator Resource for BladeView expanded status - - - GridSplitter - Narrator Resource for GridSplitter control - Dismiss The automation name for the dismiss button of the InAppNotification control. @@ -221,4 +209,4 @@ Select All Label for TokenizingTextBox MenuFlyout 'Select All' option. - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItemAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItemAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeMode.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeMode.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeViewAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeViewAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselPanel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselPanel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpandDirection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpandDirection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Constants.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Constants.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpanderAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/ExpanderAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Data.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Data.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Helper.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Helper.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Options.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.Options.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GripperHoverWrapper.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GripperHoverWrapper.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedContentControl/HeaderedContentControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/HeaderedItemsControl/HeaderedItemsControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/PropertyChangeEventSource.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/PropertyChangeEventSource.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/BackButtonBehavior.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/BackButtonBehavior.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/BackButtonBehavior.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsView.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsViewState.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ListDetailsView/ListDetailsViewState.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsViewState.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj index 35bf0f9683c..bb6df0fe9b1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj @@ -2,19 +2,29 @@ uap10.0.17763 - 10.0.19041.0 Windows Community Toolkit Layout This library provides XAML layout controls. It is part of the Windows Community Toolkit. Microsoft.Toolkit.Uwp.UI.Controls + false + 8.0 + + + + + + + - + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitView.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItemCollection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewDataItemCollection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewElementProperties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewElementProperties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItemClickedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewItemClickedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemArrangedArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemArrangedArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemsArrangedArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanelItemsArrangedArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw new file mode 100644 index 00000000000..604178d003e --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Strings/en-US/Resources.resw @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Collapse Blade + Narrator Resource for BladeView collapsed status + + + Expand Blade + Narrator Resource for BladeView expanded status + + + GridSplitter + Narrator Resource for GridSplitter control + + \ No newline at end of file diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index c562fd33b91..7aca26493a3 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -249,6 +249,10 @@ {b1e850ff-dde6-44d5-a830-34250e97a687} Microsoft.Toolkit.Uwp.Connectivity + + {cb444381-18ba-4a51-bb32-3a498bcc1e99} + Microsoft.Toolkit.Uwp.UI.Controls.Layout + {43bd2a36-9e12-4788-80ae-2377e41e6d05} Microsoft.Toolkit.Uwp.UI.Controls.Media From 3fb8b94611f23f78a2ae9cc2593c164cb729896c Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Mon, 1 Feb 2021 15:22:42 -0800 Subject: [PATCH 03/12] Fix Generic.xaml for Layout package test --- .../Themes/Generic.xaml | 9 --------- ...Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj | 10 ++++++++++ .../Themes/Generic.xaml | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout/Themes/Generic.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml index d6c4cc4e660..9f6079cea14 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml @@ -1,24 +1,15 @@  - - - - - - - - - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj index bb6df0fe9b1..60d209f7ce6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj @@ -22,10 +22,20 @@ + + + + + + + Designer + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Themes/Generic.xaml new file mode 100644 index 00000000000..d6c7b6cd203 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Themes/Generic.xaml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + From 01ad1bdef98662c1387f29ba5e7db5af94a48c72 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Mon, 1 Feb 2021 15:47:00 -0800 Subject: [PATCH 04/12] Clean-up Project Files and remove link from Core to Layout package for Menu. --- .../Menu/MenuItem.cs | 85 +++++++++++++------ .../Menu/MenuItem.xaml | 18 ++++ ...rosoft.Toolkit.Uwp.UI.Controls.Core.csproj | 1 - ...soft.Toolkit.Uwp.UI.Controls.Layout.csproj | 10 --- 4 files changed, 77 insertions(+), 37 deletions(-) create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs index 4dbe5a80025..d07bd6e574e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs @@ -22,7 +22,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls /// Menu Item is the items main container for Class Menu control /// [Obsolete("This control will be removed in a future major release. Please use the MenuBar control from the WinUI Library instead.")] - public class MenuItem : HeaderedItemsControl + public class MenuItem : ItemsControl { private const string FlyoutButtonName = "FlyoutButton"; private const char UnderlineCharacter = '^'; @@ -38,7 +38,6 @@ public class MenuItem : HeaderedItemsControl internal Button FlyoutButton { get; private set; } private Rect _bounds; - private object InternalHeader { set @@ -49,6 +48,39 @@ private object InternalHeader } } + /// + /// Gets or sets the header of each control. + /// + public object Header + { + get { return (object)GetValue(HeaderProperty); } + set { SetValue(HeaderProperty, value); } + } + + /// + /// Identifies the dependency property. + /// + public static readonly DependencyProperty HeaderProperty = + DependencyProperty.Register(nameof(Header), typeof(object), typeof(MenuItem), new PropertyMetadata(null, OnHeaderChanged)); + + /// + /// Gets or sets the template used to display the content of the control's header. + /// + public DataTemplate HeaderTemplate + { + get { return (DataTemplate)GetValue(HeaderTemplateProperty); } + set { SetValue(HeaderTemplateProperty, value); } + } + + /// + /// Identifies the dependency property. + /// + public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register( + nameof(HeaderTemplate), + typeof(DataTemplate), + typeof(MenuItem), + new PropertyMetadata(null)); + /// /// Gets a value indicating whether the menu is opened or not /// @@ -498,39 +530,40 @@ internal void Underline() } /// - protected override void OnHeaderChanged(object oldValue, object newValue) + private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { - base.OnHeaderChanged(oldValue, newValue); - - if (_isInternalHeaderUpdate) + if (d is MenuItem menuitem) { - return; - } + if (menuitem._isInternalHeaderUpdate) + { + return; + } - _originalHeader = null; + menuitem._originalHeader = null; - var headerString = newValue as string; + var headerString = e.NewValue as string; - if (string.IsNullOrEmpty(headerString)) - { - return; - } + if (string.IsNullOrEmpty(headerString)) + { + return; + } - var underlineCharacterIndex = headerString.IndexOf(UnderlineCharacter); + var underlineCharacterIndex = headerString.IndexOf(UnderlineCharacter); - if (underlineCharacterIndex == -1) - { - return; - } + if (underlineCharacterIndex == -1) + { + return; + } - if (underlineCharacterIndex == headerString.Length - 1) - { - InternalHeader = headerString.Replace(UnderlineCharacter.ToString(), string.Empty); - return; - } + if (underlineCharacterIndex == headerString.Length - 1) + { + menuitem.InternalHeader = headerString.Replace(UnderlineCharacter.ToString(), string.Empty); + return; + } - _originalHeader = headerString; - InternalHeader = headerString.Replace(UnderlineCharacter.ToString(), string.Empty); + menuitem._originalHeader = headerString; + menuitem.InternalHeader = headerString.Replace(UnderlineCharacter.ToString(), string.Empty); + } } internal void RemoveUnderline() diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.xaml new file mode 100644 index 00000000000..aff05ea89b6 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.xaml @@ -0,0 +1,18 @@ + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj index a53c32f0ce1..4537d59aaf6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj @@ -39,7 +39,6 @@ - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj index 60d209f7ce6..bb6df0fe9b1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj @@ -22,20 +22,10 @@ - - - - - - - Designer - - - From 439b505a0df46c24fe18494fd584019881391651 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Mon, 1 Feb 2021 18:25:32 -0800 Subject: [PATCH 05/12] Fix Stylecop Issues --- Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs index d07bd6e574e..3f8f8a3a5ac 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs @@ -38,6 +38,7 @@ public class MenuItem : ItemsControl internal Button FlyoutButton { get; private set; } private Rect _bounds; + private object InternalHeader { set @@ -529,7 +530,6 @@ internal void Underline() InternalHeader = text; } - /// private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { if (d is MenuItem menuitem) From e0be87ff18133e3e2f95f10243d2ccb1f8c44032 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 2 Feb 2021 11:38:51 -0500 Subject: [PATCH 06/12] fix smoke tests for moved controls. --- .../MainPage.xaml | 115 +----------------- .../MainPage.xaml | 73 ++++++----- .../MainPage.xaml.cs | 22 ---- 3 files changed, 46 insertions(+), 164 deletions(-) diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml index d628d8c1bc0..2ad0f30edd2 100644 --- a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml +++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml @@ -1,5 +1,4 @@ - - - - - - - - - - - - - - - -