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 daita settings view on ios 15 #7465

Merged
merged 7 commits into from
Jan 17, 2025
Merged

Fix daita settings view on ios 15 #7465

merged 7 commits into from
Jan 17, 2025

Conversation

SteffenErn
Copy link
Contributor

@SteffenErn SteffenErn commented Jan 14, 2025

DAITA settings view was broken on iOS 15 devices due to SwiftUI List bug. This PR fixes the issue by using ScrollView instead.


This change is Reviewable

@SteffenErn SteffenErn requested review from pinkisemils and rablador and removed request for pinkisemils January 14, 2025 10:48
rablador
rablador previously approved these changes Jan 14, 2025
Copy link
Contributor

@rablador rablador left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@SteffenErn
Copy link
Contributor Author

This should now work on iOS 15, 16, 17 and 18. Large font should not truncate the text

@SteffenErn SteffenErn self-assigned this Jan 15, 2025
@SteffenErn SteffenErn added the iOS Issues related to iOS label Jan 15, 2025
buggmagnet
buggmagnet previously approved these changes Jan 15, 2025
Copy link
Contributor

@buggmagnet buggmagnet left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 1 of 2 files at r1, 1 of 1 files at r4, 1 of 1 files at r5, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Contributor

@rablador rablador left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @SteffenErn)


ios/MullvadVPN/Coordinators/Settings/Views/SettingsInfoView.swift line 31 at r5 (raw file):

        ZStack {
            // Renders (and hide) the content of each page, to push the view to the maximum possible size.
            VStack {

I think we should move this out to a separate function for clarity and less clutter, as it's not really part of the intended structure.

Copy link
Contributor

@rablador rablador left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r4, 1 of 1 files at r5, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @SteffenErn)

Copy link
Contributor Author

@SteffenErn SteffenErn left a comment

Choose a reason for hiding this comment

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

Agreed. I pushed a cleaner solution

Reviewable status: 2 of 3 files reviewed, 1 unresolved discussion (waiting on @buggmagnet and @rablador)

rablador
rablador previously approved these changes Jan 16, 2025
Copy link
Contributor

@rablador rablador left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 1 of 1 files at r6, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @SteffenErn)

@pinkisemils
Copy link
Collaborator

If you change the commit message to comply with the brutal conformism of the CI, I'll merge this :)

@SteffenErn SteffenErn force-pushed the fix-daita-view-on-ios15 branch 2 times, most recently from 47a873c to be2b477 Compare January 17, 2025 09:00
pinkisemils
pinkisemils previously approved these changes Jan 17, 2025
Copy link
Collaborator

@pinkisemils pinkisemils left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 2 files at r1, 1 of 1 files at r5, 1 of 1 files at r7, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @SteffenErn)

@pinkisemils pinkisemils force-pushed the fix-daita-view-on-ios15 branch from be2b477 to e753280 Compare January 17, 2025 11:42
@pinkisemils pinkisemils force-pushed the fix-daita-view-on-ios15 branch from e753280 to 3b7982f Compare January 17, 2025 11:50
@pinkisemils pinkisemils merged commit c89b219 into main Jan 17, 2025
12 of 13 checks passed
@pinkisemils pinkisemils deleted the fix-daita-view-on-ios15 branch January 17, 2025 11:51
Copy link

🚨 End to end tests failed. Please check the failed workflow run.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
iOS Issues related to iOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants