diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2022-07-22 10:51:57 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2022-07-22 10:51:57 +0200 |
| commit | 9383fbced659038d7a13fe5f5aa55c76e09b0b7a (patch) | |
| tree | 84e256156667756268f2de52e0cd51cfdbb56963 | |
| parent | 65c39006960ea1f8ae7b90c1da69f6895f963c6b (diff) | |
| download | mullvadvpn-9383fbced659038d7a13fe5f5aa55c76e09b0b7a.tar.xz mullvadvpn-9383fbced659038d7a13fe5f5aa55c76e09b0b7a.zip | |
Rename ConnectMainContentView to ConnectContentView
| -rw-r--r-- | ios/MullvadVPN.xcodeproj/project.pbxproj | 8 | ||||
| -rw-r--r-- | ios/MullvadVPN/ConnectContentView.swift (renamed from ios/MullvadVPN/ConnectMainContentView.swift) | 4 | ||||
| -rw-r--r-- | ios/MullvadVPN/ConnectViewController.swift | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index 693939135d..00ece54d46 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -229,7 +229,7 @@ 58B0A2AC238EE6D500BC001D /* IPAddress+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5840250022B1124600E4CFEC /* IPAddress+Codable.swift */; }; 58B0A2AD238EE6EC00BC001D /* MullvadEndpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5840250322B11AB700E4CFEC /* MullvadEndpoint.swift */; }; 58B3F30F2742708B00A2DD38 /* HeaderBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58B3F30E2742708B00A2DD38 /* HeaderBarButton.swift */; }; - 58B43C1925F77DB60002C8C3 /* ConnectMainContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58B43C1825F77DB60002C8C3 /* ConnectMainContentView.swift */; }; + 58B43C1925F77DB60002C8C3 /* ConnectContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58B43C1825F77DB60002C8C3 /* ConnectContentView.swift */; }; 58B5A895280AACC4009FDE99 /* RESTRequestFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58B5A894280AACC4009FDE99 /* RESTRequestFactory.swift */; }; 58B5A899280AB0D7009FDE99 /* RESTAuthorization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58B5A898280AB0D7009FDE99 /* RESTAuthorization.swift */; }; 58B67B482602079E008EF58E /* RelaySelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58781CD422AFBA39009B9D8E /* RelaySelector.swift */; }; @@ -516,7 +516,7 @@ 58B0A2A0238EE67E00BC001D /* MullvadVPNTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MullvadVPNTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 58B0A2A4238EE67E00BC001D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 58B3F30E2742708B00A2DD38 /* HeaderBarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderBarButton.swift; sourceTree = "<group>"; }; - 58B43C1825F77DB60002C8C3 /* ConnectMainContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectMainContentView.swift; sourceTree = "<group>"; }; + 58B43C1825F77DB60002C8C3 /* ConnectContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectContentView.swift; sourceTree = "<group>"; }; 58B5A894280AACC4009FDE99 /* RESTRequestFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RESTRequestFactory.swift; sourceTree = "<group>"; }; 58B5A898280AB0D7009FDE99 /* RESTAuthorization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RESTAuthorization.swift; sourceTree = "<group>"; }; 58B93A1226C3F13600A55733 /* TunnelState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelState.swift; sourceTree = "<group>"; }; @@ -875,7 +875,7 @@ 587EB669270EFACB00123C75 /* CharacterSet+IPAddress.swift */, 582AD43F27BE616E002A6BFC /* CodingErrors+ChainedError.swift */, 58A1AA8B23F5584B009F7EA6 /* ConnectionPanelView.swift */, - 58B43C1825F77DB60002C8C3 /* ConnectMainContentView.swift */, + 58B43C1825F77DB60002C8C3 /* ConnectContentView.swift */, 58CCA00F224249A1004F3011 /* ConnectViewController.swift */, 584592602639B4A200EF967F /* TermsOfServiceContentView.swift */, 58A99ED2240014A0006599E9 /* TermsOfServiceViewController.swift */, @@ -1475,7 +1475,7 @@ 584D26C4270C855B004EA533 /* PreferencesDataSource.swift in Sources */, 58B5A899280AB0D7009FDE99 /* RESTAuthorization.swift in Sources */, 58FD5BF024238EB300112C88 /* SKProduct+Formatting.swift in Sources */, - 58B43C1925F77DB60002C8C3 /* ConnectMainContentView.swift in Sources */, + 58B43C1925F77DB60002C8C3 /* ConnectContentView.swift in Sources */, 58561C99239A5D1500BD6B5E /* IPEndpoint.swift in Sources */, 58F97A1E280FDE230050C2FC /* RESTRequestHandler.swift in Sources */, 58FD5BF22424F7D700112C88 /* UserInterfaceInteractionRestriction.swift in Sources */, diff --git a/ios/MullvadVPN/ConnectMainContentView.swift b/ios/MullvadVPN/ConnectContentView.swift index 40ffdce960..426f499c75 100644 --- a/ios/MullvadVPN/ConnectMainContentView.swift +++ b/ios/MullvadVPN/ConnectContentView.swift @@ -1,5 +1,5 @@ // -// ConnectMainContentView.swift +// ConnectContentView.swift // MullvadVPN // // Created by pronebird on 09/03/2021. @@ -9,7 +9,7 @@ import UIKit import MapKit -class ConnectMainContentView: UIView { +class ConnectContentView: UIView { enum ActionButton { case connect case disconnect diff --git a/ios/MullvadVPN/ConnectViewController.swift b/ios/MullvadVPN/ConnectViewController.swift index ff213b1b86..053dde26a7 100644 --- a/ios/MullvadVPN/ConnectViewController.swift +++ b/ios/MullvadVPN/ConnectViewController.swift @@ -30,8 +30,8 @@ class ConnectViewController: UIViewController, MKMapViewDelegate, RootContainmen let notificationController = NotificationController() - private let contentView: ConnectMainContentView = { - let view = ConnectMainContentView(frame: UIScreen.main.bounds) + private let contentView: ConnectContentView = { + let view = ConnectContentView(frame: UIScreen.main.bounds) view.translatesAutoresizingMaskIntoConstraints = false return view }() @@ -631,7 +631,7 @@ private extension TunnelState { } } - func actionButtons(traitCollection: UITraitCollection) -> [ConnectMainContentView.ActionButton] { + func actionButtons(traitCollection: UITraitCollection) -> [ConnectContentView.ActionButton] { switch (traitCollection.userInterfaceIdiom, traitCollection.horizontalSizeClass) { case (.phone, _), (.pad, .compact): switch self { |
