Skip to content

Commit 5363919

Browse files
azchohfiazchohfi
committed
Merge branch 'master' into dev/7.0.0
2 parents 0913a8d + a33cf2f commit 5363919

36 files changed

+439
-179
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,7 @@
553553
<Compile Include="SamplePages\StaggeredLayout\StaggeredLayoutPage.xaml.cs">
554554
<DependentUpon>StaggeredLayoutPage.xaml</DependentUpon>
555555
</Compile>
556+
<Compile Include="SamplePages\TokenizingTextBox\NameToColorConverter.cs" />
556557
<Compile Include="SamplePages\TokenizingTextBox\SampleDataType.cs" />
557558
<Compile Include="SamplePages\TokenizingTextBox\SampleEmailDataType.cs" />
558559
<Compile Include="SamplePages\TokenizingTextBox\TokenizingTextBoxPage.xaml.cs">
@@ -1592,6 +1593,9 @@
15921593
<UseVSHostingProcess>false</UseVSHostingProcess>
15931594
<ErrorReport>prompt</ErrorReport>
15941595
<Prefer32Bit>true</Prefer32Bit>
1596+
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
1597+
<RunCodeAnalysis>false</RunCodeAnalysis>
1598+
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
15951599
</PropertyGroup>
15961600
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
15971601
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -1634,4 +1638,4 @@
16341638
<Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
16351639
<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" />
16361640
</Target>
1637-
</Project>
1641+
</Project>

‎Microsoft.Toolkit.Uwp.SampleApp/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" IgnorableNamespaces="uap mp uap3">
3-
<Identity Name="52b9212c-97a9-4639-9426-3e1ea9c1569e" Publisher="CN=Nikola" Version="6.0.0.0" />
3+
<Identity Name="52b9212c-97a9-4639-9426-3e1ea9c1569e" Publisher="CN=Nikola" Version="6.1.0.0" />
44
<mp:PhoneIdentity PhoneProductId="52b9212c-97a9-4639-9426-3e1ea9c1569e" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
55
<Properties>
66
<DisplayName>Microsoft.Toolkit.Uwp.SampleApp</DisplayName>

‎Microsoft.Toolkit.Uwp.SampleApp/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
[assembly: AssemblyTitle("Microsoft.Toolkit.Uwp.SampleApp")]
1212
[assembly: AssemblyDescription("")]
1313
[assembly: AssemblyConfiguration("")]
14-
[assembly: AssemblyCompany("")]
14+
[assembly: AssemblyCompany(".NET Foundation")]
1515
[assembly: AssemblyProduct("Microsoft.Toolkit.Uwp.SampleApp")]
16-
[assembly: AssemblyCopyright("Copyright © 2016")]
16+
[assembly: AssemblyCopyright("Copyright © 2016-2020")]
1717
[assembly: AssemblyTrademark("")]
1818
[assembly: AssemblyCulture("")]
1919

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/IconExtensions/IconExtensionsPage.xaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010

1111
<CommandBar>
1212
<AppBarButton Icon="{ex:FontIcon Glyph=&#xE102;}"/>
13-
<AppBarButton Icon="{ex:SymbolIcon Glyph=Play}"/>
13+
<AppBarButton Icon="{ex:SymbolIcon Symbol=Play}"/>
1414
</CommandBar>
1515

1616
<SwipeControl>
1717
<SwipeControl.LeftItems>
1818
<SwipeItems Mode="Reveal">
1919
<SwipeItem Text="Accept" IconSource="{ex:FontIconSource Glyph=&#xE10B;}"/>
20-
<SwipeItem Text="Play" IconSource="{ex:SymbolIconSource Glyph=Play}"/>
20+
<SwipeItem Text="Play" IconSource="{ex:SymbolIconSource Symbol=Play}"/>
21+
<SwipeItem IconSource="{ex:BitmapIconSource Source=/Assets/ToolkitLogo.png}"/>
2122
</SwipeItems>
2223
</SwipeControl.LeftItems>
2324
</SwipeControl>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/IconExtensions/IconExtensionsXaml.bind

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
Style="{StaticResource BodyTextBlockStyle}"/>
2727

2828
<CommandBar>
29-
<AppBarButton Icon="{ex:SymbolIcon Glyph=Play}"/>
30-
<AppBarButton Icon="{ex:SymbolIcon Glyph=Pause}"/>
31-
<AppBarButton Icon="{ex:SymbolIcon Glyph=Home}"/>
29+
<AppBarButton Icon="{ex:SymbolIcon Symbol=Play}"/>
30+
<AppBarButton Icon="{ex:SymbolIcon Symbol=Pause}"/>
31+
<AppBarButton Icon="{ex:SymbolIcon Symbol=Home}"/>
3232
</CommandBar>
3333

3434
<TextBlock Text="Use the FontIconSource extension to create FontIconSource items from custom glyphs."
@@ -49,6 +49,24 @@
4949
HorizontalAlignment="Center" VerticalAlignment="Center"/>
5050
</SwipeControl>
5151

52+
<TextBlock Text="Use the BitmapIconSource extension to create BitmapIconSource items from image paths."
53+
TextWrapping="Wrap"
54+
Style="{StaticResource BodyTextBlockStyle}"/>
55+
56+
<SwipeControl BorderThickness="1"
57+
Background="#40000000"
58+
Width="300" Margin="12" Height="68">
59+
<SwipeControl.LeftItems>
60+
<SwipeItems Mode="Reveal">
61+
<SwipeItem IconSource="{ex:BitmapIconSource Source=/Assets/ToolkitLogo.png}"/>
62+
<SwipeItem IconSource="{ex:BitmapIconSource Source=/Assets/mslogo.png}"/>
63+
</SwipeItems>
64+
</SwipeControl.LeftItems>
65+
<TextBlock Text="Swipe Right"
66+
Margin="12"
67+
HorizontalAlignment="Center" VerticalAlignment="Center"/>
68+
</SwipeControl>
69+
5270
<TextBlock Text="Use the SymbolIconSource extension to create FontIconSource items from known symbols."
5371
TextWrapping="Wrap"
5472
Style="{StaticResource BodyTextBlockStyle}"/>
@@ -58,8 +76,8 @@
5876
Width="300" Margin="12" Height="68">
5977
<SwipeControl.LeftItems>
6078
<SwipeItems Mode="Reveal">
61-
<SwipeItem Text="Accept" IconSource="{ex:FontIconSource Glyph=Accept}"/>
62-
<SwipeItem Text="Flag" IconSource="{ex:FontIconSource Glyph=Flag}"/>
79+
<SwipeItem Text="Accept" IconSource="{ex:SymbolIconSource Symbol=Accept}"/>
80+
<SwipeItem Text="Flag" IconSource="{ex:SymbolIconSource Symbol=Flag}"/>
6381
</SwipeItems>
6482
</SwipeControl.LeftItems>
6583
<TextBlock Text="Swipe Right"

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public StaggeredLayoutPage()
3434

