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

Position location marker on the map correctly ios 993 #7478

Merged

Conversation

buggmagnet
Copy link
Contributor

@buggmagnet buggmagnet commented Jan 17, 2025

This PR deletes the SwiftUI spinner view and retvrns to tradition by re-introducing SpinnerActivityIndicatorView into TunnelViewController.

Additionally, the map and spinner will be centered higher on the map so it doesn't get obscured by the newly introduced ConnectionView written in SwiftUI.
The spinner position varies slightly based on the available screen estate, typically, it will be positioned higher on devices with less than 700 pixels in height.


This change is Reviewable

@buggmagnet buggmagnet added the iOS Issues related to iOS label Jan 17, 2025
@buggmagnet buggmagnet self-assigned this Jan 17, 2025
Copy link

linear bot commented Jan 17, 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 5 of 5 files at r1, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @buggmagnet)


ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift line 227 at r1 (raw file):

    }

    private func addContentView() {

This func should probably be called addConnectionView and the spinner be added in separate function.

@buggmagnet buggmagnet force-pushed the position-location-marker-on-the-map-correctly-ios-993 branch from e569007 to 7f4cb81 Compare January 20, 2025 07:54
Copy link
Contributor Author

@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.

Reviewable status: 4 of 5 files reviewed, 1 unresolved discussion (waiting on @rablador)


ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift line 227 at r1 (raw file):

Previously, rablador (Jon Petersson) wrote…

This func should probably be called addConnectionView and the spinner be added in separate function.

Done.

Copy link
Contributor

@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.

Reviewed 4 of 5 files at r1, 1 of 1 files at r3, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @rablador)

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 r2, 1 of 1 files at r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@buggmagnet buggmagnet merged commit 7cc4ba8 into main Jan 20, 2025
11 checks passed
@buggmagnet buggmagnet deleted the position-location-marker-on-the-map-correctly-ios-993 branch January 20, 2025 12:58
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.

3 participants