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

Fix bookmarks toolbar behaviour with Sync Promo on iOS 15 #3313

Merged
merged 4 commits into from
Sep 4, 2024

Conversation

amddg44
Copy link
Contributor

@amddg44 amddg44 commented Sep 4, 2024

Task/Issue URL: https://app.asana.com/0/414709148257752/1208220515829639/f
Tech Design URL:
CC:

Description:
Fixes a SwiftUI issue which caused the toolbar to not appear correctly on the bookmarks screen

Steps to test this PR:
Note: The visibility of the Sync Promo can be reset from the debug screen (final row on that screen)

  1. Ensure Sync is disabled and at least 1 bookmark is saved
  2. Go the bookmarks screen and confirm the Sync Promo & the toolbar appear correctly
  3. Dismiss the promo and confirm the screen updates correctly
  4. Go to the Sync screen and toggle dark mode. Confirm the colour of the icon next to “Get DuckDuckGo on Other Devices” updates correctly

Definition of Done (Internal Only):

Orientation Testing:

  • Portrait
  • Landscape

Device Testing:

  • iPhone 14 Pro
  • iPad

OS Testing:

  • iOS 15
  • iOS 16
  • iOS 17

Theme Testing:

  • Light theme
  • Dark theme

Internal references:

Software Engineering Expectations
Technical Design Template

@amddg44 amddg44 changed the base branch from main to release/7.136.0 September 4, 2024 10:37
@@ -8,5 +8,8 @@
"info" : {
"author" : "xcode",
"version" : 1
},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I noticed while testing that this icon colour wasn’t updating with dark mode 🙂

@@ -920,9 +924,6 @@ class BookmarksViewController: UIViewController, UITableViewDelegate {
headerView.frame = CGRect(x: 0, y: 0, width: tableView.bounds.width, height: totalHeight)

tableView.tableHeaderView = headerView
syncPromoViewHostingController.didMove(toParent: self)

tableView.layoutIfNeeded()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed tableView.layoutIfNeeded() as it turned out to not be needed

@amddg44 amddg44 requested a review from dus7 September 4, 2024 10:44
Copy link
Contributor

@dus7 dus7 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 also started sync e2e test to verify it passes here, so let's wait for it to finish.

DuckDuckGo/BookmarksViewController.swift Outdated Show resolved Hide resolved
@amddg44 amddg44 merged commit a5c4738 into release/7.136.0 Sep 4, 2024
18 checks passed
@amddg44 amddg44 deleted the anya/fix-bookmarks-toolbar-ios15 branch September 4, 2024 14:40
samsymons added a commit that referenced this pull request Sep 5, 2024
…ibution-pixel

* release/7.136.0:
  Release 7.136.0-2 (#3320)
  Attempt to fix dissapearing privacy icon (#3317)
  Fix bookmarks toolbar behaviour with Sync Promo on iOS 15 (#3313)
samsymons added a commit that referenced this pull request Sep 9, 2024
# By Christopher Brind (4) and others
# Via Alessandro Boron (1) and others
* main: (27 commits)
  Bump C-S-S to 6.14.1 (#3331)
  DuckPlayer Launch Experiment for iOS (#3328)
  defer loading the tab switcher button until view did load (#3326)
  Release 7.136.0-3 (#3324)
  Release PR: Check for the negative attribution case (#3311)
  fix tab switcher crashes (speculative fix) (#3319)
  Onboarding highlights feature flag setup (#3308)
  Release 7.136.0-2 (#3320)
  Attempt to fix dissapearing privacy icon (#3317)
  Fix bookmarks toolbar behaviour with Sync Promo on iOS 15 (#3313)
  Bump BSK with C-S-S to 6.14.0 (#3314)
  ensure no atb or app version sent with pixel (#3315)
  Fix #3298: Add support for Xcode 16 (#3299)
  Fix Keychain Debug view controller segue (#3310)
  Release 7.136.0-1 (#3309)
  Fix an issue that causes the fire dialog to show multiple times for the same website after dismissing it (#3305)
  [DuckPlayer] 28. Open in Youtube -> Youtube App (#3290)
  usage segmentation (#3263)
  Fix wrong URL displayed for auth dialog (#3307)
  iOS Integration of BSK Onboarding (#3282)
  ...

# 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants