From 2f17dcc3ecf4d3aa3c6762b39c7a27c4af073c1b Mon Sep 17 00:00:00 2001 From: Tung Huynh Date: Fri, 30 Apr 2021 23:47:06 -0700 Subject: [PATCH] move to Microsoft.Toolkit.Uwp.UI.Controls.Input --- .../RichSuggestBox/RichSuggestBoxPage.xaml.cs | 10 +++++----- .../RichSuggestBox/RichSuggestBox.Events.cs | 0 .../RichSuggestBox/RichSuggestBox.Helpers.cs | 0 .../RichSuggestBox/RichSuggestBox.Properties.cs | 0 .../RichSuggestBox/RichSuggestBox.cs | 0 .../RichSuggestBox/RichSuggestBox.xaml | 0 .../RichSuggestBox/SuggestionChosenEventArgs.cs | 2 +- .../RichSuggestBox/SuggestionInfo.cs | 0 .../RichSuggestBox/SuggestionPopupPlacementMode.cs | 0 .../RichSuggestBox/SuggestionTokenFormat.cs | 0 .../RichSuggestBox/SuggestionsRequestedEventArgs.cs | 2 +- .../Themes/Generic.xaml | 1 + 12 files changed, 8 insertions(+), 7 deletions(-) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/RichSuggestBox.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/RichSuggestBox.Helpers.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/RichSuggestBox.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/RichSuggestBox.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/RichSuggestBox.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/SuggestionChosenEventArgs.cs (97%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/SuggestionInfo.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/SuggestionPopupPlacementMode.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/SuggestionTokenFormat.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Input}/RichSuggestBox/SuggestionsRequestedEventArgs.cs (95%) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs index a02609837e0..252dcee1146 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RichSuggestBox/RichSuggestBoxPage.xaml.cs @@ -5,11 +5,11 @@ using System; using System.Collections.Generic; using System.Linq; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; using Windows.UI; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238 @@ -101,26 +101,26 @@ public void OnXamlRendered(FrameworkElement control) this._rsb.SuggestionsRequested -= this.SuggestingBox_OnSuggestionsRequested; } - if (control.FindChildByName("SuggestingBox") is RichSuggestBox rsb) + if (control.FindChild("SuggestingBox") is RichSuggestBox rsb) { this._rsb = rsb; this._rsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen; this._rsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested; } - if (control.FindChildByName("PlainTextSuggestingBox") is RichSuggestBox tsb) + if (control.FindChild("PlainTextSuggestingBox") is RichSuggestBox tsb) { this._tsb = tsb; this._tsb.SuggestionChosen += this.SuggestingBox_OnSuggestionChosen; this._tsb.SuggestionsRequested += this.SuggestingBox_OnSuggestionsRequested; } - if (control.FindChildByName("TokenListView1") is ListView tls1) + if (control.FindChild("TokenListView1") is ListView tls1) { tls1.ItemsSource = this._rsb?.Tokens; } - if (control.FindChildByName("TokenListView2") is ListView tls2) + if (control.FindChild("TokenListView2") is ListView tls2) { tls2.ItemsSource = this._tsb?.Tokens; } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Helpers.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Helpers.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/RichSuggestBox.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs similarity index 97% rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs index 3ab5f5a80c0..16c1c033a83 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionChosenEventArgs.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionChosenEventArgs.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.Toolkit.Uwp.Deferred; +using Microsoft.Toolkit.Deferred; namespace Microsoft.Toolkit.Uwp.UI.Controls { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionInfo.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionInfo.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionInfo.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionPopupPlacementMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionPopupPlacementMode.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionPopupPlacementMode.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionPopupPlacementMode.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionTokenFormat.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionTokenFormat.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionTokenFormat.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs similarity index 95% rename from Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs index 60e358b2ff9..eee5ccfbb45 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/RichSuggestBox/SuggestionsRequestedEventArgs.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/SuggestionsRequestedEventArgs.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Toolkit.Uwp.Deferred; +using Microsoft.Toolkit.Deferred; namespace Microsoft.Toolkit.Uwp.UI.Controls { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml index 85ed781a95e..a381ebe71fe 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml @@ -8,5 +8,6 @@ +