3535
public void OnXamlRendered(FrameworkElement control)
3636
{
37-
var repeater = control.FindChildByName("StaggeredRepeater") as ItemsRepeater;
37+
var repeater = control.FindDescendantByName("StaggeredRepeater") as ItemsRepeater;
3838

3939
if (repeater != null)
4040
{

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/NameToColorConverter.cs

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
using System;
6+
using Windows.UI;
7+
using Windows.UI.Xaml.Data;
8+
using Windows.UI.Xaml.Media;
9+
10+
namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
11+
{
12+
public class NameToColorConverter : IValueConverter
13+
{
14+
public object Convert(object value, Type targetType, object parameter, string language)
15+
{
16+
var color = Colors.Black;
17+
18+
if (value != null)
19+
{
20+
var hash = value.GetHashCode();
21+
22+
var rnd = new Random(hash);
23+
24+
color = Color.FromArgb(255, (byte)rnd.Next(64, 192), (byte)rnd.Next(64, 192), (byte)rnd.Next(64, 192));
25+
}
26+
27+
return new SolidColorBrush(color);
28+
}
29+
30+
public object ConvertBack(object value, Type targetType, object parameter, string language)
31+
{
32+
throw new NotImplementedException();
33+
}
34+
}
35+
}

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/SampleEmailDataType.cs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
1313
public class SampleEmailDataType
1414
{
1515
/// <summary>
16-
/// Gets or sets symbol to display.
16+
/// Gets the initials to Display
1717
/// </summary>
18-
public Symbol Icon { get; set; }
18+
public string Initials => string.Empty + FirstName[0] + FamilyName[0];
1919

2020
/// <summary>
2121
/// Gets or sets the first name .
@@ -30,24 +30,12 @@ public class SampleEmailDataType
3030
/// <summary>
3131
/// Gets the display text.
3232
/// </summary>
33-
public string DisplayName
34-
{
35-
get
36-
{
37-
return string.Format("{0} {1}", FirstName, FamilyName);
38-
}
39-
}
33+
public string DisplayName => $"{FirstName} {FamilyName}";
4034

4135
/// <summary>
4236
/// Gets the formatted email address
4337
/// </summary>
44-
public string EmailAddress
45-
{
46-
get
47-
{
48-
return string.Format("{0} <{1}.{2}@contoso.com>", DisplayName, FirstName, FamilyName);
49-
}
50-
}
38+
public string EmailAddress => $"{DisplayName} <{FirstName}.{FamilyName}@contoso.com>";
5139

5240
public override string ToString()
5341
{

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxPage.xaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
78
mc:Ignorable="d">
8-
9+
<Page.Resources>
10+
<local:NameToColorConverter x:Key="NameToColorConverter"/>
11+
</Page.Resources>
12+
913
<Grid Visibility="Collapsed">
1014
<SymbolIcon Symbol="Accept"/>
1115
<controls:TokenizingTextBox />

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxPage.xaml.cs

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,36 @@ public sealed partial class TokenizingTextBoxPage : Page, IXamlRenderListener
2222
//// TODO: We should use images here.
2323
private readonly List<SampleEmailDataType> _emailSamples = new List<SampleEmailDataType>()
2424
{
25-
new SampleEmailDataType() { FirstName = "Marcus", FamilyName = "Perryman", Icon = Symbol.Account },
26-
new SampleEmailDataType() { FirstName = "Ian", FamilyName = "Smith", Icon = Symbol.AddFriend },
27-
new SampleEmailDataType() { FirstName = "Peter", FamilyName = "Strange", Icon = Symbol.Attach },
28-
new SampleEmailDataType() { FirstName = "Alex", FamilyName = "Wilber", Icon = Symbol.AttachCamera },
29-
new SampleEmailDataType() { FirstName = "Allan", FamilyName = "Deyoung", Icon = Symbol.Audio },
30-
new SampleEmailDataType() { FirstName = "Adele", FamilyName = "Vance", Icon = Symbol.BlockContact },
31-
new SampleEmailDataType() { FirstName = "Grady", FamilyName = "Archie", Icon = Symbol.Calculator },
32-
new SampleEmailDataType() { FirstName = "Megan", FamilyName = "Bowen", Icon = Symbol.Calendar },
33-
new SampleEmailDataType() { FirstName = "Ben", FamilyName = "Walters", Icon = Symbol.Camera },
34-
new SampleEmailDataType() { FirstName = "Debra", FamilyName = "Berger", Icon = Symbol.Contact },
35-
new SampleEmailDataType() { FirstName = "Emily", FamilyName = "Braun", Icon = Symbol.Favorite },
36-
new SampleEmailDataType() { FirstName = "Christine", FamilyName = "Cline", Icon = Symbol.Link },
37-
new SampleEmailDataType() { FirstName = "Enrico", FamilyName = "Catteneo", Icon = Symbol.Mail },
38-
new SampleEmailDataType() { FirstName = "Davit", FamilyName = "Badalyan", Icon = Symbol.Map },
39-
new SampleEmailDataType() { FirstName = "Diego", FamilyName = "Siciliani", Icon = Symbol.Phone },
40-
new SampleEmailDataType() { FirstName = "Raul", FamilyName = "Razo", Icon = Symbol.Pin },
41-
new SampleEmailDataType() { FirstName = "Miriam", FamilyName = "Graham", Icon = Symbol.Rotate },
42-
new SampleEmailDataType() { FirstName = "Lynne", FamilyName = "Robbins", Icon = Symbol.RotateCamera },
43-
new SampleEmailDataType() { FirstName = "Lydia", FamilyName = "Holloway", Icon = Symbol.Send },
44-
new SampleEmailDataType() { FirstName = "Nestor", FamilyName = "Wilke", Icon = Symbol.Tag },
45-
new SampleEmailDataType() { FirstName = "Patti", FamilyName = "Fernandez", Icon = Symbol.UnFavorite },
46-
new SampleEmailDataType() { FirstName = "Pradeep", FamilyName = "Gupta", Icon = Symbol.UnPin },
47-
new SampleEmailDataType() { FirstName = "Joni", FamilyName = "Sherman", Icon = Symbol.Zoom },
48-
new SampleEmailDataType() { FirstName = "Isaiah", FamilyName = "Langer", Icon = Symbol.ZoomIn },
49-
new SampleEmailDataType() { FirstName = "Irvin", FamilyName = "Sayers", Icon = Symbol.ZoomOut },
25+
new SampleEmailDataType() { FirstName = "Marcus", FamilyName = "Perryman" },
26+
new SampleEmailDataType() { FirstName = "Michael", FamilyName = "Hawker" },
27+
new SampleEmailDataType() { FirstName = "Matt", FamilyName = "Lacey" },
28+
new SampleEmailDataType() { FirstName = "Alexandre", FamilyName = "Chohfi" },
29+
new SampleEmailDataType() { FirstName = "Filip", FamilyName = "Wallberg" },
30+
new SampleEmailDataType() { FirstName = "Shane", FamilyName = "Weaver" },
31+
new SampleEmailDataType() { FirstName = "Vincent", FamilyName = "Gromfeld" },
32+
new SampleEmailDataType() { FirstName = "Sergio", FamilyName = "Pedri" },
33+
new SampleEmailDataType() { FirstName = "Alex", FamilyName = "Wilber" },
34+
new SampleEmailDataType() { FirstName = "Allan", FamilyName = "Deyoung" },
35+
new SampleEmailDataType() { FirstName = "Adele", FamilyName = "Vance" },
36+
new SampleEmailDataType() { FirstName = "Grady", FamilyName = "Archie" },
37+
new SampleEmailDataType() { FirstName = "Megan", FamilyName = "Bowen" },
38+
new SampleEmailDataType() { FirstName = "Ben", FamilyName = "Walters" },
39+
new SampleEmailDataType() { FirstName = "Debra", FamilyName = "Berger" },
40+
new SampleEmailDataType() { FirstName = "Emily", FamilyName = "Braun" },
41+
new SampleEmailDataType() { FirstName = "Christine", FamilyName = "Cline" },
42+
new SampleEmailDataType() { FirstName = "Enrico", FamilyName = "Catteneo" },
43+
new SampleEmailDataType() { FirstName = "Davit", FamilyName = "Badalyan" },
44+
new SampleEmailDataType() { FirstName = "Diego", FamilyName = "Siciliani" },
45+
new SampleEmailDataType() { FirstName = "Raul", FamilyName = "Razo" },
46+
new SampleEmailDataType() { FirstName = "Miriam", FamilyName = "Graham" },
47+
new SampleEmailDataType() { FirstName = "Lynne", FamilyName = "Robbins" },
48+
new SampleEmailDataType() { FirstName = "Lydia", FamilyName = "Holloway" },
49+
new SampleEmailDataType() { FirstName = "Nestor", FamilyName = "Wilke" },
50+
new SampleEmailDataType() { FirstName = "Patti", FamilyName = "Fernandez" },
51+
new SampleEmailDataType() { FirstName = "Pradeep", FamilyName = "Gupta" },
52+
new SampleEmailDataType() { FirstName = "Joni", FamilyName = "Sherman" },
53+
new SampleEmailDataType() { FirstName = "Isaiah", FamilyName = "Langer" },
54+
new SampleEmailDataType() { FirstName = "Irvin", FamilyName = "Sayers" },
5055
};
5156

5257
// TODO: Setup ACV for this collection as well.

0 commit comments

Comments
 (0)