-
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 branch 'main' into sam/fix-vpn-app-store-agent-compilation
# By Dominik Kapusta (16) and others # Via Dominik Kapusta (2) and others * main: (67 commits) Increase polling interval for captcha solver (#2071) Add a link to help page in location permission popup (#2017) Add bookmark popover in SwiftUI (#2036) Better detection of AMP pages (#2001) UI adjustments for improved VPN user control (#2043) Don't override drop operation if source view is webView (#2058) Bump version to 1.71.0 (104) Set marketing version to 1.71.0 Update embedded files VPN Geoswitching - look and feel tweaks + Pixels (#2045) fix Bookmarks Manager empty state constraint (#2034) Add Folder modal in SwiftUI (#2033) Fix serverlocation in connection notification (#2053) Use GRDB.swift 2.23.0 (upstream 6.32.0, SQLCipher 4.5.5) (#2021) Bump version to 1.70.0 (103) Update embedded files macOS: Fix issue with not being able to add favorites for existing bookmarks in the latest 1.70.0 internal (#2059) Bump version to 1.70.0 (102) Update embedded files Remove observer from DataBrokerProtectionViewController (#2057) ... # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # LocalPackages/BuildToolPlugins/Plugins/InputFilesChecker/InputFilesChecker.swift
- Loading branch information
Showing
179 changed files
with
6,601 additions
and
4,595 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 @@ | ||
| 15.0 | ||
| 15.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
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| CURRENT_PROJECT_VERSION = 97 | ||
| CURRENT_PROJECT_VERSION = 104 |
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| MARKETING_VERSION = 1.69.0 | ||
| MARKETING_VERSION = 1.71.0 |
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
38 changes: 38 additions & 0 deletions
38
DuckDuckGo/Assets.xcassets/Colors/InfoBannerColour.colorset/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,38 @@ | ||
| { | ||
| "colors" : [ | ||
| { | ||
| "color" : { | ||
| "color-space" : "srgb", | ||
| "components" : { | ||
| "alpha" : "0.500", | ||
| "blue" : "0xFF", | ||
| "green" : "0xDA", | ||
| "red" : "0xCC" | ||
| } | ||
| }, | ||
| "idiom" : "universal" | ||
| }, | ||
| { | ||
| "appearances" : [ | ||
| { | ||
| "appearance" : "luminosity", | ||
| "value" : "dark" | ||
| } | ||
| ], | ||
| "color" : { | ||
| "color-space" : "srgb", | ||
| "components" : { | ||
| "alpha" : "0.500", | ||
| "blue" : "0x69", | ||
| "green" : "0x39", | ||
| "red" : "0x24" | ||
| } | ||
| }, | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
DuckDuckGo/Assets.xcassets/Images/Location-16-Solid.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" : "Location-16-Solid.pdf", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| }, | ||
| "properties" : { | ||
| "template-rendering-intent" : "template" | ||
| } | ||
| } |
Binary file added
BIN
+2.44 KB
DuckDuckGo/Assets.xcassets/Images/Location-16-Solid.imageset/Location-16-Solid.pdf
Binary file not shown.
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,32 @@ | ||
| // | ||
| // WebsiteInfo.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 Foundation | ||
|
|
||
| struct WebsiteInfo { | ||
| let url: URL | ||
| let title: String? | ||
|
|
||
| init?(_ tab: Tab) { | ||
| guard case let .url(url, _, _) = tab.content else { | ||
| return nil | ||
| } | ||
| self.url = url | ||
| self.title = tab.title | ||
| } | ||
| } |
67 changes: 67 additions & 0 deletions
67
DuckDuckGo/Bookmarks/View/AddBookmarkFolderModalView.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 @@ | ||
| // | ||
| // AddBookmarkFolderModalView.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 SwiftUI | ||
|
|
||
| struct AddBookmarkFolderModalView: ModalView { | ||
|
|
||
| @State var model: AddBookmarkFolderModalViewModel = .init() | ||
| @Environment(\.dismiss) private var dismiss | ||
|
|
||
| var body: some View { | ||
| VStack(alignment: .leading, spacing: 16) { | ||
| Text(model.title) | ||
| .fontWeight(.semibold) | ||
|
|
||
| HStack(spacing: 16) { | ||
| Text(UserText.newBookmarkDialogBookmarkNameTitle) | ||
| .frame(height: 22) | ||
|
|
||
| TextField("", text: $model.folderName) | ||
| .accessibilityIdentifier("Title Text Field") | ||
| .textFieldStyle(.roundedBorder) | ||
| .disableAutocorrection(true) | ||
| } | ||
| .padding(.bottom, 4) | ||
|
|
||
| HStack { | ||
| Spacer() | ||
|
|
||
| Button(UserText.cancel) { | ||
| model.cancel(dismiss: dismiss.callAsFunction) | ||
| } | ||
| .keyboardShortcut(.cancelAction) | ||
|
|
||
| Button(model.addButtonTitle) { | ||
| model.addFolder(dismiss: dismiss.callAsFunction) | ||
| } | ||
| .keyboardShortcut(.defaultAction) | ||
| .disabled(model.isAddButtonDisabled) | ||
|
|
||
| } | ||
| } | ||
| .font(.system(size: 13)) | ||
| .padding() | ||
| .frame(width: 450, height: 131) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| #Preview { | ||
| AddBookmarkFolderModalView() | ||
| } |
Oops, something went wrong.