Skip to content

[Android] Fixed the Incorrect Text Color Applied to Selected Tab in TabbedPage #28844

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
merged 2 commits into from
Apr 11, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions src/Controls/src/Core/Platform/Android/TabbedPageManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ protected virtual ColorStateList GetItemTextColorStates()
if (_newTabTextColors is not null)
return _newTabTextColors;

int checkedColor;
int? checkedColor = null;

// The new default color to use may have a color if BarItemColor is not null or the original colors for text
// are not null either. If it does not happens, this variable will be null and the ColorStateList of the
Expand All @@ -635,22 +635,27 @@ protected virtual ColorStateList GetItemTextColorStates()
}
else
{
// UnSelected tabs TextColor
if (barItemColor is not null)
Copy link
Contributor

Choose a reason for hiding this comment

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

Here we repeat some code and can just create a new method:

int GetItemTextColor(Color? customColor, OriginalTabTextColors? originalColors)
{
    return customColor?.ToPlatform().ToArgb() ?? originalColors?.DefaultColor ?? 0;
}

To get a cleaner version:

// UnSelected tabs TextColor
  defaultColor = GetItemTextColor(barItemColor, _originalTabTextColors);

  // Selected tabs TextColor
  checkedColor = GetItemTextColor(barSelectedItemColor, _originalTabTextColors);

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the feedback. I have optimized the code as suggested @jsuarezruiz

{
defaultColor = barItemColor.ToPlatform().ToArgb();

if (barItemColor is null && _originalTabTextColors is not null)
}
else if (_originalTabTextColors is not null)
{
defaultColor = _originalTabTextColors.DefaultColor;

if (!defaultColor.HasValue)
return _originalTabTextColors;
else
checkedColor = defaultColor.Value;

}
// Selected tabs TextColor
if (barSelectedItemColor is not null)
{
checkedColor = barSelectedItemColor.ToPlatform().ToArgb();
}
else if (_originalTabTextColors is not null)
{
checkedColor = _originalTabTextColors.DefaultColor;
}
}

_newTabTextColors = GetColorStateList(defaultColor.Value, checkedColor);
_newTabTextColors = GetColorStateList(defaultColor.Value, checkedColor.Value);

return _newTabTextColors;
}
Expand Down
75 changes: 75 additions & 0 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue28838.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
namespace Maui.Controls.Sample.Issues;
[Issue(IssueTracker.Github, 28838, "Incorrect Text Color Applied to Selected Tab in TabbedPage on Android", PlatformAffected.Android)]
public class Issue28838 : TabbedPage
{
public Issue28838()
{
// Set the UnselectedTabColor property , it should be applied only to the unselected tab.
UnselectedTabColor = Colors.Red;

// Add tabs (pages)
Children.Add(new Issue28838Tab1());
Children.Add(new Issue28838Tab2());
Children.Add(new Issue28838Tab3());
}
}

public class Issue28838Tab1 : ContentPage
{
public Issue28838Tab1()
{
Title = "Tab 1";
var verticalStackLayout = new VerticalStackLayout
{
VerticalOptions = LayoutOptions.Center,
Children = {
new Label
{
HorizontalOptions = LayoutOptions.Center,
Text = "Tab 1",
AutomationId = "Tab1"
},
}
};
Content = verticalStackLayout;
}
}

public class Issue28838Tab2 : ContentPage
{
public Issue28838Tab2()
{
Title = "Tab 2";
var verticalStackLayout = new VerticalStackLayout
{
VerticalOptions = LayoutOptions.Center,
Children = {
new Label
{
HorizontalOptions = LayoutOptions.Center,
Text = "Tab 2"
}
}
};
Content = verticalStackLayout;
}
}
public class Issue28838Tab3 : ContentPage
{
public Issue28838Tab3()
{
Title = "Tab 3";
var verticalStackLayout = new VerticalStackLayout
{
VerticalOptions = LayoutOptions.Center,
Children = {
new Label
{
HorizontalOptions = LayoutOptions.Center,
Text = "Tab 3"
}
}
};
Content = verticalStackLayout;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using NUnit.Framework;
using UITest.Appium;
using UITest.Core;

namespace Microsoft.Maui.TestCases.Tests.Issues;
public class Issue28838 : _IssuesUITest
{
public Issue28838(TestDevice device) : base(device) { }

public override string Issue => "Incorrect Text Color Applied to Selected Tab in TabbedPage on Android";

[Test]
[Category(UITestCategories.TabbedPage)]
public void DefaultSelectedTabTextColorShouldApplyProperly()
{
App.WaitForElement("Tab1");
VerifyScreenshot();
Copy link
Contributor

Choose a reason for hiding this comment

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

Pending snapshots in Android, Mac and Windows. Trigger a build.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have added the pending snapshots.

}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading