Skip to content

Commit 93d73b9

Browse files
ArlodotexeArlodotexe
committed
Refactor TokenView component to use CommunityToolkit.WinUI.Controls namespace
1 parent bfa84db commit 93d73b9

21 files changed

+82
-81
lines changed

‎components/TokenView/samples/TokenViewBasicSample.xaml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,57 +3,57 @@
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:labs="using:CommunityToolkit.Labs.WinUI"
6+
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
77
xmlns:local="using:TokenViewExperiment.Samples"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d">
1010

1111
<Grid>
12-
<labs:TokenView IsWrapped="{x:Bind IsWrapped, Mode=OneWay}"
12+
<controls:TokenView IsWrapped="{x:Bind IsWrapped, Mode=OneWay}"
1313
SelectedIndex="2"
1414
SelectionMode="{x:Bind local:TokenViewBasicSample.ConvertStringToListViewSelectionMode(SelectionMode), Mode=OneWay}">
15-
<labs:TokenItem Content="All" />
15+
<controls:TokenItem Content="All" />
1616

17-
<labs:TokenItem Content="Apps">
18-
<labs:TokenItem.Icon>
17+
<controls:TokenItem Content="Apps">
18+
<controls:TokenItem.Icon>
1919
<FontIcon Glyph="&#xECAA;" />
20-
</labs:TokenItem.Icon>
21-
</labs:TokenItem>
22-
<labs:TokenItem Content="Work">
23-
<labs:TokenItem.Icon>
20+
</controls:TokenItem.Icon>
21+
</controls:TokenItem>
22+
<controls:TokenItem Content="Work">
23+
<controls:TokenItem.Icon>
2424
<FontIcon Glyph="&#xE821;" />
25-
</labs:TokenItem.Icon>
26-
</labs:TokenItem>
27-
<labs:TokenItem Content="Documents">
28-
<labs:TokenItem.Icon>
25+
</controls:TokenItem.Icon>
26+
</controls:TokenItem>
27+
<controls:TokenItem Content="Documents">
28+
<controls:TokenItem.Icon>
2929
<FontIcon Glyph="&#xE8A5;" />
30-
</labs:TokenItem.Icon>
31-
</labs:TokenItem>
32-
<labs:TokenItem Content="Web">
33-
<labs:TokenItem.Icon>
30+
</controls:TokenItem.Icon>
31+
</controls:TokenItem>
32+
<controls:TokenItem Content="Web">
33+
<controls:TokenItem.Icon>
3434
<FontIcon Glyph="&#xE774;" />
35-
</labs:TokenItem.Icon>
36-
</labs:TokenItem>
37-
<labs:TokenItem Content="Settings">
38-
<labs:TokenItem.Icon>
35+
</controls:TokenItem.Icon>
36+
</controls:TokenItem>
37+
<controls:TokenItem Content="Settings">
38+
<controls:TokenItem.Icon>
3939
<FontIcon Glyph="&#xE713;" />
40-
</labs:TokenItem.Icon>
41-
</labs:TokenItem>
42-
<labs:TokenItem Content="People">
43-
<labs:TokenItem.Icon>
40+
</controls:TokenItem.Icon>
41+
</controls:TokenItem>
42+
<controls:TokenItem Content="People">
43+
<controls:TokenItem.Icon>
4444
<FontIcon Glyph="&#xE716;" />
45-
</labs:TokenItem.Icon>
46-
</labs:TokenItem>
47-
<labs:TokenItem Content="Folders">
48-
<labs:TokenItem.Icon>
45+
</controls:TokenItem.Icon>
46+
</controls:TokenItem>
47+
<controls:TokenItem Content="Folders">
48+
<controls:TokenItem.Icon>
4949
<FontIcon Glyph="&#xE8B7;" />
50-
</labs:TokenItem.Icon>
51-
</labs:TokenItem>
52-
<labs:TokenItem Content="Photos">
53-
<labs:TokenItem.Icon>
50+
</controls:TokenItem.Icon>
51+
</controls:TokenItem>
52+
<controls:TokenItem Content="Photos">
53+
<controls:TokenItem.Icon>
5454
<FontIcon Glyph="&#xE91B;" />
55-
</labs:TokenItem.Icon>
56-
</labs:TokenItem>
57-
</labs:TokenView>
55+
</controls:TokenItem.Icon>
56+
</controls:TokenItem>
57+
</controls:TokenView>
5858
</Grid>
5959
</Page>

‎components/TokenView/samples/TokenViewBasicSample.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using CommunityToolkit.Labs.WinUI;
5+
using CommunityToolkit.WinUI.Controls;
66

77
namespace TokenViewExperiment.Samples;
88

‎components/TokenView/samples/TokenViewItemsSourceSample.xaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
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:labs="using:CommunityToolkit.Labs.WinUI"
6+
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
77
xmlns:local="using:TokenViewExperiment.Samples"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d">
1010

