Skip to content

Commit 78dacf4

Browse files
michael-hawkermichael-hawker
committed
Add 7.0 features to landing page
Fix issue with version history display on About page Add Wiki Link Add MVVM Toolkit entry to sample for docs Clean-up ColorPickerPage sample
1 parent 0bfca23 commit 78dacf4

File tree

10 files changed

+23
-96
lines changed

10 files changed

+23
-96
lines changed

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -490,12 +490,6 @@
490490
<DependentUpon>AutoFocusBehaviorPage.xaml</DependentUpon>
491491
</Compile>
492492
<Compile Include="SamplePages\CanvasPathGeometry\GeometryStreamReader.cs" />
493-
<Compile Include="SamplePages\ColorPicker\ColorPickerButtonPage.xaml.cs">
494-
<DependentUpon>ColorPickerButtonPage.xaml</DependentUpon>
495-
</Compile>
496-
<Compile Include="SamplePages\ColorPicker\ColorPickerPage.xaml.cs">
497-
<DependentUpon>ColorPickerPage.xaml</DependentUpon>
498-
</Compile>
499493
<Compile Include="SamplePages\EnumValuesExtension\Animal.cs" />
500494
<Compile Include="SamplePages\EnumValuesExtension\AnimalToColorConverter.xaml.cs" />
501495
<Compile Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml.cs">
@@ -953,14 +947,6 @@
953947
<SubType>Designer</SubType>
954948
<Generator>MSBuild:Compile</Generator>
955949
</Page>
956-
<Page Include="SamplePages\ColorPicker\ColorPickerButtonPage.xaml">
957-
<Generator>MSBuild:Compile</Generator>
958-
<SubType>Designer</SubType>
959-
</Page>
960-
<Page Include="SamplePages\ColorPicker\ColorPickerPage.xaml">
961-
<Generator>MSBuild:Compile</Generator>
962-
<SubType>Designer</SubType>
963-
</Page>
964950
<Page Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml">
965951
<Generator>MSBuild:Compile</Generator>
966952
<SubType>Designer</SubType>

‎Microsoft.Toolkit.Uwp.SampleApp/Models/GitHubRelease.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class GitHubRelease
2121
[JsonPropertyName("name")]
2222
public string Name { get; set; }
2323

24-
public string FullName => $"Version {Name.Replace("v", string.Empty)} notes";
24+
public string FullName => $"Version {Name.Substring(1)} notes"; // Skip the initial 'v' we put at the front. If we replace all 'v's then we hit 'preview'.
2525

2626
[JsonPropertyName("draft")]
2727
public bool IsDraft { get; set; }

‎Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
55
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7-
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
87
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Pages"
98
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
109
xmlns:sampleapp="using:Microsoft.Toolkit.Uwp.SampleApp"
10+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
1111
Loaded="Page_Loaded"
1212
mc:Ignorable="d">
1313

