Skip to content

Comments

[Windows] Fix for IndicatorView using templated icons not working#28905

Merged
PureWeen merged 10 commits intodotnet:inflight/currentfrom
SyedAbdulAzeemSF4852:fix-7144
Apr 22, 2025
Merged

[Windows] Fix for IndicatorView using templated icons not working#28905
PureWeen merged 10 commits intodotnet:inflight/currentfrom
SyedAbdulAzeemSF4852:fix-7144

Conversation

@SyedAbdulAzeemSF4852
Copy link
Contributor

@SyedAbdulAzeemSF4852 SyedAbdulAzeemSF4852 commented Apr 10, 2025

Issue Details

  • When defining a data template in the IndicatorView, the data template is not applied, and instead, a circle shape is displayed.

Root Cause

  • Once the indicator's view data template is updated, the shapes are also being applied, which overrides the data template and displays the shapes instead.

Description

  • If a data template is specified, then skipped the creation of shapes and the updating of indicator colors.

Validated the behaviour in the following platforms

  • Windows
  • Android
  • iOS
  • Mac

Issues Fixed

Fixes #7144

Output

Before After

@dotnet-policy-service dotnet-policy-service bot added community ✨ Community Contribution partner/syncfusion Issues / PR's with Syncfusion collaboration labels Apr 10, 2025
@jsuarezruiz jsuarezruiz added area-controls-collectionview CollectionView, CarouselView, IndicatorView platform/windows labels Apr 10, 2025
jsuarezruiz
jsuarezruiz reviewed Apr 10, 2025
View reviewed changes
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue7144.cs
public void IndicatorViewWithTemplatedIcon()
{
App.WaitForElement("descriptionLabel");
VerifyScreenshot();
Copy link
Contributor

@jsuarezruiz jsuarezruiz Apr 10, 2025

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.

Copy link
Contributor Author

@SyedAbdulAzeemSF4852 SyedAbdulAzeemSF4852 Apr 11, 2025

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​.

@SyedAbdulAzeemSF4852 SyedAbdulAzeemSF4852 force-pushed the fix-7144 branch 2 times, most recently from 434dece to 3ae6618 Compare April 11, 2025 10:46
@SyedAbdulAzeemSF4852 SyedAbdulAzeemSF4852 marked this pull request as ready for review April 11, 2025 13:24
@SyedAbdulAzeemSF4852 SyedAbdulAzeemSF4852 requested a review from a team as a code owner April 11, 2025 13:24
@jsuarezruiz
Copy link
Contributor

jsuarezruiz commented Apr 14, 2025

/azp run MAUI-UITests-public

@azure-pipelines
Copy link

azure-pipelines bot commented Apr 14, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@rmarinho
Copy link
Member

rmarinho commented Apr 15, 2025

/azp run

rmarinho
rmarinho previously approved these changes Apr 15, 2025
View reviewed changes
@azure-pipelines
Copy link

azure-pipelines bot commented Apr 15, 2025

Azure Pipelines successfully started running 3 pipeline(s).

jsuarezruiz
jsuarezruiz reviewed Apr 15, 2025
View reviewed changes
src/Core/src/Platform/Windows/MauiPageControl.cs Outdated
internal void UpdateIndicatorsColor()
{
if (_indicatorView == null)
if (_indicatorView is null || (_indicatorView is ITemplatedIndicatorView templatedView && templatedView.IndicatorsLayoutOverride is not null))
Copy link
Contributor

@jsuarezruiz jsuarezruiz Apr 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This condition is repeated 2 times, can create an internal property like:

internal bool UseShapeIndicator  =>
    _indicatorView == null || 
    (_indicatorView is ITemplatedIndicatorView templatedView && templatedView.IndicatorsLayoutOverride != null);


if (UseShapeIndicator)
{

}

Copy link
Contributor Author

@SyedAbdulAzeemSF4852 SyedAbdulAzeemSF4852 Apr 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jsuarezruiz , Thanks for the suggestion! I've updated the code to use an internal property as you recommended.

@PureWeen PureWeen added this to the .NET 9 SR7 milestone Apr 18, 2025
@PureWeen PureWeen moved this from Todo to Ready To Review in MAUI SDK Ongoing Apr 18, 2025
@github-project-automation github-project-automation bot moved this from Ready To Review to Approved in MAUI SDK Ongoing Apr 21, 2025
@rmarinho
Copy link
Member

rmarinho commented Apr 21, 2025

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Apr 21, 2025

Azure Pipelines successfully started running 3 pipeline(s).

@PureWeen PureWeen changed the base branch from main to inflight/current April 22, 2025 09:56
@PureWeen PureWeen merged commit 78fabe8 into dotnet:inflight/current Apr 22, 2025
126 of 129 checks passed
@github-project-automation github-project-automation bot moved this from Approved to Done in MAUI SDK Ongoing Apr 22, 2025
PureWeen pushed a commit that referenced this pull request Apr 23, 2025
@SyedAbdulAzeemSF4852 @PureWeen
[Windows] Fix for IndicatorView using templated icons not working (#2…
d6b10f4 
…8905)

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working ) SyedAbdulAzeemSF4852 SyedAbdulAzeemSF4852 committed last week

* Have added snapshots for iOS and Android

* Have added the snapshots

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )
github-actions bot pushed a commit that referenced this pull request Apr 28, 2025
@SyedAbdulAzeemSF4852 @PureWeen
[Windows] Fix for IndicatorView using templated icons not working (#2…
31ce6ca 
…8905)

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working ) SyedAbdulAzeemSF4852 SyedAbdulAzeemSF4852 committed last week

* Have added snapshots for iOS and Android

* Have added the snapshots

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )
PureWeen pushed a commit that referenced this pull request May 2, 2025
@SyedAbdulAzeemSF4852 @PureWeen
[Windows] Fix for IndicatorView using templated icons not working (#2…
19b94b8 
…8905)

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working ) SyedAbdulAzeemSF4852 SyedAbdulAzeemSF4852 committed last week

* Have added snapshots for iOS and Android

* Have added the snapshots

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )
@PureWeen PureWeen mentioned this pull request May 5, 2025
Merged
SuthiYuvaraj pushed a commit to SuthiYuvaraj/maui that referenced this pull request May 9, 2025
@SyedAbdulAzeemSF4852 @SuthiYuvaraj
[Windows] Fix for IndicatorView using templated icons not working (do…
0fe4dfa 
…tnet#28905)

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working ) SyedAbdulAzeemSF4852 SyedAbdulAzeemSF4852 committed last week

* Have added snapshots for iOS and Android

* Have added the snapshots

* [Windows] Fix for 7144 ( IndicatorView using templated icons not working )
@github-actions github-actions bot locked and limited conversation to collaborators May 23, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@rmarinho rmarinho rmarinho approved these changes

@jfversluis jfversluis Awaiting requested review from jfversluis jfversluis was automatically assigned from dotnet/dotnet-maui-reviewers

+1 more reviewer

@jsuarezruiz jsuarezruiz jsuarezruiz left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-controls-collectionview CollectionView, CarouselView, IndicatorView community ✨ Community Contribution partner/syncfusion Issues / PR's with Syncfusion collaboration platform/windows

Projects

MAUI SDK Ongoing
Status: Done

Milestone

.NET 9 SR7

Development

Successfully merging this pull request may close these issues.

[Windows] [Scenario Day] IndicatorView using templated icons not working

4 participants

@SyedAbdulAzeemSF4852 @jsuarezruiz @rmarinho @PureWeen