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 1686 grid margins go off screen #1687

Merged
merged 5 commits into from May 14, 2024

Conversation

SergioEstevao
Copy link
Contributor

Fixes #1686

This PR updates the search bar code and mini-player code to ensure it does not change any existing horizontal insets when updating the insets.

To test

  • Start the app
  • On podcasts view pull to refresh, and while the pull to refresh is ongoing pull to refresh again.
  • Check that the horizontal margins on the grid layout are kept
  • Start the playing any podcast to see the mini-player
  • Check if you have a bottom margin at the end of scroll the podcasts view
  • Tap on the mini-player artwork and choose Close and Clear Up Next
  • Check that the bottom at the end of the scroll is still there and horizontal margins are kept

Checklist

  • I have considered if this change warrants user-facing release notes and have added them to CHANGELOG.md if necessary.
  • I have considered adding unit tests for my changes.
  • I have updated (or requested that someone edit) the spreadsheet to reflect any new or changed analytics.

@SergioEstevao SergioEstevao added Bug Something isn't working Podcast grid layout labels May 2, 2024
@SergioEstevao SergioEstevao added this to the 7.63 ❄️ milestone May 2, 2024
@SergioEstevao SergioEstevao requested a review from a team as a code owner May 2, 2024 09:49
@SergioEstevao SergioEstevao requested review from leandroalonso and removed request for a team May 2, 2024 09:49
@dangermattic
Copy link
Collaborator

dangermattic commented May 2, 2024

1 Warning
⚠️ This PR is assigned to the milestone 7.63. The due date for this milestone has already passed.
Please assign it to a milestone with a later deadline or check whether the release for this milestone has already been finished.

Generated by 🚫 Danger

@leandroalonso leandroalonso force-pushed the release/7.63 branch 2 times, most recently from e2685b7 to 4c7c755 Compare May 2, 2024 14:12
@leandroalonso leandroalonso changed the base branch from release/7.63 to release/7.63-backup May 2, 2024 14:49
Copy link
Member

@leandroalonso leandroalonso left a comment

Choose a reason for hiding this comment

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

This needs to target trunk.

@SergioEstevao SergioEstevao changed the base branch from release/7.63-backup to trunk May 10, 2024 18:08
Copy link
Member

@leandroalonso leandroalonso left a comment

Choose a reason for hiding this comment

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

@SergioEstevao I don't believe trunk has the grid changes applied. We probably need to re-add them, merge them first, and then update this PR.

Edit: or maybe we could use this one? Anyways, there's some merge conflict.

@SergioEstevao
Copy link
Contributor Author

I will pull the other one before, because this fix only makes sense when you have horizontal margins to test.

@SergioEstevao
Copy link
Contributor Author

@leandroalonso ready for another look now that we re-added the new grid layout to trunk.

@@ -26,7 +26,8 @@ class SceneHelper {
class func rootViewController() -> UIViewController? {
guard !FeatureFlag.newPlayerTransition.enabled else {
let appScene = connectedScene()?.windows.first(where: { $0.rootViewController is MainTabBarController })
return appScene?.rootViewController?.topMostPresentedViewController
let rootVC = appScene?.rootViewController
Copy link
Contributor Author

Choose a reason for hiding this comment

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

These changes were not part of this PR, This comes from another PR that is still not merged in trunk.

Copy link
Member

Choose a reason for hiding this comment

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

Just a merge trunk missing. :)

Gone already.

@SergioEstevao SergioEstevao merged commit 1f41d7b into trunk May 14, 2024
4 checks passed
@SergioEstevao SergioEstevao deleted the fix_1686_grid_margins_go_off_screen branch May 14, 2024 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working Podcast grid layout
Projects
None yet
Development

Successfully merging this pull request may close these issues.

New grid layout spacing can go off-screen
4 participants