-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into graeme/partial-form-save
- Loading branch information
Showing
85 changed files
with
1,548 additions
and
1,019 deletions.
There are no files selected for viewing
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
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
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
67 changes: 67 additions & 0 deletions
67
DuckDuckGo/NewTabPage/ActiveRemoteMessageModel+NewTabPage.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,67 @@ | ||
| // | ||
| // ActiveRemoteMessageModel+NewTabPage.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 | ||
| import NewTabPage | ||
| import RemoteMessaging | ||
|
|
||
| extension ActiveRemoteMessageModel: NewTabPageActiveRemoteMessageProviding { | ||
| var remoteMessagePublisher: AnyPublisher<RemoteMessageModel?, Never> { | ||
| $remoteMessage.dropFirst().eraseToAnyPublisher() | ||
| } | ||
|
|
||
| func isMessageSupported(_ message: RemoteMessageModel) -> Bool { | ||
| return message.content?.isSupported == true | ||
| } | ||
|
|
||
| func handleAction(_ action: RemoteAction?, andDismissUsing button: RemoteMessageButton) async { | ||
| if let action { | ||
| await handleAction(action) | ||
| } | ||
| await dismissRemoteMessage(with: .init(button)) | ||
| } | ||
|
|
||
| private func handleAction(_ remoteAction: RemoteAction) async { | ||
| switch remoteAction { | ||
| case .url(let value), .share(let value, _), .survey(let value): | ||
| if let url = URL.makeURL(from: value) { | ||
| await openURLHandler(url) | ||
| } | ||
| case .appStore: | ||
| await openURLHandler(.appStore) | ||
| default: | ||
| break | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension RemoteMessageViewModel.ButtonAction { | ||
|
|
||
| init(_ button: RemoteMessageButton) { | ||
| switch button { | ||
| case .close: | ||
| self = .close | ||
| case .action: | ||
| self = .action | ||
| case .primaryAction: | ||
| self = .primaryAction | ||
| case .secondaryAction: | ||
| self = .secondaryAction | ||
| } | ||
| } | ||
| } |
48 changes: 48 additions & 0 deletions
48
DuckDuckGo/NewTabPage/AppearancePreferences+NewTabPage.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,48 @@ | ||
| // | ||
| // AppearancePreferences+NewTabPage.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 | ||
| import NewTabPage | ||
|
|
||
| extension AppearancePreferences: NewTabPageSectionsVisibilityProviding { | ||
| var isFavoritesVisible: Bool { | ||
| get { | ||
| isFavoriteVisible | ||
| } | ||
| set { | ||
| isFavoriteVisible = newValue | ||
| } | ||
| } | ||
|
|
||
| var isPrivacyStatsVisible: Bool { | ||
| get { | ||
| isRecentActivityVisible | ||
| } | ||
| set { | ||
| isRecentActivityVisible = newValue | ||
| } | ||
| } | ||
|
|
||
| var isFavoritesVisiblePublisher: AnyPublisher<Bool, Never> { | ||
| $isFavoriteVisible.dropFirst().removeDuplicates().eraseToAnyPublisher() | ||
| } | ||
|
|
||
| var isPrivacyStatsVisiblePublisher: AnyPublisher<Bool, Never> { | ||
| $isRecentActivityVisible.dropFirst().removeDuplicates().eraseToAnyPublisher() | ||
| } | ||
| } |
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.