@@ -150,7 +150,7 @@
150150
<TextBlock Margin="0,20,0,0"
151151
FontSize="14"
152152
Foreground="{ThemeResource Brush-Link-Normal}"
153-
Text="The Windows Community Toolkit is a collection of helper functions, custom controls, and app services. It simplifies and demonstrates common developer patterns when building experiences for Windows 10."
153+
Text="The Windows Community Toolkit is a collection of helpers, extensions, and custom controls. It simplifies and demonstrates common developer tasks for building UWP and .NET apps for Windows 10."
154154
TextWrapping="Wrap" />
155155
</StackPanel>
156156

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerButtonPage.xaml.cs

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ColorPicker/ColorPickerPage.xaml.cs

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1212
xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media"
1313
xmlns:mediaactions="using:Microsoft.Xaml.Interactions.Media"
14+
xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
1415
xmlns:triggers="using:Microsoft.Toolkit.Uwp.UI.Triggers"
1516
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
1617
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
@@ -31,6 +32,9 @@
3132
<triggers:UserHandPreferenceStateTrigger x:Key="UserHandPreferenceStateTrigger" />
3233
<triggers:UserInteractionModeStateTrigger x:Key="UserInteractionModeStateTrigger" />
3334
<behaviors:StartAnimationAction x:Key="StartAnimationAction" />
35+
<controls:ColorPicker x:Key="ColorPicker" />
36+
<controls:ColorPickerButton x:Key="ColorPickerButton" />
37+
<primitives:ColorPickerSlider x:Key="ColorPickerSlider" />
3438
<controls:RangeSelector x:Key="RangeSelector" />
3539
<TextBox x:Key="TextBoxExtensions">
3640
<ui:TextBoxExtensions.SurfaceDialOptions>

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,21 @@
3636
},
3737
{
3838
"Name": "ColorPicker",
39-
"Type": "ColorPickerPage",
4039
"Subcategory": "Input",
4140
"About": "An improved color picker control providing more options to select colors.",
4241
"CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker",
43-
"XamlCodeFile": "ColorPickerXaml.bind",
42+
"XamlCodeFile": "/SamplePages/ColorPicker/ColorPickerXaml.bind",
4443
"Icon": "/SamplePages/ColorPicker/ColorPicker.png",
4544
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ColorPicker.md"
4645
},
4746
{
4847
"Name": "ColorPickerButton",
49-
"Type": "ColorPickerButtonPage",
5048
"Subcategory": "Input",
5149
"About": "A color picker within a flyout opened by pressing a dropdown button containing the selected color.",
5250
"CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker",
5351
"XamlCodeFile": "/SamplePages/ColorPicker/ColorPickerButtonXaml.bind",
5452
"Icon": "/SamplePages/ColorPicker/ColorPicker.png",
55-
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ColorPickerButton.md"
53+
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/ColorPicker.md"
5654
},
5755
{
5856
"Name": "AdaptiveGridView",
@@ -919,6 +917,13 @@
919917
"Icon": "/Assets/Helpers.png",
920918
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/high-performance/Introduction.md"
921919
},
920+
{
921+
"Name": "MVVM Toolkit",
922+
"Subcategory": "Developer",
923+
"About": "The MVVM Toolkit package is a modern, fast, and modular MVVM library for .NET Standard 2.0.",
924+
"Icon": "/Assets/Helpers.png",
925+
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/mvvm/Introduction.md"
926+
},
922927
{
923928
"Name": "CompareStateTrigger",
924929
"Subcategory": "State Triggers",

‎Microsoft.Toolkit.Uwp.SampleApp/landingPageLinks.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"new-section-title": "What's New",
3-
"new-samples": [ "TokenizingTextBox", "PipelineBrush", "WrapLayout", "IsNullOrEmptyStateTrigger", "High Performance APIs" ],
3+
"new-samples": [ "MVVM Toolkit", "EffectAnimations", "TabbedCommandBar", "ColorPicker", "ColorPickerButton", "SwitchPresenter" ],
44
"resources": [
55
{
66
"title": "Toolkit",
@@ -28,6 +28,10 @@
2828
{
2929
"title": "UWP Community Discord",
3030
"url": "https://discord.gg/zBA5aCn"
31+
},
32+
{
33+
"title": "Contribution Wiki",
34+
"url": "https://aka.ms/wct/wiki"
3135
}
3236
]
3337
},
@@ -82,11 +86,11 @@
8286
"links": [
8387
{
8488
"title": "Version",
85-
"url": "http://aka.ms/uwptoolkit"
89+
"url": "http://aka.ms/windowstoolkit"
8690
},
8791
{
8892
"title": "ColorCode-Universal (Dependency)",
89-
"url": "https://github.com/WilliamABradley/ColorCode-Universal"
93+
"url": "https://github.com/windows-toolkit/ColorCode-Universal"
9094
},
9195
{
9296
"title": "Monaco Editor UWP (Dependency)",

0 commit comments

Comments
 (0)