Skip to content

Commit 57e42fe

Browse files
michael-hawkermichael-hawker
authored
Merge pull request #3676 from RosarioPulella/rename-controls-to-core
Rename controls to core
2 parents 50c7c6b + 2ed7e86 commit 57e42fe

File tree

260 files changed

+413
-414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+413
-414
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@
333333
<Content Include="SamplePages\LiveTile\LiveTile.png" />
334334
<Content Include="SamplePages\MarkdownTextBlock\MarkdownTextBlock.png" />
335335
<Content Include="SamplePages\Loading\Loading.png" />
336-
<Content Include="SamplePages\MasterDetailsView\MasterDetailsView.png" />
337-
<Content Include="SamplePages\MasterDetailsView\OneDriveLogo.png" />
336+
<Content Include="SamplePages\ListDetailsView\ListDetailsView.png" />
337+
<Content Include="SamplePages\ListDetailsView\OneDriveLogo.png" />
338338
<Content Include="SamplePages\Menu\Menu.png" />
339339
<Content Include="SamplePages\Microsoft Translator Service\TranslatorService.png" />
340340
<Content Include="SamplePages\NetworkHelper\NetworkHelper.png" />
@@ -403,7 +403,7 @@
403403
<Content Include="SamplePages\DropShadowPanel\DropShadowPanelXaml.bind" />
404404
<Content Include="SamplePages\Object Storage\ObjectStorageCode.bind" />
405405
<Content Include="SamplePages\BackgroundTaskHelper\BackgroundTaskHelperCode.bind" />
406-
<Content Include="SamplePages\MasterDetailsView\MasterDetailsView.bind" />
406+
<Content Include="SamplePages\ListDetailsView\ListDetailsView.bind" />
407407
<Content Include="SamplePages\NetworkHelper\NetworkHelperCode.bind" />
408408
<Content Include="SamplePages\PrintHelper\PrintHelperCode.bind" />
409409
<Content Include="SamplePages\SystemInformation\SystemInformationCode.bind" />
@@ -418,7 +418,7 @@
418418
<SubType>Designer</SubType>
419419
</Content>
420420
<Content Include="SamplePages\WrapPanel\WrapPanel.bind" />
421-
<Content Include="SamplePages\MasterDetailsView\MasterDetailsViewCode.bind" />
421+
<Content Include="SamplePages\ListDetailsView\ListDetailsViewCode.bind" />
422422
<Content Include="SamplePages\Microsoft Translator Service\MicrosoftTranslatorCode.bind" />
423423
<Content Include="SamplePages\MarkdownTextBlock\MarkdownTextBlock.bind" />
424424
<Content Include="SamplePages\MarkdownTextBlock\InitialContent.md" />
@@ -860,8 +860,8 @@
860860
<Compile Include="SamplePages\Loading\LoadingPage.xaml.cs">
861861
<DependentUpon>LoadingPage.xaml</DependentUpon>
862862
</Compile>
863-
<Compile Include="SamplePages\MasterDetailsView\MasterDetailsViewPage.xaml.cs">
864-
<DependentUpon>MasterDetailsViewPage.xaml</DependentUpon>
863+
<Compile Include="SamplePages\ListDetailsView\ListDetailsViewPage.cs">
864+
<DependentUpon>ListDetailsViewPage.xaml</DependentUpon>
865865
</Compile>
866866
<Compile Include="SamplePages\ImageCache\ImageCachePage.xaml.cs">
867867
<DependentUpon>ImageCachePage.xaml</DependentUpon>
@@ -1305,7 +1305,7 @@
13051305
<Generator>MSBuild:Compile</Generator>
13061306
<SubType>Designer</SubType>
13071307
</Page>
1308-
<Page Include="SamplePages\MasterDetailsView\MasterDetailsViewPage.xaml">
1308+
<Page Include="SamplePages\ListDetailsView\ListDetailsViewPage.xaml">
13091309
<SubType>Designer</SubType>
13101310
<Generator>MSBuild:Compile</Generator>
13111311
</Page>
@@ -1479,9 +1479,9 @@
14791479
<Project>{84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a}</Project>
14801480
<Name>Microsoft.Toolkit.Uwp.UI.Controls.Primitives</Name>
14811481
</ProjectReference>
1482-
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
1482+
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj">
14831483
<Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
1484-
<Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>
1484+
<Name>Microsoft.Toolkit.Uwp.UI.Controls.Core</Name>
14851485
</ProjectReference>
14861486
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Media\Microsoft.Toolkit.Uwp.UI.Media.csproj">
14871487
<Project>{75f9ee44-3efa-47bc-aedd-351b9834a0af}</Project>
@@ -1587,4 +1587,4 @@
15871587
<Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
15881588
<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" />
15891589
</Target>
1590-
</Project>
1590+
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<Page.Resources>
1313
<ResourceDictionary>
1414
<ResourceDictionary.MergedDictionaries>
15-
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml" />
16-
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml" />
15+
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml" />
16+
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/VSCodeNotificationStyle.xaml" />
1717
</ResourceDictionary.MergedDictionaries>
1818

1919
<local:DismissCommand x:Key="DismissCommand" />

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.bind renamed to ‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
mc:Ignorable="d">
99

