From 7020bc700419a72ec8c1770e728e0a72f122481e Mon Sep 17 00:00:00 2001 From: Gerald Versluis Date: Tue, 4 Feb 2025 21:59:48 +0100 Subject: [PATCH] Revert "Implementation of Customizable Search Button Color for SearchBar Across Platforms (#26759)" This reverts commit 44eeba3347d561f63aef0b00594107db22567890. --- .../net-android/PublicAPI.Unshipped.txt | 3 -- .../PublicAPI/net-ios/PublicAPI.Unshipped.txt | 3 -- .../net-maccatalyst/PublicAPI.Unshipped.txt | 3 -- .../net-tizen/PublicAPI.Unshipped.txt | 3 -- .../net-windows/PublicAPI.Unshipped.txt | 3 -- .../PublicAPI/net/PublicAPI.Unshipped.txt | 3 -- .../netstandard/PublicAPI.Unshipped.txt | 3 -- src/Controls/src/Core/SearchBar/SearchBar.cs | 11 ------ .../SearchIconColorInitializesCorrectly.png | Bin 8156 -> 0 bytes .../TestCases.HostApp/Issues/Issue22963.cs | 33 ------------------ .../SearchIconColorInitializesCorrectly.png | Bin 44471 -> 0 bytes .../Tests/Issues/Issue22963.cs | 21 ----------- .../SearchIconColorInitializesCorrectly.png | Bin 5979 -> 0 bytes .../SearchIconColorInitializesCorrectly.png | Bin 19672 -> 0 bytes src/Core/src/Core/ISearchBar.cs | 5 --- .../SearchBar/SearchBarHandler.Android.cs | 5 --- .../SearchBar/SearchBarHandler.Standard.cs | 1 - .../SearchBar/SearchBarHandler.Tizen.cs | 3 -- .../SearchBar/SearchBarHandler.Windows.cs | 6 ---- .../Handlers/SearchBar/SearchBarHandler.cs | 1 - .../SearchBar/SearchBarHandler.iOS.cs | 4 --- .../Platform/Android/SearchViewExtensions.cs | 21 ----------- .../Platform/Windows/SearchBarExtensions.cs | 19 ---------- .../src/Platform/iOS/SearchBarExtensions.cs | 15 -------- .../net-android/PublicAPI.Unshipped.txt | 1 - .../PublicAPI/net-ios/PublicAPI.Unshipped.txt | 3 +- .../net-maccatalyst/PublicAPI.Unshipped.txt | 3 +- .../net-tizen/PublicAPI.Unshipped.txt | 1 - .../net-windows/PublicAPI.Unshipped.txt | 1 - .../src/PublicAPI/net/PublicAPI.Unshipped.txt | 1 - .../netstandard/PublicAPI.Unshipped.txt | 1 - .../netstandard2.0/PublicAPI.Unshipped.txt | 1 - .../tests/DeviceTests/Stubs/SearchBarStub.cs | 2 -- 33 files changed, 2 insertions(+), 178 deletions(-) delete mode 100644 src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchIconColorInitializesCorrectly.png delete mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue22963.cs delete mode 100644 src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SearchIconColorInitializesCorrectly.png delete mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22963.cs delete mode 100644 src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchIconColorInitializesCorrectly.png delete mode 100644 src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SearchIconColorInitializesCorrectly.png diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt index f3654b41c5bd..d434dae9bcae 100644 --- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt @@ -147,6 +147,3 @@ static readonly Microsoft.Maui.Controls.TitleBar.TitleProperty -> Microsoft.Maui static readonly Microsoft.Maui.Controls.TitleBar.TrailingContentProperty -> Microsoft.Maui.Controls.BindableProperty! static readonly Microsoft.Maui.Controls.Window.TitleBarProperty -> Microsoft.Maui.Controls.BindableProperty! virtual Microsoft.Maui.Controls.Application.ActivateWindow(Microsoft.Maui.Controls.Window! window) -> void -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.set -> void -~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt index 4e950256b92b..c8f888817e4b 100644 --- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt @@ -340,7 +340,4 @@ virtual Microsoft.Maui.Controls.Handlers.Items2.ItemsViewController2 virtual Microsoft.Maui.Controls.Handlers.Items2.ItemsViewDelegator2.GetVisibleItemsIndex() -> (bool VisibleItems, int First, int Center, int Last) virtual Microsoft.Maui.Controls.Handlers.Items2.ItemsViewHandler2.UpdateLayout() -> void override Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer.MovedToWindow() -> void -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.set -> void -~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty ~Microsoft.Maui.Controls.Internals.TypedBindingBase.UpdateSourceEventName.set -> void diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt index 791eb1f9e3d5..b8b408d750b8 100644 --- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt @@ -341,6 +341,3 @@ virtual Microsoft.Maui.Controls.Handlers.Items2.ItemsViewController2 virtual Microsoft.Maui.Controls.Handlers.Items2.ItemsViewDelegator2.GetVisibleItemsIndex() -> (bool VisibleItems, int First, int Center, int Last) virtual Microsoft.Maui.Controls.Handlers.Items2.ItemsViewHandler2.UpdateLayout() -> void override Microsoft.Maui.Controls.Handlers.Compatibility.FrameRenderer.MovedToWindow() -> void -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.set -> void -~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt index 7ccd8b908171..bbae06a93d97 100644 --- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt @@ -142,6 +142,3 @@ static readonly Microsoft.Maui.Controls.TitleBar.TitleProperty -> Microsoft.Maui static readonly Microsoft.Maui.Controls.TitleBar.TrailingContentProperty -> Microsoft.Maui.Controls.BindableProperty! static readonly Microsoft.Maui.Controls.Window.TitleBarProperty -> Microsoft.Maui.Controls.BindableProperty! virtual Microsoft.Maui.Controls.Application.ActivateWindow(Microsoft.Maui.Controls.Window! window) -> void -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.set -> void -~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt index 1161d10dfe01..a6a93fbd9674 100644 --- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt @@ -148,6 +148,3 @@ static readonly Microsoft.Maui.Controls.TitleBar.TitleProperty -> Microsoft.Maui static readonly Microsoft.Maui.Controls.TitleBar.TrailingContentProperty -> Microsoft.Maui.Controls.BindableProperty! static readonly Microsoft.Maui.Controls.Window.TitleBarProperty -> Microsoft.Maui.Controls.BindableProperty! virtual Microsoft.Maui.Controls.Application.ActivateWindow(Microsoft.Maui.Controls.Window! window) -> void -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.set -> void -~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt index 5a9dcf35e453..931253154272 100644 --- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt @@ -142,6 +142,3 @@ static readonly Microsoft.Maui.Controls.TitleBar.TitleProperty -> Microsoft.Maui static readonly Microsoft.Maui.Controls.TitleBar.TrailingContentProperty -> Microsoft.Maui.Controls.BindableProperty! static readonly Microsoft.Maui.Controls.Window.TitleBarProperty -> Microsoft.Maui.Controls.BindableProperty! virtual Microsoft.Maui.Controls.Application.ActivateWindow(Microsoft.Maui.Controls.Window! window) -> void -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.set -> void -~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt index 7ccd8b908171..bbae06a93d97 100644 --- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt +++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt @@ -142,6 +142,3 @@ static readonly Microsoft.Maui.Controls.TitleBar.TitleProperty -> Microsoft.Maui static readonly Microsoft.Maui.Controls.TitleBar.TrailingContentProperty -> Microsoft.Maui.Controls.BindableProperty! static readonly Microsoft.Maui.Controls.Window.TitleBarProperty -> Microsoft.Maui.Controls.BindableProperty! virtual Microsoft.Maui.Controls.Application.ActivateWindow(Microsoft.Maui.Controls.Window! window) -> void -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color -~Microsoft.Maui.Controls.SearchBar.SearchIconColor.set -> void -~static readonly Microsoft.Maui.Controls.SearchBar.SearchIconColorProperty -> Microsoft.Maui.Controls.BindableProperty diff --git a/src/Controls/src/Core/SearchBar/SearchBar.cs b/src/Controls/src/Core/SearchBar/SearchBar.cs index 8bd390aa25de..4df7ef0c841d 100644 --- a/src/Controls/src/Core/SearchBar/SearchBar.cs +++ b/src/Controls/src/Core/SearchBar/SearchBar.cs @@ -28,9 +28,6 @@ public partial class SearchBar : InputView, ITextAlignmentElement, ISearchBarCon /// Bindable property for . public static readonly BindableProperty CancelButtonColorProperty = BindableProperty.Create(nameof(CancelButtonColor), typeof(Color), typeof(SearchBar), default(Color)); - /// Bindable property for . - public static readonly BindableProperty SearchIconColorProperty = BindableProperty.Create(nameof(SearchIconColor), typeof(Color), typeof(SearchBar), default(Color)); - /// public new static readonly BindableProperty PlaceholderProperty = InputView.PlaceholderProperty; @@ -80,14 +77,6 @@ public Color CancelButtonColor get { return (Color)GetValue(CancelButtonColorProperty); } set { SetValue(CancelButtonColorProperty, value); } } - /// - /// Gets or sets the color of the search icon in the . - /// - public Color SearchIconColor - { - get { return (Color)GetValue(SearchIconColorProperty); } - set { SetValue(SearchIconColorProperty, value); } - } /// public TextAlignment HorizontalTextAlignment diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchIconColorInitializesCorrectly.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/SearchIconColorInitializesCorrectly.png deleted file mode 100644 index 9ebb53455153af1816d3a5254f74775cf4327dee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8156 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 diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22963.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue22963.cs deleted file mode 100644 index a10d3530b14f..000000000000 --- a/src/Controls/tests/TestCases.HostApp/Issues/Issue22963.cs +++ /dev/null @@ -1,33 +0,0 @@ -namespace Maui.Controls.Sample.Issues -{ - [XamlCompilation(XamlCompilationOptions.Compile)] - [Issue(IssueTracker.Github, 22963, "Implementation of Customizable Search Icon Color for SearchBar Across Platforms", PlatformAffected.All)] - - public partial class Issue22963 : ContentPage - { - public Issue22963() - { - ConfigureSearchBar(); - } - - private void ConfigureSearchBar() - { - // Create the SearchBar - var searchBar = new SearchBar - { - Placeholder = "Search...", - SearchIconColor = Colors.Magenta, - WidthRequest = 300, - HorizontalOptions = LayoutOptions.Center, - VerticalOptions = LayoutOptions.Start, - AutomationId = "SearchBar" - }; - // Add the SearchBar to the layout - var layout = new Grid(); - layout.Children.Add(searchBar); - - // Set the layout as the Content of the page - Content = layout; - } - } -} \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SearchIconColorInitializesCorrectly.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/SearchIconColorInitializesCorrectly.png deleted file mode 100644 index 9c8e9f9f2702ef775bdcba2b83c49cf97125a79c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44471 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 QvkWrOGuF-4J{j`=06cK-H~;_u diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22963.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22963.cs deleted file mode 100644 index 92bf022acfe6..000000000000 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22963.cs +++ /dev/null @@ -1,21 +0,0 @@ -using NUnit.Framework; -using UITest.Appium; -using UITest.Core; - -namespace Microsoft.Maui.TestCases.Tests.Issues -{ - internal class Issue22963 : _IssuesUITest - { - public Issue22963(TestDevice device) : base(device) { } - - public override string Issue => "Implementation of Customizable Search Icon Color for SearchBar Across Platforms"; - - [Test] - [Category(UITestCategories.SearchBar)] - public void SearchIconColorInitializesCorrectly() - { - App.WaitForElement("SearchBar"); - VerifyScreenshot(); - } - } -} diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchIconColorInitializesCorrectly.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/SearchIconColorInitializesCorrectly.png deleted file mode 100644 index 49926060a78ac0c084993e77d8112c1848c8a76e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5979 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 b%lnWAdEtAGu#?K*J-}$U>8`Xd9KQW8?R@x% diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SearchIconColorInitializesCorrectly.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/SearchIconColorInitializesCorrectly.png deleted file mode 100644 index 2f6326564d50769f4e1cabd5f14b52e35e7c1714..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19672 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 Color CancelButtonColor { get; } - /// - /// Gets the color of the Search icon. - /// - Color SearchIconColor { get; } - /// /// Notify when the user presses the Search button. /// diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs index 794ab208cbbf..1d21a1dc52fc 100644 --- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs +++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs @@ -119,11 +119,6 @@ public static void MapCancelButtonColor(ISearchBarHandler handler, ISearchBar se handler.PlatformView?.UpdateCancelButtonColor(searchBar); } - internal static void MapSearchIconColor(ISearchBarHandler handler, ISearchBar searchBar) - { - handler.PlatformView?.UpdateSearchIconColor(searchBar); - } - public static void MapKeyboard(ISearchBarHandler handler, ISearchBar searchBar) { handler.UpdateValue(nameof(ISearchBar.Text)); diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Standard.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Standard.cs index 3c13f1768dbe..195098888c71 100644 --- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Standard.cs +++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Standard.cs @@ -19,7 +19,6 @@ public static void MapVerticalTextAlignment(IViewHandler handler, ISearchBar sea public static void MapCharacterSpacing(IViewHandler handler, ISearchBar searchBar) { } public static void MapTextColor(IViewHandler handler, ISearchBar searchBar) { } public static void MapCancelButtonColor(IViewHandler handler, ISearchBar searchBar) { } - internal static void MapSearchIconColor(IViewHandler handler, ISearchBar searchBar) { } /// /// Maps the abstract property to the platform-specific implementations. diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Tizen.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Tizen.cs index 2622b8c28f6b..6a92572e0768 100644 --- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Tizen.cs +++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Tizen.cs @@ -86,9 +86,6 @@ public static void MapKeyboard(ISearchBarHandler handler, ISearchBar searchBar) [MissingMapper] public static void MapCancelButtonColor(ISearchBarHandler handler, ISearchBar searchBar) { } - [MissingMapper] - internal static void MapSearchIconColor(ISearchBarHandler handler, ISearchBar searchBar) { } - public static void MapCharacterSpacing(ISearchBarHandler handler, ISearchBar searchBar) { handler.PlatformView.Entry.UpdateCharacterSpacing(searchBar); diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs index f295d24a7aa8..b31d8c58ae26 100644 --- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs +++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs @@ -104,11 +104,6 @@ public static void MapCancelButtonColor(ISearchBarHandler handler, ISearchBar se handler.PlatformView?.UpdateCancelButtonColor(searchBar); } - internal static void MapSearchIconColor(ISearchBarHandler handler, ISearchBar searchBar) - { - handler.PlatformView?.UpdateSearchIconColor(searchBar); - } - public static void MapKeyboard(ISearchBarHandler handler, ISearchBar searchBar) { handler.PlatformView?.UpdateKeyboard(searchBar); @@ -126,7 +121,6 @@ void OnLoaded(object sender, UI.Xaml.RoutedEventArgs e) PlatformView?.UpdateIsTextPredictionEnabled(VirtualView); PlatformView?.UpdateIsSpellCheckEnabled(VirtualView); PlatformView?.UpdateCancelButtonColor(VirtualView); - PlatformView?.UpdateSearchIconColor(VirtualView); PlatformView?.UpdateKeyboard(VirtualView); } } diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs index fe118127f439..ef6615dbbc30 100644 --- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs +++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs @@ -34,7 +34,6 @@ public partial class SearchBarHandler : ISearchBarHandler [nameof(ISearchBar.Text)] = MapText, [nameof(ISearchBar.TextColor)] = MapTextColor, [nameof(ISearchBar.CancelButtonColor)] = MapCancelButtonColor, - [nameof(ISearchBar.SearchIconColor)] = MapSearchIconColor, [nameof(ISearchBar.Keyboard)] = MapKeyboard }; diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs index 3015674f6404..9b35ecf7433e 100644 --- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs +++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs @@ -141,10 +141,6 @@ public static void MapCancelButtonColor(ISearchBarHandler handler, ISearchBar se handler.PlatformView?.UpdateCancelButton(searchBar); } - internal static void MapSearchIconColor(ISearchBarHandler handler, ISearchBar searchBar) - { - handler.PlatformView?.UpdateSearchIcon(searchBar); - } public static void MapKeyboard(ISearchBarHandler handler, ISearchBar searchBar) { handler.PlatformView?.UpdateKeyboard(searchBar); diff --git a/src/Core/src/Platform/Android/SearchViewExtensions.cs b/src/Core/src/Platform/Android/SearchViewExtensions.cs index b4f71740f6c6..cdfe739f80bc 100644 --- a/src/Core/src/Platform/Android/SearchViewExtensions.cs +++ b/src/Core/src/Platform/Android/SearchViewExtensions.cs @@ -118,27 +118,6 @@ public static void UpdateCancelButtonColor(this SearchView searchView, ISearchBa } } - internal static void UpdateSearchIconColor(this SearchView searchView, ISearchBar searchBar) - { - if (searchView.Resources is null) - return; - - var searchIconIdentifier = Resource.Id.search_mag_icon; - - if (searchIconIdentifier > 0) - { - var image = searchView.FindViewById(searchIconIdentifier); - - if (image?.Drawable is not null) - { - if (searchBar.SearchIconColor is not null) - image.Drawable.SetColorFilter(searchBar.SearchIconColor, FilterMode.SrcIn); - else - image.Drawable.ClearColorFilter(); - } - } - } - public static void UpdateIsTextPredictionEnabled(this SearchView searchView, ISearchBar searchBar, EditText? editText = null) { editText ??= searchView.GetFirstChildOfType(); diff --git a/src/Core/src/Platform/Windows/SearchBarExtensions.cs b/src/Core/src/Platform/Windows/SearchBarExtensions.cs index 6ec782af8e1e..04067c2b00dd 100644 --- a/src/Core/src/Platform/Windows/SearchBarExtensions.cs +++ b/src/Core/src/Platform/Windows/SearchBarExtensions.cs @@ -187,24 +187,5 @@ internal static void UpdateCancelButtonColor(this AutoSuggestBox platformControl cancelButton.UpdateTextColor(searchBar.CancelButtonColor, CancelButtonColorKeys); } - - internal static void UpdateSearchIconColor(this AutoSuggestBox platformControl, ISearchBar searchBar) - { - var brush = searchBar.SearchIconColor?.ToPlatform(); - - if (platformControl.QueryIcon is SymbolIcon queryIcon) - { - if (brush is null) - { - queryIcon.ClearValue(SymbolIcon.ForegroundProperty); - } - else - { - queryIcon.Foreground = brush; - } - } - - platformControl.RefreshThemeResources(); - } } } \ No newline at end of file diff --git a/src/Core/src/Platform/iOS/SearchBarExtensions.cs b/src/Core/src/Platform/iOS/SearchBarExtensions.cs index 6bcd30b731db..a7dda89425ac 100644 --- a/src/Core/src/Platform/iOS/SearchBarExtensions.cs +++ b/src/Core/src/Platform/iOS/SearchBarExtensions.cs @@ -146,21 +146,6 @@ public static void UpdateCancelButton(this UISearchBar uiSearchBar, ISearchBar s } } - internal static void UpdateSearchIcon(this UISearchBar uiSearchBar, ISearchBar searchBar) - { - var textField = uiSearchBar.FindDescendantView(); - - if (textField?.LeftView is not UIImageView iconView || iconView.Image is null) - return; - - if (searchBar.SearchIconColor is not null) - { - iconView.Image = iconView.Image.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate); - iconView.TintColor = searchBar.SearchIconColor.ToPlatform(); - } - - } - public static void UpdateIsTextPredictionEnabled(this UISearchBar uiSearchBar, ISearchBar searchBar, UITextField? textField = null) { textField ??= uiSearchBar.GetSearchTextField(); diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt index 70eca58f9136..9f06d38a5b2c 100644 --- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt +++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt @@ -82,4 +82,3 @@ static Microsoft.Maui.Keyboard.Password.get -> Microsoft.Maui.Keyboard! static Microsoft.Maui.Keyboard.Time.get -> Microsoft.Maui.Keyboard! static Microsoft.Maui.ViewExtensions.DisconnectHandlers(this Microsoft.Maui.IView! view) -> void override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void -Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color! diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt index 1b95915221cd..10f7e317afed 100644 --- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt +++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt @@ -86,5 +86,4 @@ override Microsoft.Maui.Platform.MauiCALayer.RemoveFromSuperLayer() -> void override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void override Microsoft.Maui.Handlers.EditorHandler.NeedsContainer.get -> bool override Microsoft.Maui.Handlers.WindowHandler.DisconnectHandler(UIKit.UIWindow! platformView) -> void -*REMOVED*override Microsoft.Maui.Handlers.ScrollViewHandler.NeedsContainer.get -> bool -Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color! +*REMOVED*override Microsoft.Maui.Handlers.ScrollViewHandler.NeedsContainer.get -> bool \ No newline at end of file diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt index 1c3d9fa4b843..dadc16648e8c 100644 --- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt +++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt @@ -87,5 +87,4 @@ override Microsoft.Maui.Platform.MauiCALayer.RemoveFromSuperLayer() -> void override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void override Microsoft.Maui.Handlers.EditorHandler.NeedsContainer.get -> bool override Microsoft.Maui.Handlers.WindowHandler.DisconnectHandler(UIKit.UIWindow! platformView) -> void -*REMOVED*override Microsoft.Maui.Handlers.ScrollViewHandler.NeedsContainer.get -> bool -Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color! +*REMOVED*override Microsoft.Maui.Handlers.ScrollViewHandler.NeedsContainer.get -> bool \ No newline at end of file diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt index 9d80572146a6..ede8897432dd 100644 --- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt +++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt @@ -66,4 +66,3 @@ static Microsoft.Maui.Keyboard.Time.get -> Microsoft.Maui.Keyboard! static Microsoft.Maui.Platform.ElementExtensions.ToContainerView(this Microsoft.Maui.IElement? view, Microsoft.Maui.IMauiContext! context) -> Tizen.NUI.BaseComponents.View! static Microsoft.Maui.ViewExtensions.DisconnectHandlers(this Microsoft.Maui.IView! view) -> void override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void -Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color! diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt index 882c5ece2451..ff5ecdbc7010 100644 --- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt +++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt @@ -74,4 +74,3 @@ static Microsoft.Maui.ViewExtensions.DisconnectHandlers(this Microsoft.Maui.IVie *REMOVED*virtual Microsoft.Maui.Platform.NavigationRootManager.Connect(Microsoft.UI.Xaml.UIElement! platformView) -> void virtual Microsoft.Maui.Platform.NavigationRootManager.Connect(Microsoft.UI.Xaml.UIElement? platformView) -> void override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void -Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color! diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt index 0334e5d66770..e54989d8a78e 100644 --- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt +++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt @@ -64,4 +64,3 @@ static Microsoft.Maui.Keyboard.Password.get -> Microsoft.Maui.Keyboard! static Microsoft.Maui.Keyboard.Time.get -> Microsoft.Maui.Keyboard! static Microsoft.Maui.ViewExtensions.DisconnectHandlers(this Microsoft.Maui.IView! view) -> void override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void -Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color! diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt index 0334e5d66770..e54989d8a78e 100644 --- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt +++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt @@ -64,4 +64,3 @@ static Microsoft.Maui.Keyboard.Password.get -> Microsoft.Maui.Keyboard! static Microsoft.Maui.Keyboard.Time.get -> Microsoft.Maui.Keyboard! static Microsoft.Maui.ViewExtensions.DisconnectHandlers(this Microsoft.Maui.IView! view) -> void override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void -Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color! diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt index 0334e5d66770..e54989d8a78e 100644 --- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt +++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt @@ -64,4 +64,3 @@ static Microsoft.Maui.Keyboard.Password.get -> Microsoft.Maui.Keyboard! static Microsoft.Maui.Keyboard.Time.get -> Microsoft.Maui.Keyboard! static Microsoft.Maui.ViewExtensions.DisconnectHandlers(this Microsoft.Maui.IView! view) -> void override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void -Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color! diff --git a/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs b/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs index 4e604735b625..04e7c2cceaab 100644 --- a/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs +++ b/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs @@ -27,8 +27,6 @@ void OnTextChanged(string oldValue, string newValue) => public Color CancelButtonColor { get; set; } - public Color SearchIconColor { get; set; } - public double CharacterSpacing { get; set; } public Font Font { get; set; }