Skip to content

Commit a91097c

Browse files
committed
Fixed some build errors in the sample app
1 parent a31958e commit a91097c

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Mouse/MouseCursorPage.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Margin="50,100,20,20"
1010
HorizontalAlignment="Left"
1111
VerticalAlignment="Top"
12-
uwpui:Mouse.Cursor="UniversalNo"
12+
uwpui:FrameworkElementExtensions.Cursor="UniversalNo"
1313
Background="DeepSkyBlue">
1414
<TextBlock Margin="4"
1515
HorizontalAlignment="Center"
@@ -22,7 +22,7 @@
2222
Margin="20"
2323
HorizontalAlignment="Left"
2424
VerticalAlignment="Top"
25-
uwpui:Mouse.Cursor="Wait"
25+
uwpui:FrameworkElementExtensions.Cursor="Wait"
2626
Background="Orange">
2727
<TextBlock Margin="4"
2828
HorizontalAlignment="Center"
@@ -38,7 +38,7 @@
3838
<Button Margin="20,290,20,20"
3939
HorizontalAlignment="Left"
4040
VerticalAlignment="Top"
41-
uwpui:Mouse.Cursor="Hand"
41+
uwpui:FrameworkElementExtensions.Cursor="Hand"
4242
Content="Button with Hand cursor, just like on web" />
4343
</Grid>
4444
</Page>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
<!-- Shallow Copy -->
1010
<Grid>
11-
<TextBox uwpui:SurfaceDialTextbox.StepValue="1.0"
12-
uwpui:SurfaceDialTextbox.ForceMenuItem="True"
13-
uwpui:SurfaceDialTextbox.EnableHapticFeedback="True"
14-
uwpui:SurfaceDialTextbox.EnableMinMaxValue="True"
15-
uwpui:SurfaceDialTextbox.MinValue="0"
16-
uwpui:SurfaceDialTextbox.MaxValue="100"
17-
uwpui:SurfaceDialTextbox.Icon="Ruler"
18-
uwpui:SurfaceDialTextbox.EnableTapToNextControl="True" />
11+
<TextBox uwpui:TextBoxExtensions.StepValue="1.0"
12+
uwpui:TextBoxExtensions.ForceMenuItem="True"
13+
uwpui:TextBoxExtensions.EnableHapticFeedback="True"
14+
uwpui:TextBoxExtensions.EnableMinMaxValue="True"
15+
uwpui:TextBoxExtensions.MinValue="0"
16+
uwpui:TextBoxExtensions.MaxValue="100"
17+
uwpui:TextBoxExtensions.Icon="Ruler"
18+
uwpui:TextBoxExtensions.EnableTapToNextControl="True" />
1919
</Grid>
2020
</Page>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
<!-- Shallow Copy -->
1010
<Grid Visibility="Collapsed">
11-
<TextBox uwpui:TextBoxMask.Mask="9a9a--a9a*"/>
11+
<TextBox uwpui:TextBoxExtensions.Mask="9a9a--a9a*"/>
1212

13-
<TextBox uwpui:TextBoxMask.Mask="+1999-9999"
14-
uwpui:TextBoxMask.PlaceHolder=" " />
13+
<TextBox uwpui:TextBoxExtensions.Mask="+1999-9999"
14+
uwpui:TextBoxExtensions.PlaceHolder=" " />
1515

16-
<TextBox uwpui:TextBoxMask.Mask="+\964 799 999 9999"
17-
uwpui:TextBoxMask.PlaceHolder=" " />
16+
<TextBox uwpui:TextBoxExtensions.Mask="+\964 799 999 9999"
17+
uwpui:TextBoxExtensions.PlaceHolder=" " />
1818

19-
<TextBox uwpui:TextBoxMask.CustomMask="5:[1-5],c:[a-c]"
20-
uwpui:TextBoxMask.Mask="a5c-5c*9" />
19+
<TextBox uwpui:TextBoxExtensions.CustomMask="5:[1-5],c:[a-c]"
20+
uwpui:TextBoxExtensions.Mask="a5c-5c*9" />
2121

2222
</Grid>
2323
</Page>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegexPage.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
<Grid Visibility="Collapsed">
1616

17-
<TextBox uwpui:TextBoxRegex.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$"/>
18-
<TextBlock Text="{Binding (extensions:TextBoxRegex.IsValid), ElementName=PhoneNumberValidator, Converter={StaticResource StringFormatConverter}}" />
17+
<TextBox uwpui:TextBoxExtensions.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$"/>
18+
<TextBlock Text="{Binding (uwpui:TextBoxExtensions.IsValid), ElementName=PhoneNumberValidator, Converter={StaticResource StringFormatConverter}}" />
1919

20-
<TextBox uwpui:TextBoxRegex.ValidationMode="Normal"
21-
uwpui:TextBoxRegex.ValidationType="PhoneNumber" />
20+
<TextBox uwpui:TextBoxExtensions.ValidationMode="Normal"
21+
uwpui:TextBoxExtensions.ValidationType="PhoneNumber" />
2222

2323
</Grid>
2424
</Page>

Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
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:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
7+
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
88
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp"
99
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1010
xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media"
1111
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
12-
extensions:TitleBarExtensions.BackgroundColor="{StaticResource Brand-Color}"
13-
extensions:TitleBarExtensions.ButtonBackgroundColor="{StaticResource Brand-Color}"
14-
extensions:TitleBarExtensions.ButtonForegroundColor="{StaticResource Titlebar-Foreground}"
15-
extensions:TitleBarExtensions.ForegroundColor="{StaticResource Titlebar-Foreground}"
12+
uwpui:TitleBarExtensions.BackgroundColor="{StaticResource Brand-Color}"
13+
uwpui:TitleBarExtensions.ButtonBackgroundColor="{StaticResource Brand-Color}"
14+
uwpui:TitleBarExtensions.ButtonForegroundColor="{StaticResource Titlebar-Foreground}"
15+
uwpui:TitleBarExtensions.ForegroundColor="{StaticResource Titlebar-Foreground}"
1616
SizeChanged="Page_SizeChanged"
1717
mc:Ignorable="d">
1818
<Page.Resources>
@@ -145,7 +145,7 @@
145145
<Grid x:Name="MoreInfoContent"
146146
Width="260"
147147
Height="320"
148-
extensions:VisualExtensions.NormalizedCenterPoint="0.5">
148+
uwpui:VisualExtensions.NormalizedCenterPoint="0.5">
149149
<Grid VerticalAlignment="Top">
150150
<controls:DropShadowPanel HorizontalContentAlignment="Stretch"
151151
VerticalContentAlignment="Stretch"

0 commit comments

Comments
 (0)