-
Notifications
You must be signed in to change notification settings - Fork 1.9k
[Windows] Fix for IndicatorView using templated icons not working #28905
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
Merged
PureWeen
merged 10 commits into
dotnet:inflight/current
from
SyedAbdulAzeemSF4852:fix-7144
Apr 22, 2025
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
26a538a
[Windows] Fix for 7144 ( IndicatorView using templated icons not work…
SyedAbdulAzeemSF4852 3f4240f
[Windows] Fix for 7144 ( IndicatorView using templated icons not work…
SyedAbdulAzeemSF4852 3e3b72e
[Windows] Fix for 7144 ( IndicatorView using templated icons not work…
SyedAbdulAzeemSF4852 6fc3933
[Windows] Fix for 7144 ( IndicatorView using templated icons not work…
SyedAbdulAzeemSF4852 953ce0b
[Windows] Fix for 7144 ( IndicatorView using templated icons not work…
SyedAbdulAzeemSF4852 d92ea5c
[Windows] Fix for 7144 ( IndicatorView using templated icons not work…
SyedAbdulAzeemSF4852 3ae6618
[Windows] Fix for 7144 ( IndicatorView using templated icons not work…
SyedAbdulAzeemSF4852 629f518
Have added snapshots for iOS and Android
SyedAbdulAzeemSF4852 721c174
Have added the snapshots
SyedAbdulAzeemSF4852 a66f04a
[Windows] Fix for 7144 ( IndicatorView using templated icons not work…
SyedAbdulAzeemSF4852 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
Binary file added
BIN
+48.8 KB
...ts/TestCases.Android.Tests/snapshots/android/IndicatorViewWithTemplatedIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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,78 @@ | ||
using System.Collections.ObjectModel; | ||
|
||
namespace Controls.TestCases.HostApp.Issues; | ||
|
||
[Issue(IssueTracker.Github, 7144, "IndicatorView using templated icons not working", PlatformAffected.UWP)] | ||
public class Issue7144 : ContentPage | ||
{ | ||
ObservableCollection<string> Items { get; set; } = new ObservableCollection<string>() { "Item1", "Item2" }; | ||
|
||
public Issue7144() | ||
{ | ||
Grid grid = new Grid(); | ||
grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Star }); | ||
grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto }); | ||
grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto }); | ||
|
||
IndicatorView indicatorViewWithDataTemplate = new IndicatorView | ||
{ | ||
Margin = new Thickness(0, 0, 0, 40), | ||
HorizontalOptions = LayoutOptions.Center, | ||
IndicatorColor = Colors.Black, | ||
SelectedIndicatorColor = Colors.Green | ||
}; | ||
|
||
indicatorViewWithDataTemplate.IndicatorTemplate = new DataTemplate(() => | ||
{ | ||
Image image = new Image() | ||
{ | ||
Source = "dotnet_bot.png", | ||
HeightRequest = 15, | ||
WidthRequest = 15, | ||
}; | ||
return image; | ||
}); | ||
|
||
CarouselView carouselView = new CarouselView | ||
{ | ||
ItemsSource = Items, | ||
Loop = false, | ||
IndicatorView = indicatorViewWithDataTemplate, | ||
ItemTemplate = new DataTemplate(() => | ||
{ | ||
StackLayout stackLayout = new StackLayout(); | ||
|
||
Label label = new Label | ||
{ | ||
FontAttributes = FontAttributes.Bold, | ||
FontSize = 24, | ||
HorizontalOptions = LayoutOptions.Center, | ||
VerticalOptions = LayoutOptions.Center | ||
}; | ||
label.SetBinding(Label.TextProperty, ".");; | ||
|
||
stackLayout.Children.Add(label); | ||
|
||
return stackLayout; | ||
}) | ||
}; | ||
|
||
Label label = new Label | ||
{ | ||
AutomationId = "descriptionLabel", | ||
Text = "The test case fails if the IndicatorView DataTemplate is not displayed", | ||
FontAttributes = FontAttributes.Bold, | ||
FontSize = 24, | ||
HorizontalOptions = LayoutOptions.Center, | ||
VerticalOptions = LayoutOptions.Center | ||
}; | ||
|
||
grid.Add(carouselView, 0, 0); | ||
grid.Add(indicatorViewWithDataTemplate, 0, 1); | ||
grid.Add(label, 0, 2); | ||
|
||
Content = grid; | ||
} | ||
} | ||
|
||
|
Binary file added
BIN
+24.6 KB
...rols/tests/TestCases.Mac.Tests/snapshots/mac/IndicatorViewWithTemplatedIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions
22
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue7144.cs
This file contains hidden or 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,22 @@ | ||
using NUnit.Framework; | ||
using UITest.Appium; | ||
using UITest.Core; | ||
|
||
namespace Microsoft.Maui.TestCases.Tests.Issues; | ||
|
||
public class Issue7144 : _IssuesUITest | ||
{ | ||
public Issue7144(TestDevice device) : base(device) | ||
{ | ||
} | ||
|
||
public override string Issue => "IndicatorView using templated icons not working"; | ||
|
||
[Test] | ||
[Category(UITestCategories.IndicatorView)] | ||
public void IndicatorViewWithTemplatedIcon() | ||
{ | ||
App.WaitForElement("descriptionLabel"); | ||
VerifyScreenshot(); | ||
} | ||
} |
Binary file added
BIN
+11.7 KB
...ests/TestCases.WinUI.Tests/snapshots/windows/IndicatorViewWithTemplatedIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+51.1 KB
...rols/tests/TestCases.iOS.Tests/snapshots/ios/IndicatorViewWithTemplatedIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or 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
Oops, something went wrong.
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.
Pending snapshots in all platforms.
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.
@jsuarezruiz , I've attached the screenshots for the Android and iOS platforms. I will add the screenshots for the other platforms in the next CI run.