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

[DuckPlayer] - 3. URL management & FE comms #3007

Merged
merged 60 commits into from
Jul 1, 2024
Merged

[DuckPlayer] - 3. URL management & FE comms #3007

merged 60 commits into from
Jul 1, 2024

Conversation

afterxleep
Copy link
Collaborator

@afterxleep afterxleep commented Jun 27, 2024 •
edited by Bunn
Loading

Task/Issue URL: https://app.asana.com/0/1204099484721401/1207658406526197/f

Description:

  • Introduces a custom OmniBar icon to be used on specific cases (Youtube videos in this case)
  • Updates the URL to properly display duck:// addresses when DP is enabled
  • Listen to AppSettings changes for DuckPlayer via NotificationCenter and pass them down to DuckPlayer and the UserScripts > FrontEnd via Combine
  • Handle reloads when visiting a DuckPlayer page.
  • Renames methods in DuckNavigationHandling for clarity
  • @MainActorize all WebView navigation events
  • Updated tests

Steps to test this PR:

  • Disable Duck Player and confirm Youtube.com works as expected
  1. Install custom privacy config from https://jsonblob.com/api/1253721903368888320
  2. Go to Settings and switch DuckPlayer to 'Ask mode'
  3. Go to a Youtube Video, and confirm the overlay shows up.
  4. Tap Watch in Duck Player (Might need to tap twice quickly due to an FE bug)
  • Confirm video loads in DuckPlayer.
  1. Go back
  • Tap Watch here, and confirm video loads in DuckPlayer.
  1. Go to DuckPlayer settings and enable 'Always' mode
  2. Open a video or reload a video page if you have it open
  • Confirm video loads in Duck Player
  1. While watching a video in Duck player, Hit 'reload'
  • Confirm that the video still shows in Duck Player
  • Confirm you see the DuckPlayer icon in the URL bar when a video is playing in DP
  • Confirm the URL says "Duck Player"
  • Click the URL bar to select the text
  • Confirm the text turns to a valid duck:// URL
  1. Enable Settings > Appearance > Show Full Site Address
  • Go back to DuckPlayer and confirm the URL is now the full duck:// address

@afterxleep
Initial setup
6dda3ca
@afterxleep
Local CSS
6df193c
@afterxleep
Update BSK and DuckPlayer from macOS
014e363
@afterxleep
Merge branch 'main' into daniel/duckplayer.poc
261aba6 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@afterxleep
Basic Functionality (Enabled for all)
dbb141e
@afterxleep
PoC
447237b
@afterxleep
Settings POC
15fed16
@afterxleep
Updated icon
54c1e60
@afterxleep
Handler Updates
769eacb
@afterxleep
Updated handler calls
dc4a87b
@afterxleep
Draft Tests
03e724b
@afterxleep
Write some tests
5c8fc4a
@afterxleep
Cleanup
5ecf517
@afterxleep
Fix indentation
13b8261
@afterxleep
Remove unneded isTest
84306db
@afterxleep
Remove unwanted conditionals
16fe144
@afterxleep
Cleanup TabViewcontroller changes
6da4f5f
@afterxleep
Validate youtube URLs
5e24c03
@afterxleep
TabViewController cleanup
b90194f
@afterxleep
Remove subscriptionFlow addition
e2db561
@afterxleep
Duck Player Test Placeholder
b4331de
@afterxleep
Remove local CSS reference
9cdbe32
@afterxleep
Update package.resolved
a0ee770
@afterxleep
Merge branch 'main' into daniel/duckplayer/1.base.implementation
1963364 
# Conflicts:
#	Core/UserDefaultsPropertyWrapper.swift
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/SettingsViewModel.swift
@afterxleep
Lint fixes
5b94ae5
@afterxleep
Remove noisy comments
1328040
@afterxleep
Fix indentation
9c2155c
@afterxleep
Clean up comments and nois
11c8ae4
@afterxleep
Abstract Settings, use dependency injection (not singletons)
8d44664
@afterxleep
Added static strings
12f9f01
@github-actions github-actions bot added the bot: not in app board Added by automation for pull requests with tasks not added to iOS App Board Asana project label Jun 27, 2024
@afterxleep afterxleep marked this pull request as ready for review June 28, 2024 16:15
@afterxleep afterxleep removed the bot: not in app board Added by automation for pull requests with tasks not added to iOS App Board Asana project label Jun 28, 2024
@github-actions github-actions bot added the bot: not in app board Added by automation for pull requests with tasks not added to iOS App Board Asana project label Jun 28, 2024
@github-actions github-actions bot removed the bot: not in app board Added by automation for pull requests with tasks not added to iOS App Board Asana project label Jun 28, 2024
@afterxleep afterxleep requested a review from Bunn June 28, 2024 16:32
@Bunn
Copy link
Contributor

Bunn commented Jul 1, 2024

1 _ Tap Watch here, and confirm video loads in DuckPlayer._

  • I believe you meant "without" Duck Player, right?

2 Confirm you see the DuckPlayer icon in the URL bar when a video is playing in DP

  • This doesn't seem to be working:
image

Bunn
Bunn approved these changes Jul 1, 2024
View reviewed changes
Copy link
Contributor

@Bunn Bunn left a comment

Choose a reason for hiding this comment

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

LGTM, besides the issues I mentioned previously.

@afterxleep afterxleep merged commit fd7f201 into main Jul 1, 2024
62 checks passed
@afterxleep afterxleep deleted the daniel/duckplayer/3.url branch July 1, 2024 17:22
samsymons added a commit that referenced this pull request Jul 1, 2024
@samsymons
Merge branch 'main' into sam/increase-deployment-target-to-ios-15
d304e8d 
* main:
  Fire a pixel when removing the VPN configuration (#3014)
  Release 7.127.0-0 (#3020)
  point to BSK branch (#3016)
  [DuckPlayer] - 3. URL management & FE comms (#3007)
  Bump BSK version (#3011)
  New Tab Page layout and base elements (#3008)
  Remove Privacy Pro from device once expired account is deleted (#3009)
  Improvements to subscription settings (#2959)
  Toggle reports limiter (#3005)
  Duck Player info Modal (#3006)
  Silence tunnel startup noise with no access token available (#2993)
  In case Pending Deletion flag is nil, populate it with 'false' value (#2997)
  VPN uninstall not stopping agent in App Store build (#2999)
  Update VPN metadata to include entitlement (#3002)
samsymons added a commit that referenced this pull request Jul 4, 2024
@samsymons
Merge branch 'main' into sam/vpn-snooze-initial-support
5ff8d1e 
* main: (24 commits)
  Add pixels to measure baseline for New Tab Page sections (#3024)
  backgrounding UI tests (#3021)
  improve bookmarks and favorites UI tests (#3019)
  [DuckPlayer] - 4. Remote Config (#3018)
  Updates BSK
  Fix issue when cancelling a download (#3030)
  Tentative fix for a crash and connectivity issues (#3027)
  autofill UI tests (#3012)
  scripts for running UI tests (#3000)
  Integrate RemoteMessaging with NewTabPage (#3017)
  Update to iOS 15 deployment target (#3001)
  Fire a pixel when removing the VPN configuration (#3014)
  Release 7.127.0-0 (#3020)
  point to BSK branch (#3016)
  [DuckPlayer] - 3. URL management & FE comms (#3007)
  Bump BSK version (#3011)
  New Tab Page layout and base elements (#3008)
  Remove Privacy Pro from device once expired account is deleted (#3009)
  Improvements to subscription settings (#2959)
  Toggle reports limiter (#3005)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Bunn Bunn Bunn approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@afterxleep @Bunn