Skip to content

Commit 1f3ff5d

Browse files
committed
Renamed "uwpui" XML namespace to "ui"
1 parent a91097c commit 1f3ff5d

File tree

25 files changed

+127
-127
lines changed

25 files changed

+127
-127
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
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:uwpui="using:Microsoft.Toolkit.Uwp.UI"
7+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
88
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Pages"
99
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1010
xmlns:sampleapp="using:Microsoft.Toolkit.Uwp.SampleApp"
@@ -74,7 +74,7 @@
7474
</Page.Resources>
7575

7676
<Grid x:Name="Root"
77-
uwpui:VisualExtensions.NormalizedCenterPoint="0.5"
77+
ui:VisualExtensions.NormalizedCenterPoint="0.5"
7878
Visibility="Collapsed">
7979
<controls:DropShadowPanel x:Name="DropShadow"
8080
HorizontalAlignment="Center"
@@ -92,7 +92,7 @@
9292

9393
<Border x:Name="RightBorder"
9494
Grid.Column="1"
95-
uwpui:VisualExtensions.NormalizedCenterPoint="0, 0.5"
95+
ui:VisualExtensions.NormalizedCenterPoint="0, 0.5"
9696
Background="{ThemeResource Background-AboutPage-SidePane}">
9797
<animations:Implicit.ShowAnimations>
9898
<animations:ScaleAnimation From="0, 1, 0"

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ClipToBounds/ClipToBoundsPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
6+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
88
mc:Ignorable="d">
99

1010
<Grid x:Name="TargetObject"
11-
uwpui:UIElementExtensions.ClipToBounds="True"/>
11+
ui:UIElementExtensions.ClipToBounds="True"/>
1212

1313
</Page>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/EnumValuesExtension/EnumValuesExtensionPage.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
6+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
77
xmlns:enums="using:Microsoft.Toolkit.Uwp.SampleApp.Enums"
88
xmlns:converters="using:Microsoft.Toolkit.Uwp.SampleApp.Converters"
99
mc:Ignorable="d">
@@ -13,8 +13,8 @@
1313
</Page.Resources>
1414
<Grid>
1515
<StackPanel Spacing="8">
16-
<ComboBox ItemsSource="{uwpui:EnumValues Type=enums:Animal}"/>
17-
<ComboBox ItemsSource="{uwpui:EnumValues Type=enums:Animal}"
16+
<ComboBox ItemsSource="{ui:EnumValues Type=enums:Animal}"/>
17+
<ComboBox ItemsSource="{ui:EnumValues Type=enums:Animal}"
1818
SelectedIndex="0">
1919
<ComboBox.ItemTemplate>
2020
<DataTemplate>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FrameworkElementExtensions/FrameworkElementExtensionsPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
5+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
mc:Ignorable="d">
88

99
<Rectangle x:Name="TargetObject"
10-
uwpui:FrameworkElementExtensions.EnableActualSizeBinding="true"
10+
ui:FrameworkElementExtensions.EnableActualSizeBinding="true"
1111
Fill="{ThemeResource Brush-Main}"
1212
Stroke="{ThemeResource Brush-Grey-04}"
1313
StrokeThickness="1" />

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
6+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
77
mc:Ignorable="d">
88
<Grid>
99
<StackPanel>
1010

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

1616
<SwipeControl>
1717
<SwipeControl.LeftItems>
1818
<SwipeItems Mode="Reveal">
19-
<SwipeItem Text="Accept" IconSource="{uwpui:FontIconSource Glyph=&#xE10B;}"/>
20-
<SwipeItem Text="Play" IconSource="{uwpui:SymbolIconSource Symbol=Play}"/>
21-
<SwipeItem IconSource="{uwpui:BitmapIconSource Source=/Assets/ToolkitLogo.png}"/>
19+
<SwipeItem Text="Accept" IconSource="{ui:FontIconSource Glyph=&#xE10B;}"/>
20+
<SwipeItem Text="Play" IconSource="{ui:SymbolIconSource Symbol=Play}"/>
21+
<SwipeItem IconSource="{ui:BitmapIconSource Source=/Assets/ToolkitLogo.png}"/>
2222
</SwipeItems>
2323
</SwipeControl.LeftItems>
2424
</SwipeControl>
2525

