-
Notifications
You must be signed in to change notification settings - Fork 1.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add ISearchBar handler and implement Text #450
Merged
Merged
Changes from 7 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
d735dd0
Port SearchBar.Text to Handler #397
rogihee f70d97a
Add PortHandler to UpdateText
rogihee 0427d98
Fix parameter name
rogihee 06caf7c
Use AppCompat version of SearchView
rogihee 8965cae
Merge branch 'main' into main
jsuarezruiz 67eceb8
Replace IText for Text property until we also have TextColor
rogihee 5b3126e
Merge branch 'main' into main
jsuarezruiz d214b80
Merge branch 'main' into main
jsuarezruiz 6541480
Merge branch 'main' into main
jsuarezruiz e1465e0
Merge branch 'main' into main
jsuarezruiz e18c787
Merge branch 'main' into main
jsuarezruiz 4b16db8
Fix Android tests (cast to wrong type)
hartez 2e5e6b3
Merge remote-tracking branch 'origin/main' into pr/450
mattleibow 4c80c82
Formatting
mattleibow 4bff6f8
Merge remote-tracking branch 'origin/main' into pr/450
mattleibow 5231657
Merge branch 'main' into main
jsuarezruiz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
namespace Microsoft.Maui | ||
{ | ||
public interface ISearchBar : IView | ||
{ | ||
string Text { get; } | ||
} | ||
} |
17 changes: 17 additions & 0 deletions
17
src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
using AndroidX.AppCompat.Widget; | ||
|
||
namespace Microsoft.Maui.Handlers | ||
{ | ||
public partial class SearchBarHandler : AbstractViewHandler<ISearchBar, SearchView> | ||
rogihee marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{ | ||
protected override SearchView CreateNativeView() | ||
{ | ||
return new SearchView(Context); | ||
} | ||
|
||
public static void MapText(SearchBarHandler handler, ISearchBar searchBar) | ||
{ | ||
handler.TypedNativeView?.UpdateText(searchBar); | ||
} | ||
} | ||
} |
11 changes: 11 additions & 0 deletions
11
src/Core/src/Handlers/SearchBar/SearchBarHandler.Standard.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
using System; | ||
|
||
namespace Microsoft.Maui.Handlers | ||
{ | ||
public partial class SearchBarHandler : AbstractViewHandler<ISearchBar, object> | ||
{ | ||
protected override object CreateNativeView() => throw new NotImplementedException(); | ||
|
||
public static void MapText(IViewHandler handler, ISearchBar searchBar) { } | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
namespace Microsoft.Maui.Handlers | ||
{ | ||
public partial class SearchBarHandler | ||
{ | ||
public static PropertyMapper<ISearchBar, SearchBarHandler> SearchBarMapper = new PropertyMapper<ISearchBar, SearchBarHandler>(ViewHandler.ViewMapper) | ||
{ | ||
[nameof(ISearchBar.Text)] = MapText | ||
}; | ||
|
||
public SearchBarHandler() : base(SearchBarMapper) | ||
{ | ||
|
||
} | ||
|
||
public SearchBarHandler(PropertyMapper mapper) : base(mapper ?? SearchBarMapper) | ||
{ | ||
|
||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
using System; | ||
using UIKit; | ||
|
||
namespace Microsoft.Maui.Handlers | ||
{ | ||
public partial class SearchBarHandler : AbstractViewHandler<ISearchBar, UISearchBar> | ||
{ | ||
protected override UISearchBar CreateNativeView() => new UISearchBar(); | ||
|
||
public static void MapText(SearchBarHandler handler, ISearchBar searchBar) | ||
{ | ||
handler.TypedNativeView?.UpdateText(searchBar); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
using AndroidX.AppCompat.Widget; | ||
|
||
namespace Microsoft.Maui | ||
{ | ||
public static class SearchBarExtensions | ||
{ | ||
public static void UpdateText(this SearchView searchView, ISearchBar searchBar) | ||
{ | ||
searchView.SetQuery(searchBar.Text, false); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
using UIKit; | ||
|
||
namespace Microsoft.Maui | ||
{ | ||
public static class SearchBarExtensions | ||
{ | ||
public static void UpdateText(this UISearchBar uiSearchBar, ISearchBar searchBar) | ||
{ | ||
uiSearchBar.Text = searchBar.Text; | ||
} | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Android.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
using Android.Widget; | ||
using Microsoft.Maui.Handlers; | ||
|
||
namespace Microsoft.Maui.DeviceTests | ||
{ | ||
public partial class SearchBarHandlerTests | ||
{ | ||
SearchView GetNativeSearchBar(SearchBarHandler searchBarHandler) => | ||
(SearchView)searchBarHandler.View; | ||
|
||
string GetNativeText(SearchBarHandler searchBarHandler) => | ||
GetNativeSearchBar(searchBarHandler).Query; | ||
} | ||
} |
49 changes: 49 additions & 0 deletions
49
src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
using System.Threading.Tasks; | ||
using Microsoft.Maui.DeviceTests.Stubs; | ||
using Microsoft.Maui.Handlers; | ||
using Xunit; | ||
|
||
namespace Microsoft.Maui.DeviceTests | ||
{ | ||
[Category(TestCategory.SearchBar)] | ||
public partial class SearchBarHandlerTests : HandlerTestBase<SearchBarHandler> | ||
{ | ||
public SearchBarHandlerTests(HandlerTestFixture fixture) : base(fixture) | ||
{ | ||
} | ||
|
||
[Fact(DisplayName = "Text Initializes Correctly")] | ||
public async Task TextInitializesCorrectly() | ||
{ | ||
var searchBar = new SearchBarStub | ||
{ | ||
Text = "Test" | ||
}; | ||
|
||
await ValidatePropertyInitValue(searchBar, () => searchBar.Text, GetNativeText, searchBar.Text); | ||
} | ||
|
||
[Theory(DisplayName = "Query Text Updates Correctly")] | ||
[InlineData(null, null)] | ||
[InlineData(null, "Query")] | ||
[InlineData("Query", null)] | ||
[InlineData("Query", "Another search query")] | ||
public async Task TextUpdatesCorrectly(string setValue, string unsetValue) | ||
{ | ||
var searchBar = new SearchBarStub(); | ||
|
||
await ValidatePropertyUpdatesValue( | ||
searchBar, | ||
nameof(ISearchBar.Text), | ||
h => | ||
{ | ||
var n = GetNativeText(h); | ||
if (string.IsNullOrEmpty(n)) | ||
n = null; // native platforms may not support null text | ||
return n; | ||
}, | ||
setValue, | ||
unsetValue); | ||
} | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.iOS.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
using Microsoft.Maui.Handlers; | ||
using UIKit; | ||
|
||
namespace Microsoft.Maui.DeviceTests | ||
{ | ||
public partial class SearchBarHandlerTests | ||
{ | ||
UISearchBar GetNativeEntry(SearchBarHandler searchBarHandler) => | ||
(UISearchBar)searchBarHandler.View; | ||
|
||
string GetNativeText(SearchBarHandler searchBarHandler) => | ||
GetNativeEntry(searchBarHandler).Text; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
namespace Microsoft.Maui.DeviceTests.Stubs | ||
{ | ||
public partial class SearchBarStub : StubBase, ISearchBar | ||
{ | ||
private string _text; | ||
|
||
public string Text { get => _text; set => SetProperty(ref _text, value); } | ||
|
||
public Color TextColor { get; set; } | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this maybe inherit from
IText
as well and not have the Text` property? For the additional properties, just let then exist and only add the mapping for text in this PR. The rest can be done later and we probably can and should re-use the code from Entry.