From f4d87bbf0407e314c0d019761393856f9d607f4d Mon Sep 17 00:00:00 2001 From: Larry O'Brien Date: Tue, 16 Apr 2019 12:04:55 -1000 Subject: [PATCH] s/SearchBoxVisiblity/SearchBoxVisibility/ from base 4.0.0 (#5931) * s/SearchBoxVisiblty/SearchBoxVisibility/ Fix typo in type name. * s/Collapsable/Collapsible/ * Changed capitalization in comment --- .../GalleryPages/ButtonGallery.cs | 2 +- .../XamStore/Views/DemoShellPage.xaml.cs | 4 ++-- .../XamStore/Views/StorePages.cs | 28 +++++++++++----------- Xamarin.Forms.Core/SearchBoxVisiblity.cs | 4 ++-- Xamarin.Forms.Core/Shell/SearchHandler.cs | 6 ++--- .../Renderers/ShellToolbarTracker.cs | 8 +++---- .../Renderers/ShellPageRendererTracker.cs | 10 ++++---- .../Renderers/ShellScrollViewTracker.cs | 4 ++-- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Xamarin.Forms.Controls/GalleryPages/ButtonGallery.cs b/Xamarin.Forms.Controls/GalleryPages/ButtonGallery.cs index 374ba75..f568d99 100644 --- a/Xamarin.Forms.Controls/GalleryPages/ButtonGallery.cs +++ b/Xamarin.Forms.Controls/GalleryPages/ButtonGallery.cs @@ -11,7 +11,7 @@ namespace Xamarin.Forms.Controls public ButtonGallery () { //ShellAppearance.SetNavBarVisible(this, false); - Shell.SetSearchHandler(this, new SearchHandler() { SearchBoxVisibility = SearchBoxVisiblity.Collapsable }); + Shell.SetSearchHandler(this, new SearchHandler() { SearchBoxVisibility = SearchBoxVisibility.Collapsible }); BackgroundColor = new Color (0.9); var normal = new Button { Text = "Normal Button" }; diff --git a/Xamarin.Forms.Controls/XamStore/Views/DemoShellPage.xaml.cs b/Xamarin.Forms.Controls/XamStore/Views/DemoShellPage.xaml.cs index 1efff0e..63c6cfb 100644 --- a/Xamarin.Forms.Controls/XamStore/Views/DemoShellPage.xaml.cs +++ b/Xamarin.Forms.Controls/XamStore/Views/DemoShellPage.xaml.cs @@ -29,7 +29,7 @@ namespace Xamarin.Forms.Controls.XamStore InitializeComponent(); ViewModel = new HomeViewModel(); NavigationPage.SetBackButtonTitle(this, ""); - //AddSearchHandler("Search", SearchBoxVisiblity.Expanded); + //AddSearchHandler("Search", SearchBoxVisibility.Expanded); } protected override void OnAppearing() @@ -49,7 +49,7 @@ namespace Xamarin.Forms.Controls.XamStore (sender as ListView).SelectedItem = null; } - protected void AddSearchHandler(string placeholder, SearchBoxVisiblity visibility) + protected void AddSearchHandler(string placeholder, SearchBoxVisibility visibility) { var searchHandler = new BasePage.CustomSearchHandler(); diff --git a/Xamarin.Forms.Controls/XamStore/Views/StorePages.cs b/Xamarin.Forms.Controls/XamStore/Views/StorePages.cs index 229e74c..6c2ee9a 100644 --- a/Xamarin.Forms.Controls/XamStore/Views/StorePages.cs +++ b/Xamarin.Forms.Controls/XamStore/Views/StorePages.cs @@ -60,7 +60,7 @@ namespace Xamarin.Forms.Controls.XamStore 1, 2); grid.Children.Add(MakeButton("Add Search", - () => AddSearchHandler("Added Search", SearchBoxVisiblity.Expanded)), + () => AddSearchHandler("Added Search", SearchBoxVisibility.Expanded)), 2, 2); grid.Children.Add(MakeButton("Add Toolbar", @@ -100,15 +100,15 @@ namespace Xamarin.Forms.Controls.XamStore 2, 5); grid.Children.Add(MakeButton("Hide Search", - () => Shell.GetSearchHandler(this).SearchBoxVisibility = SearchBoxVisiblity.Hidden), + () => Shell.GetSearchHandler(this).SearchBoxVisibility = SearchBoxVisibility.Hidden), 0, 6); grid.Children.Add(MakeButton("Collapse Search", - () => Shell.GetSearchHandler(this).SearchBoxVisibility = SearchBoxVisiblity.Collapsable), + () => Shell.GetSearchHandler(this).SearchBoxVisibility = SearchBoxVisibility.Collapsible), 1, 6); grid.Children.Add(MakeButton("Show Search", - () => Shell.GetSearchHandler(this).SearchBoxVisibility = SearchBoxVisiblity.Expanded), + () => Shell.GetSearchHandler(this).SearchBoxVisibility = SearchBoxVisibility.Expanded), 2, 6); grid.Children.Add(MakeButton("Set Back", @@ -339,7 +339,7 @@ namespace Xamarin.Forms.Controls.XamStore } } - protected void AddSearchHandler(string placeholder, SearchBoxVisiblity visibility) + protected void AddSearchHandler(string placeholder, SearchBoxVisibility visibility) { var searchHandler = new CustomSearchHandler(); @@ -374,7 +374,7 @@ namespace Xamarin.Forms.Controls.XamStore { public UpdatesPage() : base("Available Updates", Color.Default) { - AddSearchHandler("Search Updates", SearchBoxVisiblity.Collapsable); + AddSearchHandler("Search Updates", SearchBoxVisibility.Collapsible); } } @@ -383,7 +383,7 @@ namespace Xamarin.Forms.Controls.XamStore { public InstalledPage() : base("Installed Items", Color.Default) { - AddSearchHandler("Search Installed", SearchBoxVisiblity.Collapsable); + AddSearchHandler("Search Installed", SearchBoxVisibility.Collapsible); } } @@ -392,7 +392,7 @@ namespace Xamarin.Forms.Controls.XamStore { public LibraryPage() : base("My Library", Color.Default) { - AddSearchHandler("Search Apps", SearchBoxVisiblity.Collapsable); + AddSearchHandler("Search Apps", SearchBoxVisibility.Collapsible); } } @@ -413,7 +413,7 @@ namespace Xamarin.Forms.Controls.XamStore { public HomePage() : base("Store Home", Color.Default) { - AddSearchHandler("Search Apps", SearchBoxVisiblity.Expanded); + AddSearchHandler("Search Apps", SearchBoxVisibility.Expanded); } } @@ -422,7 +422,7 @@ namespace Xamarin.Forms.Controls.XamStore { public GamesPage() : base("Games", Color.Default) { - AddSearchHandler("Search Games", SearchBoxVisiblity.Expanded); + AddSearchHandler("Search Games", SearchBoxVisibility.Expanded); } } @@ -431,7 +431,7 @@ namespace Xamarin.Forms.Controls.XamStore { public MoviesPage() : base("Hot Movies", Color.Default) { - AddSearchHandler("Search Movies", SearchBoxVisiblity.Expanded); + AddSearchHandler("Search Movies", SearchBoxVisibility.Expanded); } } @@ -440,7 +440,7 @@ namespace Xamarin.Forms.Controls.XamStore { public BooksPage() : base("Bookstore", Color.Default) { - AddSearchHandler("Search Books", SearchBoxVisiblity.Expanded); + AddSearchHandler("Search Books", SearchBoxVisibility.Expanded); } } @@ -449,7 +449,7 @@ namespace Xamarin.Forms.Controls.XamStore { public MusicPage() : base("Music", Color.Default) { - AddSearchHandler("Search Music", SearchBoxVisiblity.Expanded); + AddSearchHandler("Search Music", SearchBoxVisibility.Expanded); } } @@ -458,7 +458,7 @@ namespace Xamarin.Forms.Controls.XamStore { public NewsPage() : base("Newspapers", Color.Default) { - AddSearchHandler("Search Papers", SearchBoxVisiblity.Expanded); + AddSearchHandler("Search Papers", SearchBoxVisibility.Expanded); } } diff --git a/Xamarin.Forms.Core/SearchBoxVisiblity.cs b/Xamarin.Forms.Core/SearchBoxVisiblity.cs index 8ecb5a8..c7ccd4d 100644 --- a/Xamarin.Forms.Core/SearchBoxVisiblity.cs +++ b/Xamarin.Forms.Core/SearchBoxVisiblity.cs @@ -1,9 +1,9 @@ namespace Xamarin.Forms { - public enum SearchBoxVisiblity + public enum SearchBoxVisibility { Hidden, - Collapsable, + Collapsible, Expanded } } \ No newline at end of file diff --git a/Xamarin.Forms.Core/Shell/SearchHandler.cs b/Xamarin.Forms.Core/Shell/SearchHandler.cs index 6974e40..293f56c 100644 --- a/Xamarin.Forms.Core/Shell/SearchHandler.cs +++ b/Xamarin.Forms.Core/Shell/SearchHandler.cs @@ -121,7 +121,7 @@ namespace Xamarin.Forms propertyChanged: OnQueryChanged); public static readonly BindableProperty SearchBoxVisibilityProperty = - BindableProperty.Create(nameof(SearchBoxVisibility), typeof(SearchBoxVisiblity), typeof(SearchHandler), SearchBoxVisiblity.Expanded, BindingMode.OneWay); + BindableProperty.Create(nameof(SearchBoxVisibility), typeof(SearchBoxVisibility), typeof(SearchHandler), SearchBoxVisibility.Expanded, BindingMode.OneWay); static readonly BindablePropertyKey SelectedItemPropertyKey = BindableProperty.CreateReadOnly (nameof(SelectedItem), typeof(object), typeof(SearchHandler), null, BindingMode.OneWayToSource); @@ -253,9 +253,9 @@ namespace Xamarin.Forms set { SetValue(QueryIconNameProperty, value); } } - public SearchBoxVisiblity SearchBoxVisibility + public SearchBoxVisibility SearchBoxVisibility { - get { return (SearchBoxVisiblity)GetValue(SearchBoxVisibilityProperty); } + get { return (SearchBoxVisibility)GetValue(SearchBoxVisibilityProperty); } set { SetValue(SearchBoxVisibilityProperty, value); } } diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs b/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs index af086ce..c7a5611 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs @@ -421,7 +421,7 @@ namespace Xamarin.Forms.Platform.Android } SearchHandler = Shell.GetSearchHandler(page); - if (SearchHandler != null && SearchHandler.SearchBoxVisibility != SearchBoxVisiblity.Hidden) + if (SearchHandler != null && SearchHandler.SearchBoxVisibility != SearchBoxVisibility.Hidden) { var context = _shellContext.AndroidContext; if (_searchView == null) @@ -438,7 +438,7 @@ namespace Xamarin.Forms.Platform.Android _searchView.SearchConfirmed += OnSearchConfirmed; } - if (SearchHandler.SearchBoxVisibility == SearchBoxVisiblity.Collapsable) + if (SearchHandler.SearchBoxVisibility == SearchBoxVisibility.Collapsible) { var placeholder = new Java.Lang.String(SearchHandler.Placeholder); var item = menu.Add(placeholder); @@ -457,7 +457,7 @@ namespace Xamarin.Forms.Platform.Android item.SetActionView(_searchView.View); item.Dispose(); } - else if (SearchHandler.SearchBoxVisibility == SearchBoxVisiblity.Expanded) + else if (SearchHandler.SearchBoxVisibility == SearchBoxVisibility.Expanded) { _searchView.ShowKeyboardOnAttached = false; if (_searchView.View.Parent != _toolbar) @@ -482,7 +482,7 @@ namespace Xamarin.Forms.Platform.Android void OnSearchViewAttachedToWindow(object sender, AView.ViewAttachedToWindowEventArgs e) { // We only need to do this tint hack when using collapsed search handlers - if (SearchHandler.SearchBoxVisibility != SearchBoxVisiblity.Collapsable) + if (SearchHandler.SearchBoxVisibility != SearchBoxVisibility.Collapsible) return; for (int i = 0; i < _toolbar.ChildCount; i++) diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellPageRendererTracker.cs b/Xamarin.Forms.Platform.iOS/Renderers/ShellPageRendererTracker.cs index 57f405a..e5589d6 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/ShellPageRendererTracker.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/ShellPageRendererTracker.cs @@ -381,7 +381,7 @@ namespace Xamarin.Forms.Platform.iOS protected virtual void UpdateSearchVisibility(UISearchController searchController) { var visibility = SearchHandler.SearchBoxVisibility; - if (visibility == SearchBoxVisiblity.Hidden) + if (visibility == SearchBoxVisibility.Hidden) { if (searchController != null) { @@ -391,12 +391,12 @@ namespace Xamarin.Forms.Platform.iOS NavigationItem.TitleView = null; } } - else if (visibility == SearchBoxVisiblity.Collapsable || visibility == SearchBoxVisiblity.Expanded) + else if (visibility == SearchBoxVisibility.Collapsible || visibility == SearchBoxVisibility.Expanded) { if (Forms.IsiOS11OrNewer) { NavigationItem.SearchController = _searchController; - NavigationItem.HidesSearchBarWhenScrolling = visibility == SearchBoxVisiblity.Collapsable; + NavigationItem.HidesSearchBarWhenScrolling = visibility == SearchBoxVisibility.Collapsible; } else { @@ -417,7 +417,7 @@ namespace Xamarin.Forms.Platform.iOS _searchController = new UISearchController(_resultsRenderer?.ViewController); var visibility = SearchHandler.SearchBoxVisibility; - if (visibility != SearchBoxVisiblity.Hidden) + if (visibility != SearchBoxVisibility.Hidden) { if (Forms.IsiOS11OrNewer) NavigationItem.SearchController = _searchController; @@ -438,7 +438,7 @@ namespace Xamarin.Forms.Platform.iOS UpdateSearchIsEnabled(_searchController); searchBar.SearchButtonClicked += SearchButtonClicked; if (Forms.IsiOS11OrNewer) - NavigationItem.HidesSearchBarWhenScrolling = visibility == SearchBoxVisiblity.Collapsable; + NavigationItem.HidesSearchBarWhenScrolling = visibility == SearchBoxVisibility.Collapsible; var icon = SearchHandler.QueryIcon; if (icon != null) diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellScrollViewTracker.cs b/Xamarin.Forms.Platform.iOS/Renderers/ShellScrollViewTracker.cs index a284b38..bab1065 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/ShellScrollViewTracker.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/ShellScrollViewTracker.cs @@ -103,7 +103,7 @@ namespace Xamarin.Forms.Platform.iOS void UpdateVerticalBounce() { // Normally we dont want to do this unless this scrollview is vertical and its - // element is the child of a Page with a SearchHandler that is collapsable. + // element is the child of a Page with a SearchHandler that is collapsible. // If we can't bounce in that case you may not be able to expose the handler. // Also the hiding behavior only depends on scroll on iOS 11. In 10 and below // the search goes in the TitleView so there is nothing to collapse/expand. @@ -116,7 +116,7 @@ namespace Xamarin.Forms.Platform.iOS if (parent is Page) { var searchHandler = Shell.GetSearchHandler(parent); - if (searchHandler?.SearchBoxVisibility == SearchBoxVisiblity.Collapsable) + if (searchHandler?.SearchBoxVisibility == SearchBoxVisibility.Collapsible) _scrollView.AlwaysBounceVertical = true; return; } -- 2.7.4