Skip to content
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.

Sign up for GitHub

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

[Android] Avoid to update Shell Toolbar colors if already disposed the Tracker #12539

Merged
merged 3 commits into from
Feb 9, 2023
Merged

[Android] Avoid to update Shell Toolbar colors if already disposed the Tracker #12539

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc48d55
Avoid to update Shell Toolbar colors if already disposed the Tracker
jsuarezruiz Jan 10, 2023
9f08a44
Changes from PR feedback
jsuarezruiz Feb 7, 2023
4c480fa
Update src/Controls/src/Core/Compatibility/Handlers/Shell/Android/She…
jsuarezruiz Feb 9, 2023
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
14 changes: 11 additions & 3 deletions src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarAppearanceTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,17 @@ public virtual void ResetAppearance(AToolbar toolbar, IShellToolbarTracker toolb

protected virtual void SetColors(AToolbar toolbar, IShellToolbarTracker toolbarTracker, Color foreground, Color background, Color title)
{
_shellContext.Shell.Toolbar.BarTextColor = title ?? ShellRenderer.DefaultTitleColor;
_shellContext.Shell.Toolbar.BarBackground = new SolidColorBrush(background ?? ShellRenderer.DefaultBackgroundColor);
_shellContext.Shell.Toolbar.IconColor = foreground ?? ShellRenderer.DefaultForegroundColor;
if (_disposed)
return;

Toolbar shellToolbar = _shellContext.Shell.Toolbar;
jsuarezruiz marked this conversation as resolved.
Show resolved Hide resolved

if (shellToolbar is null)
return;

shellToolbar.BarTextColor = title ?? ShellRenderer.DefaultTitleColor;
shellToolbar.BarBackground = new SolidColorBrush(background ?? ShellRenderer.DefaultBackgroundColor);
shellToolbar.IconColor = foreground ?? ShellRenderer.DefaultForegroundColor;
Comment on lines +44 to +46
Copy link
Member

Choose a reason for hiding this comment

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

Nice use of ??

Copy link
Contributor Author

Choose a reason for hiding this comment

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

❤️

}

#region IDisposable
Expand Down