move to Microsoft.Toolkit.Uwp.UI.Controls.Input

CommunityToolkit · May 1, 2021 · 2f17dcc · 2f17dcc
1 parent 27307f5
commit 2f17dcc
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 7 deletions.
diff --git 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/...s/RichSuggestBox/RichSuggestBox.Events.cs → ...t/RichSuggestBox/RichSuggestBox.Events.cs b/...s/RichSuggestBox/RichSuggestBox.Events.cs → ...t/RichSuggestBox/RichSuggestBox.Events.cs
diff --git a/.../RichSuggestBox/RichSuggestBox.Helpers.cs → .../RichSuggestBox/RichSuggestBox.Helpers.cs b/.../RichSuggestBox/RichSuggestBox.Helpers.cs → .../RichSuggestBox/RichSuggestBox.Helpers.cs
diff --git a/...chSuggestBox/RichSuggestBox.Properties.cs → ...chSuggestBox/RichSuggestBox.Properties.cs b/...chSuggestBox/RichSuggestBox.Properties.cs → ...chSuggestBox/RichSuggestBox.Properties.cs
diff --git a/...Controls/RichSuggestBox/RichSuggestBox.cs → ...ls.Input/RichSuggestBox/RichSuggestBox.cs b/...Controls/RichSuggestBox/RichSuggestBox.cs → ...ls.Input/RichSuggestBox/RichSuggestBox.cs
diff --git a/...ntrols/RichSuggestBox/RichSuggestBox.xaml → ....Input/RichSuggestBox/RichSuggestBox.xaml b/...ntrols/RichSuggestBox/RichSuggestBox.xaml → ....Input/RichSuggestBox/RichSuggestBox.xaml
diff --git a/...chSuggestBox/SuggestionChosenEventArgs.cs → ...chSuggestBox/SuggestionChosenEventArgs.cs b/...chSuggestBox/SuggestionChosenEventArgs.cs → ...chSuggestBox/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/...Controls/RichSuggestBox/SuggestionInfo.cs → ...ls.Input/RichSuggestBox/SuggestionInfo.cs b/...Controls/RichSuggestBox/SuggestionInfo.cs → ...ls.Input/RichSuggestBox/SuggestionInfo.cs
diff --git a/...uggestBox/SuggestionPopupPlacementMode.cs → ...uggestBox/SuggestionPopupPlacementMode.cs b/...uggestBox/SuggestionPopupPlacementMode.cs → ...uggestBox/SuggestionPopupPlacementMode.cs
diff --git a/...s/RichSuggestBox/SuggestionTokenFormat.cs → ...t/RichSuggestBox/SuggestionTokenFormat.cs b/...s/RichSuggestBox/SuggestionTokenFormat.cs → ...t/RichSuggestBox/SuggestionTokenFormat.cs
diff --git a/...ggestBox/SuggestionsRequestedEventArgs.cs → ...ggestBox/SuggestionsRequestedEventArgs.cs b/...ggestBox/SuggestionsRequestedEventArgs.cs → ...ggestBox/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
@@ -8,5 +8,6 @@
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.xaml" />
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/RichSuggestBox/RichSuggestBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>