Skip to content

Commit

Permalink
Merge branch 'main' into sam/update-vpn-waitlist-active-user-pixel
Browse files Browse the repository at this point in the history 
* main:
  Update Autofill Logins copy (#2246)
  Remove the reconnect/disconnect logic from the connection tester (#2272)
  Remove the Fastlane notes file temporarily (#2270)
  remove QR code from save recovery PDF view (#2271)
  • Loading branch information
@samsymons
samsymons committed Dec 15, 2023
2 parents 369ce97 + 2eb7baa commit d089076
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 84 deletions.
2 changes: 1 addition & 1 deletion DuckDuckGo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9166,7 +9166,7 @@
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 94.0.0;
version = 94.0.2;
};
};
C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
Expand Down
8 changes: 4 additions & 4 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit",
"state": {
"branch": null,
"revision": "e4f4ae624174c1398d345cfc387db38f8f69986d",
"version": "94.0.0"
"revision": "861b8a72930f138cd18b6a7722502a8a40375827",
"version": "94.0.2"
}
},
{
Expand Down Expand Up @@ -51,8 +51,8 @@
"repositoryURL": "https://github.com/duckduckgo/duckduckgo-autofill.git",
"state": {
"branch": null,
"revision": "dbecae0df07650a21b5632a92fa2e498c96af7b5",
"version": "10.0.1"
"revision": "5597bc17709c8acf454ecaad4f4082007986242a",
"version": "10.0.2"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/Base.lproj/Settings.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<rect key="frame" x="0.0" y="0.0" width="343.66666666666669" height="43.666667938232422"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Logins" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="And-cQ-SEu" userLabel="Autofill Logins">
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Passwords" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="And-cQ-SEu" userLabel="Autofill Logins">
<rect key="frame" x="20" y="0.0" width="315.66666666666669" height="43.666667938232422"/>
<autoresizingMask key="autoresizingMask"/>
<accessibility key="accessibilityConfiguration">
Expand Down
58 changes: 29 additions & 29 deletions DuckDuckGo/UserText.swift
View file

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions DuckDuckGo/en.lproj/Localizable.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"action.title.add" = "Add";

/* Autofill Logins menu item opening the login list */
"action.title.autofill.logins" = "Logins";
"action.title.autofill.logins" = "Passwords";

/* Confirmation of Add to Bookmarks action in Add All Open Tabs to Bookmarks alert */
"action.title.bookmark" = "Bookmark";
Expand Down Expand Up @@ -455,16 +455,16 @@
"autofill.keep-enabled.alert.message" = "You can disable this at any time in Settings.";

/* Title for alert when asking the user if they want to keep using autofill */
"autofill.keep-enabled.alert.title" = "Do you want to keep saving Logins?";
"autofill.keep-enabled.alert.title" = "Do you want to keep saving passwords?";

/* Button displayed after saving/updating an autofill login that takes the user to the saved login */
"autofill.login-save-action-button.toast" = "View";

/* Message displayed after saving an autofill login */
"autofill.login-saved.toast" = "Login saved";
"autofill.login-saved.toast" = "Password saved";

/* Message displayed after updating an autofill login */
"autofill.login-updated.toast" = "Login updated";
"autofill.login-updated.toast" = "Password updated";

/* Menu item text for copying autofill login details */
"autofill.logins.copy-prompt" = "Copy %@";
Expand All @@ -485,19 +485,19 @@
"autofill.logins.details.address" = "Website URL";

/* Title for autofill login details */
"autofill.logins.details.default-title" = "Login";
"autofill.logins.details.default-title" = "Password";

/* Delete button when deleting an autofill login */
"autofill.logins.details.delete" = "Delete Login";
"autofill.logins.details.delete" = "Delete Password";

/* Autofill alert button confirming delete autofill login */
"autofill.logins.details.delete-confirmation.button" = "Delete Login";
"autofill.logins.details.delete-confirmation.button" = "Delete Password";

/* Title of confirmation alert when deleting an autofill login */
"autofill.logins.details.delete-confirmation.title" = "Are you sure you want to delete this Login?";
"autofill.logins.details.delete-confirmation.title" = "Are you sure you want to delete this password?";

/* Title when editing autofill login details */
"autofill.logins.details.edit-title" = "Edit Login";
"autofill.logins.details.edit-title" = "Edit Password";

/* Placeholder for password field on autofill login details */
"autofill.logins.details.edit.password-placeholder" = "Password";
Expand All @@ -511,14 +511,14 @@
/* Placeholder for userbane field on autofill login details */
"autofill.logins.details.edit.username-placeholder" = "[email protected]";

/* Message displaying when the login was last updated by */
"autofill.logins.details.last-updated" = "Login last updated %@";
/* Message displaying when the login was last updated */
"autofill.logins.details.last-updated" = "Last updated %@";

/* Login name label for login details on autofill */
"autofill.logins.details.login-name" = "Login Title";
"autofill.logins.details.login-name" = "Title";

/* Title when adding new autofill login */
"autofill.logins.details.new-title" = "Add Login";
"autofill.logins.details.new-title" = "Add password";

/* Notes label for login details on autofill */
"autofill.logins.details.notes" = "Notes";
Expand All @@ -533,37 +533,37 @@
"autofill.logins.details.save-duplicate-alert.action" = "OK";

/* Message for alert when attempting to save a duplicate login */
"autofill.logins.details.save-duplicate-alert.message" = "You already have a login for this username and website.";
"autofill.logins.details.save-duplicate-alert.message" = "You already have a password saved for this username and website.";

/* Title for alert when attempting to save a duplicate login */
"autofill.logins.details.save-duplicate-alert.title" = "Duplicated Login";
"autofill.logins.details.save-duplicate-alert.title" = "Duplicate Password";

/* Username label for login details on autofill */
"autofill.logins.details.username" = "Username";

/* Subtitle for view displayed when autofill has no items */
"autofill.logins.empty-view.subtitle" = "Logins are stored securely on your device.";
"autofill.logins.empty-view.subtitle" = "Passwords are stored securely on your device.";

/* Title for view displayed when autofill has no items */
"autofill.logins.empty-view.title" = "No Logins saved yet";
"autofill.logins.empty-view.title" = "No passwords saved yet";

/* Cancel button for auth when opening login list */
"autofill.logins.list.auth.cancel" = "Cancel";

/* Reason for auth when opening login list */
"autofill.logins.list.auth.reason" = "Unlock device to access saved Logins";
"autofill.logins.list.auth.reason" = "Unlock device to access passwords";

/* Title for close navigation button */
"autofill.logins.list.close-title" = "Close";

/* Title for a toggle that enables autofill */
"autofill.logins.list.enable" = "Save and Autofill Logins";
"autofill.logins.list.enable" = "Save and autofill passwords";

/* Toast message when a login item is deleted */
"autofill.logins.list.login-deleted-message" = "Login for %@ deleted";
"autofill.logins.list.login-deleted-message" = "Password for %@ deleted";

/* Toast message when a login item without a title is deleted */
"autofill.logins.list.login-deleted-message-no-title" = "Login deleted";
"autofill.logins.list.login-deleted-message-no-title" = "Password deleted";

/* Title for a button that allows a user to reset their list of never saved sites */
"autofill.logins.list.never.saved" = "Reset Excluded Sites";
Expand All @@ -575,28 +575,28 @@
"autofill.logins.list.never.saved.reset.action.confirm" = "Reset Excluded Sites";

/* Alert title */
"autofill.logins.list.never.saved.reset.action.title" = "If you reset excluded sites, you will be prompted to save your Login next time you sign in to any of these sites.";
"autofill.logins.list.never.saved.reset.action.title" = "If you reset excluded sites, you will be prompted to save your password next time you sign in to any of these sites.";

/* Placeholder for search field on autofill login listing */
"autofill.logins.list.search-placeholder" = "Search Logins";
"autofill.logins.list.search-placeholder" = "Search passwords";

/* Section title for group of suggested saved logins */
"autofill.logins.list.suggested" = "Suggested";

/* Title for screen listing autofill logins */
"autofill.logins.list.title" = "Logins";
"autofill.logins.list.title" = "Passwords";

/* Title for view displayed when autofill is locked on devices where a passcode has not been set */
"autofill.logins.no-auth.subtitle" = "A passcode is required to protect your Logins.";
"autofill.logins.no-auth.subtitle" = "A passcode is required to protect your passwords.";

/* Title for view displayed when autofill is locked on devices where a passcode has not been set */
"autofill.logins.no-auth.title" = "Secure your device to save Logins";
"autofill.logins.no-auth.title" = "Secure your device to save passwords";

/* Cancel button for auth during login prompt */
"autofill.logins.prompt.auth.cancel" = "Cancel";

/* Reason for auth during login prompt */
"autofill.logins.prompt.auth.reason" = "Unlock To Use Saved Login";
"autofill.logins.prompt.auth.reason" = "Unlock to use saved password";

/* Title for section of autofill logins that are an exact match to the current website */
"autofill.logins.prompt.exact.match.title" = "From this website";
Expand All @@ -620,7 +620,7 @@
"autofill.logins.search.no-results.title" = "No Results";

/* Subtitle for prompt to use suggested strong password for creating a login */
"autofill.password-generation-prompt.subtitle" = "Passwords are stored securely on your device in the Logins menu.";
"autofill.password-generation-prompt.subtitle" = "Passwords are stored securely on your device.";

/* Title for prompt to use suggested strong password for creating a login */
"autofill.password-generation-prompt.title" = "Use a strong password from DuckDuckGo?";
Expand Down Expand Up @@ -665,7 +665,7 @@
"autofill.save-login.never-prompt.CTA" = "Never Ask for This Site";

/* Message displayed on modal asking for the user to save the login for the first time */
"autofill.save-login.new-user.message" = "Passwords are stored securely on your device in the Logins menu.";
"autofill.save-login.new-user.message" = "Passwords are stored securely on your device.";

/* Title displayed on modal asking for the user to save the login for the first time */
"autofill.save-login.new-user.title" = "Do you want DuckDuckGo to save your password?";
Expand All @@ -674,7 +674,7 @@
"autofill.save-login.not-now.CTA" = "Don’t Save";

/* Title displayed on modal asking for the user to save the login */
"autofill.save-login.title" = "Save Login?";
"autofill.save-login.title" = "Save Password?";

/* Confirm CTA displayed on modal asking for the user to save the password */
"autofill.save-password.save.CTA" = "Save Password";
Expand Down
28 changes: 12 additions & 16 deletions LocalPackages/SyncUI/Sources/SyncUI/Views/SaveRecoveryKeyView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,18 @@ public struct SaveRecoveryKeyView: View {

@ViewBuilder
func recoveryInfo() -> some View {
VStack(spacing: 26) {
HStack(spacing: 16) {
QRCodeView(string: model.key, size: 64)

Text(model.key)
.fontWeight(.light)
.lineSpacing(1.6)
.lineLimit(3)
.applyKerning(2)
.truncationMode(.tail)
.monospaceSystemFont(ofSize: 16)
.frame(maxWidth: .infinity)
}
codeButtons()
}
.padding(.top, 20)
VStack(spacing: 26) {
Text(model.key)
.fontWeight(.light)
.lineSpacing(1.6)
.lineLimit(3)
.applyKerning(2)
.truncationMode(.tail)
.monospaceSystemFont(ofSize: 16)
.frame(maxWidth: .infinity)
codeButtons()
}
.padding(.top, 20)
.padding(.horizontal, 20)
.padding(.bottom, 12)
.background(RoundedRectangle(cornerRadius: 10).foregroundColor(.black.opacity(0.03)))
Expand Down
3 changes: 0 additions & 3 deletions fastlane/metadata/review_information/notes.txt
View file

This file was deleted.

0 comments on commit d089076

Please sign in to comment.