Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Adds VPN Control Center widget and Siri Commands. #3414

Merged
merged 40 commits into from
Dec 20, 2024
Merged

Adds VPN Control Center widget and Siri Commands. #3414

merged 40 commits into from
Dec 20, 2024
+1,978 −299

Conversation

diegoreymendez
Copy link
Contributor

@diegoreymendez diegoreymendez commented Oct 6, 2024 •
edited
Loading

Task/Issue URL: https://app.asana.com/0/1203108348835387/1208485618883319/f

DRK PR: duckduckgo/DesignResourcesKit#9

Description

Adds a VPN control widget for the control center and lock screen.
Adds Siri commands to control the VPN with voice.

Testing

General

  1. Go to Settings > VPN > VPN Settings > Shortcuts section
  2. Read the education screens and follow their indications to validate them
  3. Test the new CC Widget and Siri commands as per instructions.

Control Center Widget

  1. Go to the control center dashboard
  2. Add a widget
  3. Search for "VPN", and you should see our widget to toggle the VPN on/off. Add it.
  4. You can resize the widget in the dashboard before saving.
  5. Turn the VPN on/off, make sure it works.
  6. Go to the lock screen, press on the background for a few seconds.
  7. Customize your lock screen.
  8. Remove one of the two circle-widgets in the bottom of the lock screen, and add the VPN one.
  9. Make sure it works well.

Definition of Done (Internal Only):

Copy Testing:

  • Use of correct apostrophes in new copy, ie ’ rather than '
Internal references:

Software Engineering Expectations
Technical Design Template

@diegoreymendez diegoreymendez self-assigned this Oct 6, 2024
@diegoreymendez diegoreymendez marked this pull request as draft October 6, 2024 15:43
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 3, 2024 •
edited
Loading

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.
Messages
📖

You seem to be updating localized strings. Make sure that you request translations and include translated strings before you ship your change. See Localization Guidelines for more information.

Generated by 🚫 dangerJS against 0f9a9ca

@diegoreymendez diegoreymendez mentioned this pull request Dec 18, 2024
Merged
2 tasks
@diegoreymendez diegoreymendez changed the title Adds a VPN control widget for the control center and lock screen Adds VPN Control Center widget and Siri Commands. Dec 18, 2024
diegoreymendez
diegoreymendez commented Dec 18, 2024
View reviewed changes
DuckDuckGo/Info.plist Outdated Show resolved Hide resolved
samsymons
samsymons reviewed Dec 20, 2024
View reviewed changes
DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved Outdated
"revision" : "ad133f76501edcb2bfa841e33aebc0da5f92bb5c",
"version" : "3.3.0"
"revision" : "ba2f7e26575a9529ce268ce16f01760187649ce6"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll want to swap this out with a tagged release before merging

samsymons
samsymons reviewed Dec 20, 2024
View reviewed changes
DuckDuckGo/VPNAutoShortcuts.swift
static var appShortcuts: [AppShortcut] {
AppShortcut(intent: EnableVPNIntent(),
phrases: [
"Connect \(.applicationName) VPN",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How should localization be handled for Siri Shortcuts?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't exactly trivial so I'm opening a follow-up task to look into this.

samsymons
samsymons approved these changes Dec 20, 2024
View reviewed changes
Copy link
Contributor

@samsymons samsymons left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after the recent changes, with the acknowledgement that we'll revisit in the new year to sort out localization. But, since this change is gated behind a DEBUG || ALPHA check, it's fine to merge. Thanks!

@diegoreymendez diegoreymendez merged commit 805a41e into main Dec 20, 2024
13 checks passed
@diegoreymendez diegoreymendez deleted the diego/vpn-control-widget branch December 20, 2024 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samsymons samsymons samsymons approved these changes

Assignees

@diegoreymendez diegoreymendez

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@diegoreymendez @samsymons