-
Notifications
You must be signed in to change notification settings - Fork 426
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
Onboarding Contextual Tutorial Rendering #3063
Merged
alessandroboron
merged 7 commits into
AleSab/implement-contextual-onboarding
from
alessandro/onboarding-tutorial-show-dax
Jul 18, 2024
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
d20ebe9
Do not show FireButton overlay for new Onboarding cohort
alessandroboron e790300
Add View to add OnboardingBackground to ContextualDialog
alessandroboron 4902f5d
Add Factory Interface to create ContextualDaxDialogs
alessandroboron a7c5a68
Add presenter to present Contextual Onboarding depending on the variant
alessandroboron d02cdec
Present ContextualOnboarding from TabViewController
alessandroboron 9d82230
Remove onCompletion and onDismiss from presenting method
alessandroboron 5709cf7
Temporary fix unit tests
alessandroboron 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 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
44 changes: 44 additions & 0 deletions
44
...kGo/OnboardingExperiment/ContextualDaxDialogs/ContextualOnboardingBackgroundWrapper.swift
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 |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // | ||
| // ContextualOnboardingBackgroundWrapper.swift | ||
| // DuckDuckGo | ||
| // | ||
| // Copyright © 2024 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct ContextualOnboardingBackgroundWrapper<Content: View>: View { | ||
| private let content: Content | ||
|
|
||
| init(_ content: Content) { | ||
| self.content = content | ||
| } | ||
|
|
||
| var body: some View { | ||
| content | ||
| .padding() | ||
| .background(OnboardingBackground()) | ||
| } | ||
| } | ||
|
|
||
| #Preview { | ||
| ContextualOnboardingBackgroundWrapper( | ||
| ContextualDaxDialog( | ||
| message: .init(string: "Hello World!!!"), | ||
| cta: "OK!", | ||
| action: {} | ||
| ) | ||
| ) | ||
| } |
49 changes: 49 additions & 0 deletions
49
DuckDuckGo/OnboardingExperiment/ContextualOnboarding/ContextualDaxDialogsFactory.swift
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 |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // | ||
| // ContextualDaxDialogsFactory.swift | ||
| // DuckDuckGo | ||
| // | ||
| // Copyright © 2024 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| protocol ContextualDaxDialogsFactory { | ||
| func makeView(for spec: DaxDialogs.BrowsingSpec, onActionTapped: (() -> Void)?) -> UIViewController | ||
| } | ||
|
|
||
| extension ContextualDaxDialogsFactory { | ||
| func makeView(for spec: DaxDialogs.BrowsingSpec) -> UIViewController { | ||
| self.makeView(for: spec, onActionTapped: nil) | ||
| } | ||
| } | ||
|
|
||
| // TODO: This will be replaced with the factory that returns the Contextual Dax Dialogs for the new contextual flow | ||
| final class ExistingLogicContextualDaxDialogsFactory: ContextualDaxDialogsFactory { | ||
|
|
||
| func makeView(for spec: DaxDialogs.BrowsingSpec, onActionTapped: (() -> Void)?) -> UIViewController { | ||
| let contextualDialog = ContextualDaxDialog( | ||
| message: spec.message.attributedStringFromMarkdown(color: ThemeManager.shared.currentTheme.daxDialogTextColor), | ||
| cta: spec.cta, | ||
| action: onActionTapped | ||
| ) | ||
|
|
||
| let hostingController = UIHostingController(rootView: ContextualOnboardingBackgroundWrapper(contextualDialog)) | ||
| if #available(iOS 16.0, *) { | ||
| hostingController.sizingOptions = [.intrinsicContentSize] | ||
| } | ||
|
|
||
| return hostingController | ||
| } | ||
| } |
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.
To simplify the review: