-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into sabrina/update-fe-onboarding
- Loading branch information
Showing
44 changed files
with
1,730 additions
and
240 deletions.
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| CURRENT_PROJECT_VERSION = 281 | ||
| CURRENT_PROJECT_VERSION = 284 |
Large diffs are not rendered by default.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| // | ||
| // AIChatMenuVisibilityConfigurable.swift | ||
| // | ||
| // 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 Combine | ||
|
|
||
| protocol AIChatMenuVisibilityConfigurable { | ||
| var shouldDisplayApplicationMenuShortcut: Bool { get } | ||
| var shouldDisplayToolbarShortcut: Bool { get } | ||
| var shortcutURL: URL { get } | ||
| var valuesChangedPublisher: PassthroughSubject<Void, Never> { get } | ||
| } | ||
|
|
||
| final class AIChatMenuConfiguration: AIChatMenuVisibilityConfigurable { | ||
| var valuesChangedPublisher = PassthroughSubject<Void, Never>() | ||
| private var cancellables = Set<AnyCancellable>() | ||
| private let preferences: AIChatPreferences | ||
|
|
||
| enum ShortcutType { | ||
| case applicationMenu | ||
| case toolbar | ||
| } | ||
|
|
||
| // MARK: - Public | ||
|
|
||
| var shouldDisplayApplicationMenuShortcut: Bool { | ||
| return isFeatureEnabledFor(shortcutType: .applicationMenu) && preferences.showShortcutInApplicationMenu | ||
| } | ||
|
|
||
| var shouldDisplayToolbarShortcut: Bool { | ||
| return isFeatureEnabledFor(shortcutType: .toolbar) && preferences.showShortcutInToolbar | ||
| } | ||
|
|
||
| var shortcutURL: URL { | ||
| URL(string: "https://duckduckgo.com/?q=DuckDuckGo+AI+Chat&ia=chat&duckai=2")! | ||
| } | ||
|
|
||
| init(preferences: AIChatPreferences = .shared) { | ||
| self.preferences = preferences | ||
| subscribeToValueChanges() | ||
| } | ||
|
|
||
| // MARK: - Private | ||
|
|
||
| private func subscribeToValueChanges() { | ||
| preferences.$showShortcutInToolbar | ||
| .merge(with: preferences.$showShortcutInApplicationMenu) | ||
| .dropFirst() | ||
| .sink { [weak self] _ in | ||
| self?.valuesChangedPublisher.send(()) | ||
| } | ||
| .store(in: &cancellables) | ||
| } | ||
|
|
||
| private func isFeatureEnabledFor(shortcutType: ShortcutType) -> Bool { | ||
| switch shortcutType { | ||
| case .applicationMenu: | ||
| return true | ||
| case .toolbar: | ||
| return true | ||
| } | ||
| } | ||
| } |
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,23 @@ | ||
| // | ||
| // AIChatTabOpener.swift | ||
| // | ||
| // 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. | ||
| // | ||
|
|
||
| struct AIChatTabOpener { | ||
| @MainActor static func openAIChatTab() { | ||
| WindowControllersManager.shared.showTab(with: .url(AIChatMenuConfiguration().shortcutURL, credential: nil, source: .ui)) | ||
| } | ||
| } |
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
Binary file not shown.
15 changes: 15 additions & 0 deletions
15
DuckDuckGo/Assets.xcassets/Images/AIChat.imageset/Contents.json
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,15 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "AIChat.pdf", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| }, | ||
| "properties" : { | ||
| "template-rendering-intent" : "template" | ||
| } | ||
| } |
Binary file added
BIN
+3.88 KB
DuckDuckGo/Assets.xcassets/Images/AiChatPreferences.imageset/AiChatPreferences.pdf
Binary file not shown.
12 changes: 12 additions & 0 deletions
12
DuckDuckGo/Assets.xcassets/Images/AiChatPreferences.imageset/Contents.json
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,12 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "AiChatPreferences.pdf", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
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
Large diffs are not rendered by default.
Oops, something went wrong.
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.