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] 7- Open Settings #3110

Merged
merged 49 commits into from
Jul 19, 2024
Merged

[DuckPlayer] 7- Open Settings #3110

merged 49 commits into from
Jul 19, 2024

Conversation

afterxleep
Copy link
Collaborator

@afterxleep afterxleep commented Jul 19, 2024

⚠️ Stacked PR on top of #3066

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

Description:

  • Tapping on the "Settings" button, open app settings in DuckPlayer
  • Tapping on the "Info" button, opens DuckPlayer info sheet

Steps to test this PR:

⚠️ This PR requires a specific branch of CSS to work. Drag a local version of content-scope-scripts package to the app, and point to branch: pr-releases/pr-993

  • Set DuckPlayer to 'always'
  • Open a video in DuckPlayer
  • Tap "Settings" and confirm App settings are open and it automatically navgates to DuckPlayer
  • Close Setings, and tap "info" button in DuckPlayer and confirm the DuckPlayer an info sheet is presented

@afterxleep afterxleep marked this pull request as ready for review July 19, 2024 10:22
@afterxleep afterxleep requested a review from Bunn July 19, 2024 10:23
# Conflicts:
#	DuckDuckGo/DuckPlayer/DuckPlayerNavigationHandler.swift
#	DuckDuckGo/TabViewController.swift
#	submodules/privacy-reference-tests
…r/7.settings

# Conflicts:
#	DuckDuckGo/TabViewController.swift
@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 Jul 19, 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 Jul 19, 2024
…ettings

# Conflicts:
#	DuckDuckGo/DuckPlayer/DuckPlayer.swift
#	DuckDuckGo/DuckPlayer/YoutubePlayerUserScript.swift
#	DuckDuckGoTests/DuckPlayerMocks.swift
@afterxleep afterxleep merged commit bc098bb into main Jul 19, 2024
14 checks passed
@afterxleep afterxleep deleted the daniel/duckplayer/7.settings branch July 19, 2024 16:37
samsymons added a commit that referenced this pull request Jul 19, 2024
# By Daniel Bernal (2) and others
# Via GitHub
* main:
  Update BSK for Mac RMF changes (#3107)
  [DuckPlayer] 7- Open Settings (#3110)
  [DuckPlayer] 6 - Init updates and Watch on YouTube (#3066)
  New Tab Page Shortcuts section (#3104)
  Fix VPN configuration removal to stop the tunnel (#3099)
  avoid resizing webview when keyboard shows/hides (#3094)
  Add support for skipping sending usage pixels for remote messages (#3106)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons added a commit that referenced this pull request Jul 19, 2024
# By Christopher Brind (9) and others
# Via Chris Brind (1) and GitHub (1)
* main: (48 commits)
  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)
  New Tab Page Shortcuts section (#3104)
  Fix VPN configuration removal to stop the tunnel (#3099)
  avoid resizing webview when keyboard shows/hides (#3094)
  Add support for skipping sending usage pixels for remote messages (#3106)
  Bump submodules/privacy-reference-tests from `a242bf0` to `afb4f61` (#3096)
  Updates BSK to 171.2.3
  Remove print (#3101)
  Update Package.resolved file (#3102)
  New Tab Page favorites section (#3083)
  Properly compare actual value of the entitlement check (#3100)
  fix ui tests broken by new onboarding and use shared setup flow (#3081)
  AdHoc lane: Make proper assignment to variable (#3095)
  Expand AdHoc build workflow, add debug bookmarks screen (#3086)
  Update BSK to latest - for macOS fix to AdAttribution (#3084)
  Revert "Fix tests"
  Fix tests
  ...

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	DuckDuckGo/NetworkProtectionStatusViewModel.swift
samsymons added a commit that referenced this pull request Jul 24, 2024
# 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
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