1111
<StackPanel Orientation="Vertical"
1212
Spacing="12">
13-
<labs:TokenView x:Name="TokenView"
13+
<controls:TokenView x:Name="TokenView"
1414
CanRemoveTokens="{x:Bind CanRemoveTokens, Mode=OneWay}"
1515
ItemsSource="{x:Bind MyDataSet, Mode=OneWay}"
1616
SelectedIndex="1"
1717
SelectionMode="Single">
18-
<labs:TokenView.ItemTemplate>
18+
<controls:TokenView.ItemTemplate>
1919
<DataTemplate x:DataType="local:MyDataModel">
2020
<Grid>
2121
<TextBlock Margin="16,0,16,0"
2222
Style="{StaticResource CaptionTextBlockStyle}"
2323
Text="{x:Bind Name}" />
2424
</Grid>
2525
</DataTemplate>
26-
</labs:TokenView.ItemTemplate>
27-
</labs:TokenView>
26+
</controls:TokenView.ItemTemplate>
27+
</controls:TokenView>
2828
<TextBlock Margin="0,0,12,0"
2929
VerticalAlignment="Center">
3030
<Run Text="Selected:" />

‎components/TokenView/samples/TokenViewItemsSourceSample.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using CommunityToolkit.Labs.WinUI;
5+
using CommunityToolkit.WinUI.Controls;
66

77
namespace TokenViewExperiment.Samples;
88

‎components/TokenView/samples/TokenViewRemoveSample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using CommunityToolkit.Labs.WinUI;
5+
using CommunityToolkit.WinUI.Controls;
66

77
namespace TokenViewExperiment.Samples;
88

‎components/TokenView/samples/TokenViewRemoveSample.xaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
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:labs="using:CommunityToolkit.Labs.WinUI"
6+
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
77
xmlns:local="using:TokenViewExperiment.Samples"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d">
1010

11-
<labs:TokenView CanRemoveTokens="{x:Bind CanRemoveTokens, Mode=OneWay}"
11+
<controls:TokenView CanRemoveTokens="{x:Bind CanRemoveTokens, Mode=OneWay}"
1212
SelectionMode="Single">
13-
<labs:TokenItem Content="All" />
14-
<labs:TokenItem Content="Work" />
15-
<labs:TokenItem Content="Apps" />
16-
<labs:TokenItem Content="Documents" />
17-
<labs:TokenItem Content="Web"
13+
<controls:TokenItem Content="All" />
14+
<controls:TokenItem Content="Work" />
15+
<controls:TokenItem Content="Apps" />
16+
<controls:TokenItem Content="Documents" />
17+
<controls:TokenItem Content="Web"
1818
IsRemoveable="True" />
19-
<labs:TokenItem Content="Settings" />
20-
<labs:TokenItem Content="People" />
21-
<labs:TokenItem Content="Folders" />
22-
<labs:TokenItem Content="Photos" />
23-
</labs:TokenView>
19+
<controls:TokenItem Content="Settings" />
20+
<controls:TokenItem Content="People" />
21+
<controls:TokenItem Content="Folders" />
22+
<controls:TokenItem Content="Photos" />
23+
</controls:TokenView>
2424
</Page>

‎components/TokenView/src/CommunityToolkit.Labs.WinUI.Controls.TokenView.csproj‎ renamed to ‎components/TokenView/src/CommunityToolkit.WinUI.Controls.TokenView.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Description>This package contains TokenView.</Description>
66

77
<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
8-
<RootNamespace>CommunityToolkit.Labs.WinUI.TokenViewRns</RootNamespace>
8+
<RootNamespace>CommunityToolkit.WinUI.Controls.TokenViewRns</RootNamespace>
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1010
</PropertyGroup>
1111

‎components/TokenView/src/Helpers/ControlHelpers.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
using System.Collections.Generic;
77
using System.Text;
88

9-
namespace CommunityToolkit.Labs.WinUI;
9+
namespace CommunityToolkit.WinUI.Controls;
10+
1011
internal static partial class ControlHelpers
1112
{
1213
internal static bool IsXamlRootAvailable { get; } = Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot");

‎components/TokenView/src/Themes/Generic.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:labs="using:CommunityToolkit.Labs.WinUI">
3+
xmlns:controls="using:CommunityToolkit.WinUI.Controls">
44

55
<ResourceDictionary.MergedDictionaries>
6-
<ResourceDictionary Source="ms-appx:///CommunityToolkit.Labs.WinUI.TokenView/TokenView/TokenView.xaml" />
7-
<ResourceDictionary Source="ms-appx:///CommunityToolkit.Labs.WinUI.TokenView/TokenItem/TokenItem.xaml" />
6+
<ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.TokenView/TokenView/TokenView.xaml" />
7+
<ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.TokenView/TokenItem/TokenItem.xaml" />
88
</ResourceDictionary.MergedDictionaries>
99
</ResourceDictionary>

‎components/TokenView/src/TokenItem/TokenItem.Properties.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
namespace CommunityToolkit.Labs.WinUI;
5+
namespace CommunityToolkit.WinUI.Controls;
66

77
public partial class TokenItem : ListViewItem
88
{

0 commit comments

Comments
 (0)