Refactor FXIOS-9331 [Theming] Fix ThemeManager issues #20667
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,7 +31,6 @@ public final class DefaultThemeManager: ThemeManager, Notifiable { | |
|
|
||
| // MARK: - Variables | ||
|
|
||
| private var windows: [WindowUUID: UIWindow] = [:] | ||
| private var allWindowUUIDs: [WindowUUID] { return Array(windows.keys) } | ||
| public var notificationCenter: NotificationProtocol | ||
|
|
@@ -44,10 +43,6 @@ public final class DefaultThemeManager: ThemeManager, Notifiable { | |
| return userDefaults.bool(forKey: ThemeKeys.NightMode.isOn) | ||
| } | ||
|
|
||
| public var systemThemeIsOn: Bool { | ||
| return userDefaults.bool(forKey: ThemeKeys.systemThemeIsOn) | ||
| } | ||
|
|
@@ -83,132 +78,102 @@ public final class DefaultThemeManager: ThemeManager, Notifiable { | |
| UIApplication.didBecomeActiveNotification]) | ||
| } | ||
|
|
||
| // MARK: - Themeing general functions | ||
| public func getCurrentTheme(for window: WindowUUID?) -> Theme { | ||
| guard let window else { | ||
| assertionFailure("Attempt to get the theme for a nil window UUID.") | ||
| return DarkTheme() | ||
| } | ||
|
|
||
| return getThemeFrom(type: determineThemeType(for: window)) | ||
| } | ||
|
|
||
| public func applyThemeUpdatesToWindows() { | ||
| allWindowUUIDs.forEach { | ||
| applyThemeChanges(for: $0, using: determineThemeType(for: $0)) | ||
| } | ||
| } | ||
|
|
||
| // MARK: - Manual theme functions | ||
| public func setManualTheme(to newTheme: ThemeType) { | ||
| updateSavedTheme(to: newTheme) | ||
| applyThemeUpdatesToWindows() | ||
| } | ||
|
|
||
| public func getUserManualTheme() -> ThemeType { | ||
| guard let savedThemeDescription = userDefaults.string(forKey: ThemeKeys.themeName), | ||
| let savedTheme = ThemeType(rawValue: savedThemeDescription) | ||
| else { return getThemeTypeBasedOnSystem() } | ||
|
|
||
| return savedTheme | ||
| } | ||
|
|
||
| // MARK: - System theme functions | ||
| public func setSystemTheme(isOn: Bool) { | ||
| userDefaults.set(isOn, forKey: ThemeKeys.systemThemeIsOn) | ||
| applyThemeUpdatesToWindows() | ||
| } | ||
|
|
||
| private func getThemeTypeBasedOnSystem() -> ThemeType { | ||
| return UIScreen.main.traitCollection.userInterfaceStyle == .dark ? ThemeType.dark : ThemeType.light | ||
| } | ||
|
|
||
| // MARK: - Private theme functions | ||
| public func setPrivateTheme(isOn: Bool, for window: WindowUUID) { | ||
| guard getPrivateThemeIsOn(for: window) != isOn else { return } | ||
|
|
||
| var settings: KeyedPrivateModeFlags | ||
| = userDefaults.object(forKey: ThemeKeys.PrivateMode.byWindowUUID) as? KeyedPrivateModeFlags ?? [:] | ||
|
|
||
| settings[window.uuidString] = NSNumber(value: isOn) | ||
| userDefaults.set(settings, forKey: ThemeKeys.PrivateMode.byWindowUUID) | ||
|
|
||
| applyThemeChanges(for: window, using: determineThemeType(for: window)) | ||
| } | ||
|
|
||
| public func getPrivateThemeIsOn(for window: WindowUUID) -> Bool { | ||
| let settings = userDefaults.object(forKey: ThemeKeys.PrivateMode.byWindowUUID) as? KeyedPrivateModeFlags | ||
| if settings == nil { migrateSingleWindowPrivateDefaultsToMultiWindow(for: window) } | ||
|
|
||
| let boxedBool = settings?[window.uuidString] as? NSNumber | ||
| return boxedBool?.boolValue ?? false | ||
| } | ||
|
|
||
| // MARK: - Automatic brightness theme functions | ||
| public func setAutomaticBrightness(isOn: Bool) { | ||
| guard automaticBrightnessIsOn != isOn else { return } | ||
| userDefaults.set(isOn, forKey: ThemeKeys.AutomaticBrightness.isOn) | ||
| applyThemeUpdatesToWindows() | ||
| } | ||
|
|
||
| public func setAutomaticBrightnessValue(_ value: Float) { | ||
| userDefaults.set(value, forKey: ThemeKeys.AutomaticBrightness.thresholdValue) | ||
| applyThemeUpdatesToWindows() | ||
| } | ||
|
|
||
| private func getThemeTypeBasedOnBrightness() -> ThemeType { | ||
| return Float(UIScreen.main.brightness) < automaticBrightnessValue ? .dark : .light | ||
| } | ||
|
|
||
| // MARK: - Window specific functions | ||
| public func windowNonspecificTheme() -> Theme { | ||
| switch getUserManualTheme() { | ||
| case .dark, .nightMode, .privateMode: return DarkTheme() | ||
| case .light: return LightTheme() | ||
| } | ||
| } | ||
|
|
||
| public func windowDidClose(uuid: WindowUUID) { | ||
| windows.removeValue(forKey: uuid) | ||
| } | ||
|
|
||
| public func setWindow(_ window: UIWindow, for uuid: WindowUUID) { | ||
| windows[uuid] = window | ||
| updateSavedTheme(to: getUserManualTheme()) | ||
| applyThemeChanges(for: uuid, using: determineThemeType(for: uuid)) | ||
| } | ||
|
|
||
| // MARK: - Private helper methods | ||
|
|
||
| private func migrateSingleWindowPrivateDefaultsToMultiWindow(for window: WindowUUID) { | ||
| // Migrate old private setting to our window-based settings | ||
|
Comment on lines
178
to
179
There was a problem hiding this comment. I think we may be able to remove this migration code and persisted state entirely? IIRC this persisted state was to keep track of private mode between app launches, but now I think we've updated the iOS client to always clear private tabs on launch. And I believe the related setting for that has also been removed. (Though we should double-check, maybe all of this is still behind an experiment. I also have seen several user reviews already complaining about that change so we'd want to confirm with Product whether it's permanent or not.) But if we have decided 100% to remove all of that, then I think we can also remove this migration and persisted state, since the app will never launch with any windows in Private mode. I'd definitely like to get confirmation on that from someone who is a bit more in-the-loop on that however. (cc @OrlaM) There was a problem hiding this comment. Good point. I can make a note to fully look into this afterward, but I feel like this shouldn't be a blocker for merging this PR. It's easily removed later. |
||
|
|
@@ -218,42 +183,36 @@ public final class DefaultThemeManager: ThemeManager, Notifiable { | |
| } | ||
|
|
||
| private func updateSavedTheme(to newTheme: ThemeType) { | ||
| userDefaults.set(newTheme.rawValue, forKey: ThemeKeys.themeName) | ||
| } | ||
|
|
||
| private func applyThemeChanges(for window: WindowUUID, using newTheme: ThemeType) { | ||
| // Overwrite the user interface style on the window attached to our scene | ||
| // once we have multiple scenes we need to update all of them | ||
| let style = self.getCurrentTheme(for: window).type.getInterfaceStyle() | ||
| self.windows[window]?.overrideUserInterfaceStyle = style | ||
| notifyCurrentThemeDidChange(for: window) | ||
| } | ||
|
|
||
| private func notifyCurrentThemeDidChange(for window: WindowUUID) { | ||
| mainQueue.ensureMainThread { [weak self] in | ||
| self?.notificationCenter.post( | ||
| name: .ThemeDidChange, | ||
| withUserInfo: window.userInfo | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private func determineThemeType(for window: WindowUUID) -> ThemeType { | ||
| if getPrivateThemeIsOn(for: window) { return .privateMode } | ||
| if nightModeIsOn { return .nightMode } | ||
| if systemThemeIsOn { return getThemeTypeBasedOnSystem() } | ||
| if automaticBrightnessIsOn { return getThemeTypeBasedOnBrightness() } | ||
|
|
||
| return getUserManualTheme() | ||
| } | ||
|
|
||
| private func getThemeFrom(type: ThemeType) -> Theme { | ||
| switch type { | ||
| case .light: | ||
| return LightTheme() | ||
|
|
@@ -266,26 +225,13 @@ public final class DefaultThemeManager: ThemeManager, Notifiable { | |
| } | ||
| } | ||
|
|
||
| // MARK: - Notifiable | ||
|
|
||
| public func handleNotifications(_ notification: Notification) { | ||
| switch notification.name { | ||
| case UIScreen.brightnessDidChangeNotification, | ||
| UIApplication.didBecomeActiveNotification: | ||
| applyThemeUpdatesToWindows() | ||
| default: | ||
| return | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,14 +39,4 @@ public enum ThemeType: String { | |
| case .light: UIBlurEffect.Style.extraLight | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Doesn't need to block the PR but we probably don't need to store this in
UserDefaultsany longer, and changing it might also fix this issue where the windows are rendering briefly in Private theme incorrectly during launch:launch_flash.mov