diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2022-11-01 06:17:59 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2022-11-01 08:45:47 +0100 |
| commit | 8b523fe3b84a2a28d231274dfdc0dce0cdcaaf68 (patch) | |
| tree | 88a81ad576800b69433a2375f610d3c54206f9c0 | |
| parent | 0ae390b4d67964ced5f3221c9de56fba5f0aa89d (diff) | |
| download | mullvadvpn-8b523fe3b84a2a28d231274dfdc0dce0cdcaaf68.tar.xz mullvadvpn-8b523fe3b84a2a28d231274dfdc0dce0cdcaaf68.zip | |
Move CustomOverlayRenderer into separate file
| -rw-r--r-- | ios/MullvadVPN.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | ios/MullvadVPN/ConnectViewController.swift | 8 | ||||
| -rw-r--r-- | ios/MullvadVPN/CustomOverlayRenderer.swift | 17 |
3 files changed, 21 insertions, 8 deletions
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index 2a42abcc5e..d1d1a4c0e3 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -161,6 +161,7 @@ 5878A27529093A310096FC88 /* StorePaymentEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878A27429093A310096FC88 /* StorePaymentEvent.swift */; }; 5878A27729093A4F0096FC88 /* StorePaymentBlockObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878A27629093A4F0096FC88 /* StorePaymentBlockObserver.swift */; }; 5878A279290954790096FC88 /* ConnectInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878A278290954790096FC88 /* ConnectInteractor.swift */; }; + 5878A27B2909649A0096FC88 /* CustomOverlayRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5878A27A2909649A0096FC88 /* CustomOverlayRenderer.swift */; }; 587988C728A2A01F00E3DF54 /* AccountDataThrottling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587988C628A2A01F00E3DF54 /* AccountDataThrottling.swift */; }; 587A01FC23F1F0BE00B68763 /* SimulatorTunnelProviderHost.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587A01FB23F1F0BE00B68763 /* SimulatorTunnelProviderHost.swift */; }; 587AD7C623421D7000E93A53 /* TunnelSettingsV1.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587AD7C523421D7000E93A53 /* TunnelSettingsV1.swift */; }; @@ -640,6 +641,7 @@ 5878A27429093A310096FC88 /* StorePaymentEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorePaymentEvent.swift; sourceTree = "<group>"; }; 5878A27629093A4F0096FC88 /* StorePaymentBlockObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorePaymentBlockObserver.swift; sourceTree = "<group>"; }; 5878A278290954790096FC88 /* ConnectInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectInteractor.swift; sourceTree = "<group>"; }; + 5878A27A2909649A0096FC88 /* CustomOverlayRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomOverlayRenderer.swift; sourceTree = "<group>"; }; 587988C628A2A01F00E3DF54 /* AccountDataThrottling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountDataThrottling.swift; sourceTree = "<group>"; }; 587A01FB23F1F0BE00B68763 /* SimulatorTunnelProviderHost.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimulatorTunnelProviderHost.swift; sourceTree = "<group>"; }; 587AD7C523421D7000E93A53 /* TunnelSettingsV1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TunnelSettingsV1.swift; sourceTree = "<group>"; }; @@ -1228,6 +1230,7 @@ 58B43C1825F77DB60002C8C3 /* ConnectContentView.swift */, 58A1AA8B23F5584B009F7EA6 /* ConnectionPanelView.swift */, 58CCA00F224249A1004F3011 /* ConnectViewController.swift */, + 5878A27A2909649A0096FC88 /* CustomOverlayRenderer.swift */, 5878A278290954790096FC88 /* ConnectInteractor.swift */, 5871FB95254ADE4E0051A0A4 /* ConsolidatedApplicationLog.swift */, 5896AE83246D5889005B36CB /* CustomDateComponentsFormatting.swift */, @@ -2062,6 +2065,7 @@ 5878A27529093A310096FC88 /* StorePaymentEvent.swift in Sources */, 58E6771F24ADFE7800AA26E7 /* SettingsNavigationController.swift in Sources */, 58A1AA8C23F5584C009F7EA6 /* ConnectionPanelView.swift in Sources */, + 5878A27B2909649A0096FC88 /* CustomOverlayRenderer.swift in Sources */, 582BB1B3229574F40055B6EF /* SettingsAccountCell.swift in Sources */, 588527B2276B3F0700BAA373 /* LoadTunnelConfigurationOperation.swift in Sources */, 58F1311527E0B2AB007AC5BC /* Result+Extensions.swift in Sources */, diff --git a/ios/MullvadVPN/ConnectViewController.swift b/ios/MullvadVPN/ConnectViewController.swift index ad16477ac7..1e4bb4e99a 100644 --- a/ios/MullvadVPN/ConnectViewController.swift +++ b/ios/MullvadVPN/ConnectViewController.swift @@ -12,14 +12,6 @@ import MullvadTypes import TunnelProviderMessaging import UIKit -class CustomOverlayRenderer: MKOverlayRenderer { - override func draw(_ mapRect: MKMapRect, zoomScale: MKZoomScale, in context: CGContext) { - let drawRect = rect(for: mapRect) - context.setFillColor(UIColor.secondaryColor.cgColor) - context.fill(drawRect) - } -} - protocol ConnectViewControllerDelegate: AnyObject { func connectViewControllerShouldShowSelectLocationPicker(_ controller: ConnectViewController) } diff --git a/ios/MullvadVPN/CustomOverlayRenderer.swift b/ios/MullvadVPN/CustomOverlayRenderer.swift new file mode 100644 index 0000000000..19ca225c93 --- /dev/null +++ b/ios/MullvadVPN/CustomOverlayRenderer.swift @@ -0,0 +1,17 @@ +// +// CustomOverlayRenderer.swift +// MullvadVPN +// +// Created by pronebird on 26/10/2022. +// Copyright © 2022 Mullvad VPN AB. All rights reserved. +// + +import MapKit + +class CustomOverlayRenderer: MKOverlayRenderer { + override func draw(_ mapRect: MKMapRect, zoomScale: MKZoomScale, in context: CGContext) { + let drawRect = rect(for: mapRect) + context.setFillColor(UIColor.secondaryColor.cgColor) + context.fill(drawRect) + } +} |
