Rename controls to core

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

@@ -333,8 +333,8 @@
     <Content Include="SamplePages\LiveTile\LiveTile.png" />
     <Content Include="SamplePages\MarkdownTextBlock\MarkdownTextBlock.png" />
     <Content Include="SamplePages\Loading\Loading.png" />
-    <Content Include="SamplePages\MasterDetailsView\MasterDetailsView.png" />
-    <Content Include="SamplePages\MasterDetailsView\OneDriveLogo.png" />
+    <Content Include="SamplePages\ListDetailsView\ListDetailsView.png" />
+    <Content Include="SamplePages\ListDetailsView\OneDriveLogo.png" />
     <Content Include="SamplePages\Menu\Menu.png" />
     <Content Include="SamplePages\Microsoft Translator Service\TranslatorService.png" />
     <Content Include="SamplePages\NetworkHelper\NetworkHelper.png" />
@@ -403,7 +403,7 @@
     <Content Include="SamplePages\DropShadowPanel\DropShadowPanelXaml.bind" />
     <Content Include="SamplePages\Object Storage\ObjectStorageCode.bind" />
     <Content Include="SamplePages\BackgroundTaskHelper\BackgroundTaskHelperCode.bind" />
-    <Content Include="SamplePages\MasterDetailsView\MasterDetailsView.bind" />
+    <Content Include="SamplePages\ListDetailsView\ListDetailsView.bind" />
     <Content Include="SamplePages\NetworkHelper\NetworkHelperCode.bind" />
     <Content Include="SamplePages\PrintHelper\PrintHelperCode.bind" />
     <Content Include="SamplePages\SystemInformation\SystemInformationCode.bind" />
@@ -418,7 +418,7 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="SamplePages\WrapPanel\WrapPanel.bind" />
-    <Content Include="SamplePages\MasterDetailsView\MasterDetailsViewCode.bind" />
+    <Content Include="SamplePages\ListDetailsView\ListDetailsViewCode.bind" />
     <Content Include="SamplePages\Microsoft Translator Service\MicrosoftTranslatorCode.bind" />
     <Content Include="SamplePages\MarkdownTextBlock\MarkdownTextBlock.bind" />
     <Content Include="SamplePages\MarkdownTextBlock\InitialContent.md" />
@@ -860,8 +860,8 @@
     <Compile Include="SamplePages\Loading\LoadingPage.xaml.cs">
       <DependentUpon>LoadingPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SamplePages\MasterDetailsView\MasterDetailsViewPage.xaml.cs">
-      <DependentUpon>MasterDetailsViewPage.xaml</DependentUpon>
+    <Compile Include="SamplePages\ListDetailsView\ListDetailsViewPage.cs">
+      <DependentUpon>ListDetailsViewPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="SamplePages\ImageCache\ImageCachePage.xaml.cs">
       <DependentUpon>ImageCachePage.xaml</DependentUpon>
