Skip to content

Commit 7a7ec26

Browse files
Merge pull request #3727 from RosarioPulella/refactor/input-controls
Split out input controls from core
2 parents 7463d9f + f1fe78d commit 7a7ec26

File tree

68 files changed

+681
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+681
-57
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,6 +1463,10 @@
14631463
<Project>{daeb9cec-c817-33b2-74b2-bc379380db72}</Project>
14641464
<Name>Microsoft.Toolkit.Uwp.UI.Controls.DataGrid</Name>
14651465
</ProjectReference>
1466+
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj">
1467+
<Project>{af1be4e9-e2e1-4729-b076-b3725d8e21ee}</Project>
1468+
<Name>Microsoft.Toolkit.Uwp.UI.Controls.Input</Name>
1469+
</ProjectReference>
14661470
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj">
14671471
<Project>{cb444381-18ba-4a51-bb32-3a498bcc1e99}</Project>
14681472
<Name>Microsoft.Toolkit.Uwp.UI.Controls.Layout</Name>

Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,8 @@
9191
<Compile Include="Controls\Menu.Typedata.cs" />
9292
<Compile Include="Controls\MenuItem.Metadata.cs" />
9393
<Compile Include="Controls\MenuItem.Typedata.cs" />
94-
<Compile Include="Controls\RadialGauge.Metadata.cs" />
95-
<Compile Include="Controls\RadialGauge.Typedata.cs" />
9694
<Compile Include="Controls\RadialProgressBar.Metadata.cs" />
9795
<Compile Include="Controls\RadialProgressBar.Typedata.cs" />
98-
<Compile Include="Controls\RangeSelector.Metadata.cs" />
99-
<Compile Include="Controls\RangeSelector.Typedata.cs" />
10096
<Compile Include="Controls\RotatorTile.Metadata.cs" />
10197
<Compile Include="Controls\RotatorTile.Typedata.cs" />
10298
<Compile Include="Controls\ScrollHeader.Metadata.cs" />

Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,16 @@
88

99
Controls:
1010
- CameraPreview: Easily preview video from camera sources and get realtime frames from the selected source.
11-
- ColorPicker/ColorPickerButton: Improved ColorPicker and DropDownButton version.
1211
- DropShadowPanel: DropShadowPanel control allows the creation of a DropShadow for any Xaml FrameworkElement in markup.
1312
- ImageEx: Images are downloaded asynchronously showing a load indicator and can be stored in a local cache.
1413
- InAppNotification: Show local notifications in your application.
1514
- Loading: Helps to show content with animation to the user while the app is doing some calculation.
16-
- RadialGauge: Displays a value within a range, using a needle on a circular face.
1715
- RadialProgressBar: Displays progress as a circle getting filled.
18-
- RangeSelector: "Double slider" control for range values.
19-
- RemoteDevicePicker: Remote Device Picker Control for Project Rome.
2016
- RotatorTile: Rotates through a set of items one-by-one like a live-tile.
2117
- TextToolbar: A Toolbar for Editing Text attached to a RichEditBox. It can format RTF, Markdown, or use a Custom Formatter.
2218
- TileControl: A ContentControl that show an image repeated many times.
23-
- TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags.
2419
</Description>
25-
<PackageTags>UWP Toolkit Windows Controls XAML Range Markdown CameraPreview Camera DropShadow ImageEx InAppNotification InfiniteCanvas Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader Tile Tokenizing TextBox</PackageTags>
20+
<PackageTags>UWP Toolkit Windows Controls XAML Markdown CameraPreview Camera DropShadow ImageEx InAppNotification InfiniteCanvas Radial RadialProgressBar Scroll ScrollHeader Tile</PackageTags>
2621
<!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
2722
<EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
2823
<LangVersion>8.0</LangVersion>

Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@
44
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=hamburgermenu_005Cmenuitems/@EntryIndexedValue">True</s:Boolean>
55
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=imageex/@EntryIndexedValue">True</s:Boolean>
66
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=pulltorefreshlistview/@EntryIndexedValue">True</s:Boolean>
7-
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=radialgauge/@EntryIndexedValue">True</s:Boolean>
8-
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=rangeselector/@EntryIndexedValue">True</s:Boolean>
97
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=rotatortile/@EntryIndexedValue">True</s:Boolean>
108
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=slidablelistitem/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,4 @@
201201
<value>Notification</value>
202202
<comment>The landmark name for the InAppNotification control. It is said by the narrator when using landmark navigation.</comment>
203203
</data>
204-
<data name="WCT_TokenizingTextBoxItem_MenuFlyout_Remove" xml:space="preserve">
205-
<value>Remove</value>
206-
<comment>Label for TokenizingTextBox MenuFlyout 'Remove' option.</comment>
207-
</data>
208-
<data name="WCT_TokenizingTextBox_MenuFlyout_SelectAll" xml:space="preserve">
209-
<value>Select All</value>
210-
<comment>Label for TokenizingTextBox MenuFlyout 'Select All' option.</comment>
211-
</data>
212-
</root>
204+
</root>

Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,14 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
33
<ResourceDictionary.MergedDictionaries>
44
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.xaml" />
5-
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml" />
6-
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml" />
7-
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml" />
85
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml" />
96
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.xaml" />
107
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml" />
118
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml" />
129
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.xaml" />
13-
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml" />
1410
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.xaml" />
15-
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml" />
16-
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml" />
1711
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.xaml" />
1812
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml" />
1913
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.xaml" />
20-
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml" />
2114
</ResourceDictionary.MergedDictionaries>
2215
</ResourceDictionary>

Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Loading" />
1010
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.Menu" />
1111
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.MenuItem" />
12-
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RadialGauge" />
1312
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RadialProgressBar" />
14-
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RangeSelector" />
1513
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile" />
1614
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.ScrollHeader" />
1715
<Item Type="Microsoft.Toolkit.Uwp.UI.Controls.TextToolbar" />

0 commit comments

Comments
 (0)