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] - 9. Edge Cases #3115

Merged
merged 69 commits into from
Jul 24, 2024
Merged

[Duckplayer] - 9. Edge Cases #3115

merged 69 commits into from
Jul 24, 2024

Conversation

afterxleep
Copy link
Collaborator

@afterxleep afterxleep commented Jul 22, 2024 •
edited by Bunn
Loading

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

Description:

⚠️ This PR requires a specific branch of CSS to work. Use pr-releases/pr-993
⚠️ Load a custom privacy config to enable DuckPlayer from: https://jsonblob.com/api/1253721903368888320

Steps to test this PR:

  • CI should be 🥬
  • Set DuckPlayer to "Enabled"
  • Search for Metallica using SERP and go to the "Videos" section
  • Tap on a Youtube Video and confirm it opens in DuckPlayer
  • Go back to search results and confirm you're taken back to the SERP
  • Open Youtube.com and search for Metallica
  • Tap on the first video (which is loaded via JS) and confirm it loads in Duckplayer
  • Go back, and confirm you're taken to the Youtube results Page
  • Scroll down and tap on another video (Loaded via URL) and confirm it loads in Duckplayer
  • Go back and confirm you're taken back to the Youtube page
  • Go to Google.com
  • Search for "Metallica", and the tap on the "Videos" section
  • Tap on a search result and confirm it opens in DuckPlayer
  • Go back, and confirm you're on Google again
  • Open another video from the results, and confirm it opens in DuckPlayer
  • Tap "Watch in Youtube" and confirm it opens in Youtube
  • Go back and open another video in DuckPlayer and relaunch the app with the video being displayed
  • Confirm the last video displayed opens in DuckPlayer

afterxleep added 30 commits July 4, 2024 15:08
@afterxleep
First batch of pixels
471a5eb
@afterxleep
Watch From SERP pixel
b4f5626
@afterxleep
Merge branch 'main' into daniel/duckplayer/5.pixels
3494df7
@afterxleep
Update package
70c739e
@afterxleep
Test fix
5dbb45a
@afterxleep
Fix lint issue
593d755
@afterxleep
Add first launch pixel
a8141ce
@afterxleep
Add Settings Pixels
29d5d3a
@afterxleep
Settings Pixels
16d3f98
@afterxleep
DuckPlayer from non-SERP
e462866
@afterxleep
duckPlayerViewFromYoutubeAutomatic
239c8c0
@afterxleep
Initial Setup Updates
f41a482
@afterxleep
Settings
310be79
@afterxleep
Split Overlay and Player Settings
d21ce8b
@afterxleep
Remove PiP Settings
7c59947
@afterxleep
Merge branch 'main' into daniel/duckplayer/6.init.updates
3c4eee0 
# Conflicts:
#	DuckDuckGo/DuckPlayer/YoutubeOverlayUserScript.swift
@afterxleep
Packages
a47c7be
@afterxleep
Handle Watch in Youtube Action
ff9e04f
@afterxleep
Handle DuckPlayer internal links
24441f5
@afterxleep
Reset DuckPlayer on launch
169d60d
@afterxleep
Merge branch 'main' into daniel/duckplayer/6.init.updates
81e29d4 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/AppDelegate.swift
@afterxleep
Fix Watch in DP button
c20c430
@afterxleep
Remove uneeded code
a3748bf
@afterxleep
Open Settings and OpenInfo Mesasges
fa616f4
@afterxleep
Open DuckPlayer Settings
489fd5e
@afterxleep
Pass tabID to navigation handler
69c5276
@afterxleep
Move DuckPlayer one level up to TabManager
1fccdac
@afterxleep
Fix Watch in Youtube Action
62671f5
@afterxleep
Move completion handlers out of navigation
5e48897
@afterxleep
Updated DuckHandler Tests
b06cdff
afterxleep added 20 commits July 19, 2024 16:58
@afterxleep
Merge branch 'daniel/duckplayer/6.init.updates' into daniel/duckplaye…
563f75a 
…r/7.settings

