-
Notifications
You must be signed in to change notification settings - Fork 3k
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
Bugfix FXIOS-8309 [v122.1] System theme resetting bug #18429
Bugfix FXIOS-8309 [v122.1] System theme resetting bug #18429
Conversation
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.
Will this PR conflicts with the legacy removal PR?
It won't, because that legacy one was based off this. So this needs to be merged first, then that. :) |
@Mergifyio backport release/v122 release/v123 |
✅ Backports have been created
|
Client.app: Coverage: 32.32
CredentialProvider.appex: Coverage: 22.09
Generated by 🚫 Danger Swift against e041268 |
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.
thanks for the update! looks a lot cleaner as well 🔥
one comment for double checking, not a blocker.
legacyThemeManager.current = isLightTheme ? LegacyNormalTheme() : LegacyDarkTheme() | ||
themeManager.changeCurrentTheme(isLightTheme ? .light : .dark) | ||
themeManager.changeCurrentTheme(newTheme) |
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.
logic changed here in which we don't default to dark theme, are we okay with this update?
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.
Well, this should default to whatever's called, really, as opposed to having a random default. It's cleaner this way and the logic is easier to follow, imo.
* fix issue * improvements because they're nice * fix mock (cherry picked from commit 43e00b7) # Conflicts: # firefox-ios/Client/Frontend/Settings/ThemeSettings/ThemeMiddleware.swift
* fix issue * improvements because they're nice * fix mock (cherry picked from commit 43e00b7) # Conflicts: # BrowserKit/Sources/Common/Theming/DefaultThemeManager.swift # Client/Frontend/Settings/Main/General/ThemeSetting.swift # Client/Frontend/Settings/ThemeSettings/ThemeMiddleware.swift # Client/Frontend/Theme/LegacyThemeManager/LegacyThemeManager.swift # Client/Telemetry/TelemetryWrapper.swift
… (#18456) * Bugfix FXIOS-8309 [v122.1] System theme resetting bug (#18429) * fix issue * improvements because they're nice * fix mock (cherry picked from commit 43e00b7) # Conflicts: # firefox-ios/Client/Frontend/Settings/ThemeSettings/ThemeMiddleware.swift * Update ThemeMiddleware.swift --------- Co-authored-by: roux g. buciu <[email protected]>
…#18429) * fix issue * improvements because they're nice * fix mock
📜 Tickets
Jira ticket
Github issue
💡 Description
the migration was resetting the system theme.
Also, I started removing a bit more legacy theme stuff. Just a bit.
📝 Checklist
You have to check all boxes before merging