2626
<Button>
2727
<Button.Flyout>
2828
<MenuFlyout>
29-
<MenuFlyoutItem Icon="{uwpui:BitmapIcon Source=/Assets/ToolkitLogo.png}" />
29+
<MenuFlyoutItem Icon="{ui:BitmapIcon Source=/Assets/ToolkitLogo.png}" />
3030
</MenuFlyout>
3131
</Button.Flyout>
3232
</Button>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
7+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
88
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
99
mc:Ignorable="d">
1010
<Page.Resources>
@@ -34,7 +34,7 @@
3434

3535

3636
<!-- Need to have an placeholder of each element so they can be used in the XAML editor -->
37-
<Grid uwpui:VisualExtensions.CenterPoint="50,50,0">
37+
<Grid ui:VisualExtensions.CenterPoint="50,50,0">
3838
<animations:Implicit.ShowAnimations>
3939
<animations:OpacityAnimation From="0" To="1"/>
4040
</animations:Implicit.ShowAnimations>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
5+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
mc:Ignorable="d">
88

@@ -22,10 +22,10 @@
2222

2323
<ListView x:Name="SampleListView"
2424
Margin="12"
25-
uwpui:ListViewExtensions.AlternateColor="#33AAAAAA"
26-
uwpui:ListViewExtensions.AlternateItemTemplate="{StaticResource AlternateTemplate}"
27-
uwpui:ListViewExtensions.Command="{Binding SampleCommand}"
28-
uwpui:ListViewExtensions.StretchItemContainerDirection="Both"
25+
ui:ListViewExtensions.AlternateColor="#33AAAAAA"
26+
ui:ListViewExtensions.AlternateItemTemplate="{StaticResource AlternateTemplate}"
27+
ui:ListViewExtensions.Command="{Binding SampleCommand}"
28+
ui:ListViewExtensions.StretchItemContainerDirection="Both"
2929
IsItemClickEnabled="True"
3030
ItemTemplate="{StaticResource NormalTemplate}" />
3131
</Grid>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.MouseCursorPage"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI">
4+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI">
55

66
<Grid>
77
<Border Width="220"
88
Height="120"
99
Margin="50,100,20,20"
1010
HorizontalAlignment="Left"
1111
VerticalAlignment="Top"
12-
uwpui:FrameworkElementExtensions.Cursor="UniversalNo"
12+
ui: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:FrameworkElementExtensions.Cursor="Wait"
25+
ui: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:FrameworkElementExtensions.Cursor="Hand"
41+
ui:FrameworkElementExtensions.Cursor="Hand"
4242
Content="Button with Hand cursor, just like on web" />
4343
</Grid>
4444
</Page>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
55
xmlns:common="using:Microsoft.Toolkit.Uwp.SampleApp.Common"
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7-
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
7+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
88
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
99
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1010
mc:Ignorable="d">
@@ -15,7 +15,7 @@
1515

1616
<Grid>
1717
<ListView Name="listView"
18-
uwpui:ScrollViewerExtensions.VerticalScrollBarMargin="{Binding MinHeight, ElementName=MyHeaderGrid, Converter={StaticResource DoubleTopThicknessConverter}}">
18+
ui:ScrollViewerExtensions.VerticalScrollBarMargin="{Binding MinHeight, ElementName=MyHeaderGrid, Converter={StaticResource DoubleTopThicknessConverter}}">
1919
<interactivity:Interaction.Behaviors>
2020
<behaviors:StickyHeaderBehavior />
2121
</interactivity:Interaction.Behaviors>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
6+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
77
mc:Ignorable="d">
88

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

0 commit comments

Comments
 (0)