# Conflicts:
#	DuckDuckGo/TabViewController.swift
@afterxleep
Merge branch 'daniel/duckplayer/7.settings' into daniel/duckplayer/8.…
e263ce8 
…age.restricted.videos
@afterxleep
Link duckPlayer host onAppear
c106f3b
@afterxleep
Tests are now passing
011d6c2
@afterxleep
Remove / from path
872138e
@afterxleep
Merge branch 'daniel/duckplayer/6.init.updates' into daniel/duckplaye…
6963279 
…r/7.settings
@afterxleep
Merge branch 'daniel/duckplayer/7.settings' into daniel/duckplayer/8.…
da5d000 
…age.restricted.videos
@afterxleep
Merge branch 'main' into daniel/duckplayer/8.age.restricted.videos
9571a5b 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/DuckPlayer/DuckPlayer.swift
#	DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift
#	DuckDuckGo/DuckPlayer/YoutubePlayerUserScript.swift
@afterxleep
Remove C.S.S direct import
b5416a7
@afterxleep
Merge branch 'main' into daniel/duckplayer/8.age.restricted.videos
02b7d8d
@afterxleep
Updated Navigation
131e04c
@afterxleep
Remove C.S.S reference
dbb2ade
@afterxleep
Implement Attach handler
387b39d
@afterxleep
Remove C.S.S
68fcbb7
@afterxleep
Test Updates
9a8e680
@afterxleep
Improved Tests
3d22f66
@afterxleep
Stop Loading when you hit reload
ef48ebf
@afterxleep
Merge branch 'main' into daniel/duckplayer/9.navigation.updates
476cb69 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift
@afterxleep
Remove C.S.S
a203c06
@afterxleep
Lint fix
bb4d28a
@afterxleep afterxleep requested a review from Bunn July 22, 2024 15:09
@duckduckgo duckduckgo deleted a comment from github-actions bot Jul 22, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jul 22, 2024 •
edited
Loading

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

Generated by 🚫 dangerJS against e46f6f1

@afterxleep
Merge branch 'main' into daniel/duckplayer/9.navigation.updates
e46f6f1 
# Conflicts:
#	DuckDuckGo/TabViewController.swift
@afterxleep afterxleep merged commit e0695c5 into main Jul 24, 2024
14 checks passed
@afterxleep afterxleep deleted the daniel/duckplayer/9.navigation.updates branch July 24, 2024 17:02
samsymons added a commit that referenced this pull request Jul 24, 2024
@samsymons
Merge branch 'main' into sam/ios-14-cleanup
e497ecb 
# By Daniel Bernal (6) and others
# Via Chris Brind (3) and others
* main: (24 commits)
  [DuckPlayer] 10 . Move DuckPlayer init to TabManager (#3124)
  Fix threading issue with Mesage broker (#3132)
  [Duckplayer] - 9. Edge Cases (#3115)
  Release 7.130.0-2 (#3134)
  Internal update for: fix index out-of-bounds in startAttachingCrashLogMessages (#3123) (#3128)
  Attach params to PPro pixels (#3092)
  Don't show key icon for empty passwords (#3070)
  Release 7.129.1-0 (#3127)
  fix index out-of-bounds in startAttachingCrashLogMessages (#3123)
  Release 7.130.0-1 (#3122)
  Revert old Dax icon for old onboarding (#3085)
  Scroll to Internal User setting (#3114)
  Release 7.130.0-0 (#3118)
  Allow activating subscription for internal users via debug menu (#3117)
  Update breakage report locale to JSON format (#3112)
  [Duckplayer] 8. Age restricted videos (#3111)
  Reduce VPN manager instances (#3097)
  Update BSK for Mac RMF changes (#3107)
  [DuckPlayer] 7- Open Settings (#3110)
  [DuckPlayer] 6 - Init updates and Watch on YouTube (#3066)
  ...

# Conflicts:
#	DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift
samsymons added a commit that referenced this pull request Jul 25, 2024
@samsymons
Merge branch 'main' into sam/vpn-snooze-initial-support
19b9362 
# By Daniel Bernal (4) and others
# Via Chris Brind (3) and others
* main:
  [DuckPlayer] 10 . Move DuckPlayer init to TabManager (#3124)
  Fix threading issue with Mesage broker (#3132)
  [Duckplayer] - 9. Edge Cases (#3115)
  Release 7.130.0-2 (#3134)
  Internal update for: fix index out-of-bounds in startAttachingCrashLogMessages (#3123) (#3128)
  Attach params to PPro pixels (#3092)
  Don't show key icon for empty passwords (#3070)
  Release 7.129.1-0 (#3127)
  fix index out-of-bounds in startAttachingCrashLogMessages (#3123)
  Release 7.130.0-1 (#3122)
  Revert old Dax icon for old onboarding (#3085)
  Scroll to Internal User setting (#3114)
  Release 7.130.0-0 (#3118)
  Allow activating subscription for internal users via debug menu (#3117)
  Update breakage report locale to JSON format (#3112)
  [Duckplayer] 8. Age restricted videos (#3111)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
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.
2 participants
@afterxleep @Bunn