[macOS/iOS] Fix RequestedThemeChanged event #11199

jsuarezruiz · 2022-11-08T13:20:53Z

Description of Change

Fix RequestedThemeChanged event using Shell on macOS/iOS.

We use the page controller to detect theme changes thanks to traitCollectionDidChange. However, with Shell this doesn't work and the default project template uses Shell. This PR applies changes to detect changes in themes also using Shell.

Issues Fixed

Fixes #10055
Fixes #10310
Fixes #11005
Fixes #11119

piotreksda · 2023-01-15T15:06:10Z

When will the changes be available in the .net 6 stable version?

jfversluis · 2023-01-20T09:01:18Z

When will the changes be available in the .net 6 stable version?

This will probably not land in .NET 6 as it introduces new APIs and thus breaking changes. This will become available in .NET 8 or if we decide this is crucial in .NET 7 maybe.

Hurricane31337 · 2023-02-08T13:29:22Z

When will the changes be available in the .net 6 stable version?

This will probably not land in .NET 6 as it introduces new APIs and thus breaking changes. This will become available in .NET 8 or if we decide this is crucial in .NET 7 maybe.

Please at least make this change in .NET 7. This is not a new feature but a crucial fix for developing macOS apps using .NET MAUI.

I am currently developing a MAUI application that I intend to ship to macOS only (cross platform to be flexible) and my current experience is that its Dark Mode capabilities are completely unusable without this fix and I would never ship my app in its current state.

How could it be better to keep it in its current state "to not break things"? Currently this part of the macOS target is completely broken anyways! 😃

mandel-macaque

Small possible improvement

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs

…ctionRootRenderer.cs Co-authored-by: Manuel de la Pena <mandel@microsoft.com>

Changes made. Please re-review.

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs

fixed!

mattleibow · 2023-03-16T20:27:21Z

This will be superseded by #13510. However, this PR is more backport friendly and we can get the fix in sooner until @PureWeen runs all the tests.

This PR is very hard to test because our UI tests are not yet ready to run and this is an OS event.

rmarinho · 2023-03-20T14:04:47Z

/backport to net7.0

github-actions · 2023-03-20T14:05:03Z

Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/4469092013

github-actions · 2023-03-20T14:05:21Z

@rmarinho backporting to net7.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Fix RequestedThemeChanged event on macOS using Shell
Using index info to reconstruct a base tree...
M	src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
M	src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
CONFLICT (content): Merge conflict in src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
Auto-merging src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
CONFLICT (content): Merge conflict in src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix RequestedThemeChanged event on macOS using Shell
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

github-actions · 2023-03-20T14:05:23Z

@rmarinho an error occurred while backporting to net7.0, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

mattleibow · 2023-03-20T14:45:40Z

/backport to main

github-actions · 2023-03-20T14:45:59Z

Started backporting to main: https://github.com/dotnet/maui/actions/runs/4469507099

github-actions · 2023-03-20T14:46:14Z

@mattleibow backporting to main failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Fix RequestedThemeChanged event on macOS using Shell
Using index info to reconstruct a base tree...
M	src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs
M	src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
M	src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
CONFLICT (content): Merge conflict in src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
Auto-merging src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
CONFLICT (content): Merge conflict in src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
Auto-merging src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs
CONFLICT (content): Merge conflict in src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix RequestedThemeChanged event on macOS using Shell
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

github-actions · 2023-03-20T14:46:16Z

@mattleibow an error occurred while backporting to main, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> Co-authored-by: Rui Marinho <me@ruimarinho.net> Co-authored-by: Manuel de la Pena <mandel@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com> Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> Co-authored-by: Rui Marinho <me@ruimarinho.net> Co-authored-by: Manuel de la Pena <mandel@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com> Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> Co-authored-by: Rui Marinho <me@ruimarinho.net> Co-authored-by: Manuel de la Pena <mandel@microsoft.com>

Fix RequestedThemeChanged event on macOS using Shell

e964b47

jsuarezruiz added t/bug Something isn't working area-xaml XAML, CSS, Triggers, Behaviors labels Nov 8, 2022

jsuarezruiz requested a review from jfversluis November 22, 2022 15:17

Redth requested a review from PureWeen November 22, 2022 16:56

jsuarezruiz added 2 commits December 9, 2022 10:05

Merge branch 'main' into fix-10055

529848b

Merge branch 'main' into fix-10055

5939db3

Merge branch 'main' into fix-10055

a20dd98

Merge branch 'main' into fix-10055

9f556d1

jfversluis approved these changes Jan 20, 2023

View reviewed changes

jfversluis and others added 2 commits January 20, 2023 14:06

Bad merge fix

1da6696

Merge branch 'main' into fix-10055

9be0153

jsuarezruiz requested a review from mandel-macaque February 10, 2023 12:32

jsuarezruiz added 2 commits February 10, 2023 13:33

Merge branch 'main' into fix-10055

05fe9a8

Merge branch 'main' into fix-10055

fbd3ccc

mandel-macaque previously requested changes Feb 17, 2023

View reviewed changes

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs Outdated Show resolved Hide resolved

Update src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSe…

af5121d

…ctionRootRenderer.cs Co-authored-by: Manuel de la Pena <mandel@microsoft.com>

jsuarezruiz requested a review from mandel-macaque February 20, 2023 13:39

Merge branch 'main' into fix-10055

7d3e290

PureWeen previously requested changes Feb 28, 2023

View reviewed changes

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs Outdated Show resolved Hide resolved

mandel-macaque approved these changes Mar 7, 2023

View reviewed changes

mattleibow self-assigned this Mar 8, 2023

mattleibow added the area-theme Themes, theming label Mar 8, 2023

jsuarezruiz added 3 commits March 9, 2023 16:20

Merge branch 'main' into fix-10055

b3b26f0

Merge branch 'main' into fix-10055

1eb754b

Merge branch 'main' into fix-10055

eb43250

Refactoring code

7df2af3

jsuarezruiz requested a review from PureWeen March 16, 2023 13:15

Merge branch 'main' into fix-10055

61bd324

mattleibow approved these changes Mar 16, 2023

View reviewed changes

PureWeen approved these changes Mar 16, 2023

View reviewed changes

mattleibow enabled auto-merge (squash) March 16, 2023 20:34

mattleibow added the backport/suggested The PR author or issue review has suggested that the change should be backported. label Mar 16, 2023

mattleibow merged commit 9b58e56 into main Mar 16, 2023

mattleibow deleted the fix-10055 branch March 16, 2023 21:15

rmarinho added the backport/approved After some discussion or review, this PR or change was approved to be backported. label Mar 20, 2023

mattleibow mentioned this pull request Mar 20, 2023

[net7.0] [macOS/iOS] Fix RequestedThemeChanged event (#11199) #14076

Merged

github-actions bot locked and limited conversation to collaborators Dec 16, 2023

samhouts added platform/macOS 🍏 macOS / Mac Catalyst platform/iOS 🍎 labels Feb 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[macOS/iOS] Fix RequestedThemeChanged event #11199

[macOS/iOS] Fix RequestedThemeChanged event #11199

jsuarezruiz commented Nov 8, 2022 •

edited

piotreksda commented Jan 15, 2023

jfversluis commented Jan 20, 2023

Hurricane31337 commented Feb 8, 2023

mandel-macaque left a comment

mattleibow commented Mar 16, 2023

rmarinho commented Mar 20, 2023

github-actions bot commented Mar 20, 2023

github-actions bot commented Mar 20, 2023

github-actions bot commented Mar 20, 2023

mattleibow commented Mar 20, 2023

github-actions bot commented Mar 20, 2023

github-actions bot commented Mar 20, 2023

github-actions bot commented Mar 20, 2023

[macOS/iOS] Fix RequestedThemeChanged event #11199

[macOS/iOS] Fix RequestedThemeChanged event #11199

Conversation

jsuarezruiz commented Nov 8, 2022 • edited

Description of Change

Issues Fixed

piotreksda commented Jan 15, 2023

jfversluis commented Jan 20, 2023

Hurricane31337 commented Feb 8, 2023

mandel-macaque left a comment

Choose a reason for hiding this comment

mattleibow commented Mar 16, 2023

rmarinho commented Mar 20, 2023

github-actions bot commented Mar 20, 2023

github-actions bot commented Mar 20, 2023

github-actions bot commented Mar 20, 2023

mattleibow commented Mar 20, 2023

github-actions bot commented Mar 20, 2023

github-actions bot commented Mar 20, 2023

github-actions bot commented Mar 20, 2023

jsuarezruiz commented Nov 8, 2022 •

edited