@@ -1305,7 +1305,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="SamplePages\MasterDetailsView\MasterDetailsViewPage.xaml">
+    <Page Include="SamplePages\ListDetailsView\ListDetailsViewPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -1479,9 +1479,9 @@
       <Project>{84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Controls.Primitives</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj">
       <Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
-      <Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
+      <Name>Microsoft.Toolkit.Uwp.UI.Controls.Core</Name>
     </ProjectReference>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Media\Microsoft.Toolkit.Uwp.UI.Media.csproj">
       <Project>{75f9ee44-3efa-47bc-aedd-351b9834a0af}</Project>
@@ -1587,4 +1587,4 @@
     <Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
     <Exec Command="for %%f in (@(GeneratedCSFiles->'&quot;%(Identity)&quot;')) do echo #pragma warning disable &gt; %%f.temp &amp;&amp; type %%f | findstr /v /b &quot;#pragma&quot; &gt;&gt; %%f.temp &amp;&amp; move /y %%f.temp %%f &gt; NUL" />
   </Target>
-</Project>
+</Project>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind

@@ -12,8 +12,8 @@
     <Page.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-              <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml" />
-              <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml" />
+              <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml" />
+              <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/VSCodeNotificationStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
             <local:DismissCommand x:Key="DismissCommand" />

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind → Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind

@@ -8,11 +8,11 @@
     mc:Ignorable="d">
 
     <Grid>
-        <controls:MasterDetailsView BackButtonBehavior="Automatic" 
+        <controls:ListDetailsView BackButtonBehavior="Automatic" 
                                     ItemsSource="{Binding Emails}"
                                     NoSelectionContent="Select an item to view"
                                     CompactModeThresholdWidth="720">
-            <controls:MasterDetailsView.ItemTemplate>
+            <controls:ListDetailsView.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Margin="0,8">
                         <TextBlock Text="{Binding From}" 
@@ -27,8 +27,8 @@
                                    MaxLines="1"/>
                     </StackPanel>
                 </DataTemplate>
-            </controls:MasterDetailsView.ItemTemplate>
-            <controls:MasterDetailsView.DetailsTemplate>
+            </controls:ListDetailsView.ItemTemplate>
+            <controls:ListDetailsView.DetailsTemplate>
                 <DataTemplate>
                     <RelativePanel Margin="24">
                         <controls:ImageEx x:Name="FromEllipse"
@@ -53,8 +53,8 @@
                                    Margin="0,12,0,0"/>
                     </RelativePanel>
                 </DataTemplate>
-            </controls:MasterDetailsView.DetailsTemplate>
-            <controls:MasterDetailsView.NoSelectionContentTemplate>
+            </controls:ListDetailsView.DetailsTemplate>
+            <controls:ListDetailsView.NoSelectionContentTemplate>
                 <DataTemplate>
                     <StackPanel HorizontalAlignment="Center" 
                                 VerticalAlignment="Center">
@@ -71,8 +71,8 @@
                                    Margin="0,12"/>
                     </StackPanel>
                 </DataTemplate>
-            </controls:MasterDetailsView.NoSelectionContentTemplate>
-            <controls:MasterDetailsView.MasterCommandBar>
+            </controls:ListDetailsView.NoSelectionContentTemplate>
+            <controls:ListDetailsView.ListCommandBar>
                 <CommandBar>
                     <AppBarButton Icon="Back" Label="Back"/>
                     <AppBarButton Icon="Forward" Label="Forward"/>
@@ -84,14 +84,14 @@
             </TextBlock>
           </CommandBar.Content>
         </CommandBar>
-      </controls:MasterDetailsView.MasterCommandBar>
-      <controls:MasterDetailsView.DetailsCommandBar>
+      </controls:ListDetailsView.ListCommandBar>
+      <controls:ListDetailsView.DetailsCommandBar>
         <CommandBar>
           <AppBarButton Icon="MailReply" Label="Reply" />
           <AppBarButton Icon="MailReplyAll" Label="Reply All" />
           <AppBarButton Icon="MailForward" Label="Forward" />
         </CommandBar>
-      </controls:MasterDetailsView.DetailsCommandBar>
-    </controls:MasterDetailsView>
+      </controls:ListDetailsView.DetailsCommandBar>
+    </controls:ListDetailsView>
   </Grid>
 </Page>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind → Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewCode.bind

@@ -1,4 +1,4 @@
-// Example of POCO to use with MasterDetailsView
+// Example of POCO to use with ListDetailsView
 
 public class Email
 {

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs → Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.cs

@@ -13,9 +13,9 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class MasterDetailsViewPage : Page, IXamlRenderListener
+    public sealed partial class ListDetailsViewPage : Page, IXamlRenderListener
     {
-        public MasterDetailsViewPage()
+        public ListDetailsViewPage()
         {
             Emails = new List<Email>
             {
@@ -38,7 +38,7 @@ public MasterDetailsViewPage()
                     From = "OneDrive",
                     Subject = "Check out your event recap",
                     Body = "Your new album.\r\nYou uploaded some photos to your OneDrive and automatically created an album for you.",
-                    Thumbnail = new Uri("ms-appx:///SamplePages/MasterDetailsView/OneDriveLogo.png")
+                    Thumbnail = new Uri("ms-appx:///SamplePages/ListDetailsView/OneDriveLogo.png")
                 },
                 new Email
                 {

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml → Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.xaml

@@ -1,4 +1,4 @@
-<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.MasterDetailsViewPage"
+<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.ListDetailsViewPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
@@ -7,5 +7,5 @@
       xmlns:models="using:Microsoft.Toolkit.Uwp.SampleApp.Models"
       mc:Ignorable="d">
 
-    <controls:MasterDetailsView Visibility="Collapsed" />
+    <controls:ListDetailsView Visibility="Collapsed" />
 </Page>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json

@@ -95,14 +95,14 @@
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ImageEx.md"
       },
       {
-        "Name": "MasterDetailsView",
-        "Type": "MasterDetailsViewPage",
+        "Name": "ListDetailsView",
+        "Type": "ListDetailsViewPage",
         "Subcategory": "Layout",
-        "About": "The MasterDetailsView control allows the user to implement the Master/Details design pattern.",
-        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView",
-        "XamlCodeFile": "MasterDetailsView.bind",
-        "CodeFile": "MasterDetailsViewCode.bind",
-        "Icon": "/SamplePages/MasterDetailsView/MasterDetailsView.png",
+        "About": "The ListDetailsView control allows the user to implement the List/Details design pattern.",
+        "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/ListDetailsView",
+        "XamlCodeFile": "ListDetailsView.bind",
+        "CodeFile": "ListDetailsViewCode.bind",
+        "Icon": "/SamplePages/ListDetailsView/ListDetailsView.png",
         "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/MasterDetailsView.md"
       },
       {

Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Metadata.cs

@@ -0,0 +1,47 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.ComponentModel;
+
+using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties;
+
+using Microsoft.VisualStudio.DesignTools.Extensibility;
+using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
+{
+    internal class ListDetailsViewMetadata : AttributeTableBuilder
+    {
+        public ListDetailsViewMetadata()
+            : base()
+        {
+            AddCallback(ControlTypes.ListDetailsView,
+                b =>
+                {
+                    b.AddCustomAttributes(nameof(ListDetailsView.SelectedItem), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(ListDetailsView.DetailsTemplate),
+                        new CategoryAttribute(Resources.CategoryAppearance),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
+                    b.AddCustomAttributes(nameof(ListDetailsView.ListPaneBackground), new CategoryAttribute(Resources.CategoryBrush));
+                    b.AddCustomAttributes(nameof(ListDetailsView.ListHeader), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(ListDetailsView.ListHeaderTemplate),
+                        new CategoryAttribute(Resources.CategoryAppearance),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
+                    b.AddCustomAttributes(nameof(ListDetailsView.ListPaneWidth), new CategoryAttribute(Resources.CategoryAppearance));
+                    b.AddCustomAttributes(nameof(ListDetailsView.NoSelectionContent), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(ListDetailsView.NoSelectionContentTemplate),
+                        new CategoryAttribute(Resources.CategoryCommon),
+                        new EditorBrowsableAttribute(EditorBrowsableState.Advanced)
+                    );
+                    b.AddCustomAttributes(nameof(ListDetailsView.ViewState), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(ListDetailsView.ListCommandBar), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(nameof(ListDetailsView.DetailsCommandBar), new CategoryAttribute(Resources.CategoryCommon));
+                    b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
+                }
+            );
+        }
+    }
+}

Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs → Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/ListDetailsView.Typedata.cs

@@ -8,18 +8,18 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design
 {
     internal static partial class ControlTypes
     {
-        internal const string MasterDetailsView = RootNamespace + "." + nameof(MasterDetailsView);
+        internal const string ListDetailsView = RootNamespace + "." + nameof(ListDetailsView);
     }
 
-    internal static class MasterDetailsView
+    internal static class ListDetailsView
     {
         internal const string DetailsCommandBar = nameof(DetailsCommandBar);
         internal const string DetailsTemplate = nameof(DetailsTemplate);
-        internal const string MasterCommandBar = nameof(MasterCommandBar);
-        internal const string MasterHeader = nameof(MasterHeader);
-        internal const string MasterHeaderTemplate = nameof(MasterHeaderTemplate);
-        internal const string MasterPaneBackground = nameof(MasterPaneBackground);
-        internal const string MasterPaneWidth = nameof(MasterPaneWidth);
+        internal const string ListCommandBar = nameof(ListCommandBar);
+        internal const string ListHeader = nameof(ListHeader);
+        internal const string ListHeaderTemplate = nameof(ListHeaderTemplate);
+        internal const string ListPaneBackground = nameof(ListPaneBackground);
+        internal const string ListPaneWidth = nameof(ListPaneWidth);
         internal const string NoSelectionContent = nameof(NoSelectionContent);
         internal const string NoSelectionContentTemplate = nameof(NoSelectionContentTemplate);
         internal const string SelectedItem = nameof(SelectedItem);

Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj → Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj

@@ -8,22 +8,22 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
-    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.DesignTools</AssemblyName>
+    <AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <TargetPlatformVersion>8.1</TargetPlatformVersion>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <ValidateFrameworkCompatibility>false</ValidateFrameworkCompatibility>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Debug\uap10.0.17763\Design\</OutputPath>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Core\bin\Debug\uap10.0.17763\Design\</OutputPath>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Release\uap10.0.17763\Design\</OutputPath>
+    <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Core\bin\Release\uap10.0.17763\Design\</OutputPath>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <Optimize>true</Optimize>
@@ -99,8 +99,8 @@
     <Compile Include="Controls\LayoutTransitionControl.Typedata.cs" />
     <Compile Include="Controls\Loading.Metadata.cs" />
     <Compile Include="Controls\Loading.Typedata.cs" />
-    <Compile Include="Controls\MasterDetailsView.Metadata.cs" />
-    <Compile Include="Controls\MasterDetailsView.Typedata.cs" />
+    <Compile Include="Controls\ListDetailsView.Metadata.cs" />
+    <Compile Include="Controls\ListDetailsView.Typedata.cs" />
     <Compile Include="Controls\Menu.Metadata.cs" />
     <Compile Include="Controls\Menu.Typedata.cs" />
     <Compile Include="Controls\MenuItem.Metadata.cs" />
@@ -137,8 +137,8 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.xml">
-      <Link>Microsoft.Toolkit.Uwp.UI.Controls.xml</Link>
+    <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.Core.xml">
+      <Link>Microsoft.Toolkit.Uwp.UI.Controls.Core.xml</Link>
       <Visible>False</Visible>
     </EmbeddedResource>
   </ItemGroup>

Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs → Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs

@@ -70,7 +70,7 @@ protected override void OnExpanded(EventArgs args)
             {
                 Width = _normalModeWidth;
                 VisualStateManager.GoToState(this, "Expanded", true);
-                var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
                 if (_enlargeButton != null)
                 {
                     AutomationProperties.SetName(_enlargeButton, name);
@@ -86,7 +86,7 @@ protected override void OnCollapsed(EventArgs args)
             {
                 Width = double.NaN;
                 VisualStateManager.GoToState(this, "Collapsed", true);
-                var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+                var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
                 if (_enlargeButton != null)
                 {
                     AutomationProperties.SetName(_enlargeButton, name);

Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs → Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs

@@ -168,7 +168,7 @@ public GridSplitter()
         {
             DefaultStyleKey = typeof(GridSplitter);
             Loaded += GridSplitter_Loaded;
-            string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
+            string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources");
             AutomationProperties.SetName(this, automationName);
         }