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.

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

[DuckPlayer] - 2. Overlay Views #2989

Merged
merged 43 commits into from
Jun 26, 2024
Merged

[DuckPlayer] - 2. Overlay Views #2989

merged 43 commits into from
Jun 26, 2024

Conversation

afterxleep
Copy link
Collaborator

@afterxleep afterxleep commented Jun 25, 2024

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

Description:

  • Implements Overlay Script for iOS
  • Allows user to see video inline or open Duck Player
  • Cleans up UserScripts (messaging) to match with what we do in other places on iOS (like subscriptions)

ℹ️ Known issue: The FE is sometimes starting navigation instead of pushing a WKMessage, which causes you to have double tap the "Watch in DuckPlayer" button sometimes. This is reported and should be fixed as part of the FE work

Steps to test this PR:

⚠️ 0. Update privacy config in Debug to use: https://jsonblob.com/1253721903368888320 and restart the app

  1. Go to Settings > Duck Player, and Select "Ask every time"
  2. Open a New tab and go to Youtube.com
  3. Tap on a video
  4. Confirm the Overlay shows on top of the video
  5. Tap Watch here, and confirm video starts playing
  6. Refresh the page
  7. Tap Watch in Duck Player and confirm video plays in DP
  8. Hit the back button
  9. Confirm you're taken to the video page (not the youtube page)

# Conflicts:
#	Core/UserDefaultsPropertyWrapper.swift
#	DuckDuckGo/AppSettings.swift
#	DuckDuckGo/AppUserDefaults.swift
#	DuckDuckGo/DuckPlayer/DuckPlayer.swift
#	DuckDuckGo/DuckPlayer/YoutubeOverlayUserScript.swift
#	DuckDuckGo/DuckPlayer/YoutubePlayerUserScript.swift
#	DuckDuckGo/TabViewController.swift
#	DuckDuckGo/UserScripts.swift
#	DuckDuckGo/UserText.swift
#	DuckDuckGo/en.lproj/Localizable.strings
#	DuckDuckGoTests/AppSettingsMock.swift
@afterxleep afterxleep marked this pull request as ready for review June 25, 2024 14:43
@afterxleep afterxleep requested a review from Bunn June 25, 2024 14:56
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. I've seen some issues I'll describe bellow, but not sure if it's part of this PR to solve them so I'm approving and letting you decide.

1. Bad text wrapping.
I believe this is expected since we're using the macOS page. But worth mentioning
Screenshot 2024-06-26 at 11 29 23

2. Issue reloading
When reloading a video from duck player, instead of opening duck player again, it goes to the no-cookies URL

Simulator Screen Recording - iPhone 15 Pro - 2024-06-26 at 11 30 05

@afterxleep
Copy link
Collaborator Author

@Bunn Yes, both issues reported are expected. First is macOS UI related, correct. Second will be fixed by next PR (which takes care of the URL management).

@afterxleep afterxleep merged commit 35cbaa3 into main Jun 26, 2024
14 checks passed
@afterxleep afterxleep deleted the daniel/duckplayer/2.overlay branch June 26, 2024 12:40
samsymons added a commit that referenced this pull request Jun 27, 2024
…ess-token

# By Christopher Brind (3) and others
# Via Chris Brind (1) and GitHub (1)
* main:
  Update VPN metadata to include entitlement (#3002)
  Remove noise from wake pixel (#2986)
  Release 7.126.0-1 (#2998)
  [DuckPlayer] - 2. Overlay Views (#2989)
  update translations for autocomplete settings changes (#2995)
  Fixes goBack() behavior (#2996)
  Re-add the autocomplete settings toggle pixels (#2991)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons added a commit that referenced this pull request Jul 4, 2024
* main:
  Update VPN metadata to include entitlement (#3002)
  Remove noise from wake pixel (#2986)
  Release 7.126.0-1 (#2998)
  [DuckPlayer] - 2. Overlay Views (#2989)
  update translations for autocomplete settings changes (#2995)
  Fixes goBack() behavior (#2996)
  Re-add the autocomplete settings toggle pixels (#2991)
  Update BSK with autofill 12.0.1 (#2983)
  Final batch of new autofill pixels (#2977)
  don't attach a new home screen if autoclear is in progress (#2988)
  Custom DNS for VPN (#2971)
  Duck Player settings page (#2990)
  Add feature flag for improved New Tab Page  (#2980)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants