-
Notifications
You must be signed in to change notification settings - Fork 31
feat(in-app): add dark mode support for in-app messages #1131
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
Open
BernardGatt
wants to merge
7
commits into
main
Choose a base branch
from
INAPP-14506
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+290
−21
Open
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
da70fe3
feat(in-app): add dark mode support for in-app messages
558e97a
fix: inherit app window interface style for modal messages
9b1b9fe
fix: apply color scheme to modal window for WKWebView dark mode
3eb7916
fix: synchronous color scheme storage and inline message support
59a15f4
fix: lint issues and update API docs baseline
0393753
fix: allow setColorScheme before user identification and reset overri…
79a754d
Merge branch 'main' into INAPP-14506
BernardGatt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ protocol EngineWebInstance: AutoMockable { | |
| var delegate: EngineWebDelegate? { get set } | ||
| var view: UIView { get } | ||
| func cleanEngineWeb() | ||
| func updateColorScheme(_ scheme: String) | ||
| } | ||
|
|
||
| public class EngineWeb: NSObject, EngineWebInstance { | ||
|
|
@@ -34,7 +35,8 @@ public class EngineWeb: NSObject, EngineWebInstance { | |
| webView | ||
| } | ||
|
|
||
| private let currentConfiguration: EngineWebConfiguration | ||
| private var currentConfiguration: EngineWebConfiguration | ||
| private let colorSchemeMode: ColorScheme | ||
|
|
||
| public private(set) var currentRoute: String { | ||
| get { _currentRoute } | ||
|
|
@@ -45,6 +47,7 @@ public class EngineWeb: NSObject, EngineWebInstance { | |
| init(configuration: EngineWebConfiguration, state: InAppMessageState, message: Message) { | ||
| self.currentMessage = message | ||
| self.currentConfiguration = configuration | ||
| self.colorSchemeMode = state.colorScheme | ||
|
|
||
| super.init() | ||
|
|
||
|
|
@@ -92,6 +95,30 @@ public class EngineWeb: NSObject, EngineWebInstance { | |
| } | ||
| } | ||
|
|
||
| public func updateColorScheme(_ scheme: String) { | ||
| applyInterfaceStyle(scheme) | ||
|
|
||
| do { | ||
| let jsonData = try JSONEncoder().encode(["action": "updateColorScheme", "colorScheme": scheme]) | ||
| guard let jsonString = String(data: jsonData, encoding: .utf8) else { return } | ||
| let js = "window.postMessage(\(jsonString), '*');" | ||
| webView.evaluateJavaScript(js, completionHandler: nil) | ||
| } catch { | ||
| logger.logWithModuleTag("Failed to encode color scheme update: \(error)", level: .error) | ||
| } | ||
| } | ||
|
|
||
| private func applyInterfaceStyle(_ scheme: String) { | ||
| switch scheme { | ||
| case "dark": | ||
| webView.overrideUserInterfaceStyle = .dark | ||
| case "light": | ||
| webView.overrideUserInterfaceStyle = .light | ||
| default: | ||
| webView.overrideUserInterfaceStyle = .unspecified | ||
| } | ||
| } | ||
|
|
||
| public func cleanEngineWeb() { | ||
| _timeoutTimer?.invalidate() | ||
| _timeoutTimer = nil | ||
|
|
@@ -159,6 +186,17 @@ extension EngineWeb: WKScriptMessageHandler { | |
| // swiftlint:enable cyclomatic_complexity | ||
| extension EngineWeb: WKNavigationDelegate { | ||
| public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { | ||
| let resolvedScheme = colorSchemeMode.resolve(with: webView.traitCollection) | ||
| applyInterfaceStyle(resolvedScheme) | ||
| currentConfiguration = EngineWebConfiguration( | ||
| siteId: currentConfiguration.siteId, | ||
| dataCenter: currentConfiguration.dataCenter, | ||
| instanceId: currentConfiguration.instanceId, | ||
| endpoint: currentConfiguration.endpoint, | ||
| messageId: currentConfiguration.messageId, | ||
| properties: currentConfiguration.properties, | ||
| colorScheme: colorSchemeMode.resolve(with: webView.traitCollection) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we reuse |
||
| ) | ||
| injectConfiguration(currentConfiguration) | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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.
Uh oh!
There was an error while loading. Please reload this page.