1010
<Grid>
11-
<controls:MasterDetailsView BackButtonBehavior="Automatic"
11+
<controls:ListDetailsView BackButtonBehavior="Automatic"
1212
ItemsSource="{Binding Emails}"
1313
NoSelectionContent="Select an item to view"
1414
CompactModeThresholdWidth="720">
15-
<controls:MasterDetailsView.ItemTemplate>
15+
<controls:ListDetailsView.ItemTemplate>
1616
<DataTemplate>
1717
<StackPanel Margin="0,8">
1818
<TextBlock Text="{Binding From}"
@@ -27,8 +27,8 @@
2727
MaxLines="1"/>
2828
</StackPanel>
2929
</DataTemplate>
30-
</controls:MasterDetailsView.ItemTemplate>
31-
<controls:MasterDetailsView.DetailsTemplate>
30+
</controls:ListDetailsView.ItemTemplate>
31+
<controls:ListDetailsView.DetailsTemplate>
3232
<DataTemplate>
3333
<RelativePanel Margin="24">
3434
<controls:ImageEx x:Name="FromEllipse"
@@ -53,8 +53,8 @@
5353
Margin="0,12,0,0"/>
5454
</RelativePanel>
5555
</DataTemplate>
56-
</controls:MasterDetailsView.DetailsTemplate>
57-
<controls:MasterDetailsView.NoSelectionContentTemplate>
56+
</controls:ListDetailsView.DetailsTemplate>
57+
<controls:ListDetailsView.NoSelectionContentTemplate>
5858
<DataTemplate>
5959
<StackPanel HorizontalAlignment="Center"
6060
VerticalAlignment="Center">
@@ -71,8 +71,8 @@
7171
Margin="0,12"/>
7272
</StackPanel>
7373
</DataTemplate>
74-
</controls:MasterDetailsView.NoSelectionContentTemplate>
75-
<controls:MasterDetailsView.MasterCommandBar>
74+
</controls:ListDetailsView.NoSelectionContentTemplate>
75+
<controls:ListDetailsView.ListCommandBar>
7676
<CommandBar>
7777
<AppBarButton Icon="Back" Label="Back"/>
7878
<AppBarButton Icon="Forward" Label="Forward"/>
@@ -84,14 +84,14 @@
8484
</TextBlock>
8585
</CommandBar.Content>
8686
</CommandBar>
87-
</controls:MasterDetailsView.MasterCommandBar>
88-
<controls:MasterDetailsView.DetailsCommandBar>
87+
</controls:ListDetailsView.ListCommandBar>
88+
<controls:ListDetailsView.DetailsCommandBar>
8989
<CommandBar>
9090
<AppBarButton Icon="MailReply" Label="Reply" />
9191
<AppBarButton Icon="MailReplyAll" Label="Reply All" />
9292
<AppBarButton Icon="MailForward" Label="Forward" />
9393
</CommandBar>
94-
</controls:MasterDetailsView.DetailsCommandBar>
95-
</controls:MasterDetailsView>
94+
</controls:ListDetailsView.DetailsCommandBar>
95+
</controls:ListDetailsView>
9696
</Grid>
9797
</Page>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsView.png renamed to ‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.png

File renamed without changes.

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewCode.bind renamed to ‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewCode.bind

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Example of POCO to use with MasterDetailsView
1+
// Example of POCO to use with ListDetailsView
22

33
public class Email
44
{

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml.cs renamed to ‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
1313
/// <summary>
1414
/// An empty page that can be used on its own or navigated to within a Frame.
1515
/// </summary>
16-
public sealed partial class MasterDetailsViewPage : Page, IXamlRenderListener
16+
public sealed partial class ListDetailsViewPage : Page, IXamlRenderListener
1717
{
18-
public MasterDetailsViewPage()
18+
public ListDetailsViewPage()
1919
{
2020
Emails = new List<Email>
2121
{
@@ -38,7 +38,7 @@ public MasterDetailsViewPage()
3838
From = "OneDrive",
3939
Subject = "Check out your event recap",
4040
Body = "Your new album.\r\nYou uploaded some photos to your OneDrive and automatically created an album for you.",
41-
Thumbnail = new Uri("ms-appx:///SamplePages/MasterDetailsView/OneDriveLogo.png")
41+
Thumbnail = new Uri("ms-appx:///SamplePages/ListDetailsView/OneDriveLogo.png")
4242
},
4343
new Email
4444
{

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/MasterDetailsViewPage.xaml renamed to ‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsViewPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.MasterDetailsViewPage"
1+
<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.ListDetailsViewPage"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
@@ -7,5 +7,5 @@
77
xmlns:models="using:Microsoft.Toolkit.Uwp.SampleApp.Models"
88
mc:Ignorable="d">
99

10-
<controls:MasterDetailsView Visibility="Collapsed" />
10+
<controls:ListDetailsView Visibility="Collapsed" />
1111
</Page>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MasterDetailsView/OneDriveLogo.png renamed to ‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/OneDriveLogo.png

File renamed without changes.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@
9595
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ImageEx.md"
9696
},
9797
{
98-
"Name": "MasterDetailsView",
99-
"Type": "MasterDetailsViewPage",
98+
"Name": "ListDetailsView",
99+
"Type": "ListDetailsViewPage",
100100
"Subcategory": "Layout",
101-
"About": "The MasterDetailsView control allows the user to implement the Master/Details design pattern.",
102-
"CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView",
103-
"XamlCodeFile": "MasterDetailsView.bind",
104-
"CodeFile": "MasterDetailsViewCode.bind",
105-
"Icon": "/SamplePages/MasterDetailsView/MasterDetailsView.png",
101+
"About": "The ListDetailsView control allows the user to implement the List/Details design pattern.",
102+
"CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls/ListDetailsView",
103+
"XamlCodeFile": "ListDetailsView.bind",
104+
"CodeFile": "ListDetailsViewCode.bind",
105+
"Icon": "/SamplePages/ListDetailsView/ListDetailsView.png",
106106
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/MasterDetailsView.md"
107107
},
108108
{

‎Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs renamed to ‎Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/Constants.cs

File renamed without changes.

0 commit comments

Comments
 (0)