From 7a24f18eb753180800f9b44a767b0d59e4e702b7 Mon Sep 17 00:00:00 2001 From: Eric Kuck Date: Fri, 14 Dec 2018 17:12:59 -0600 Subject: Most similar views now shared between ViewControllers Signed-off-by: Eric Kuck --- WireGuard/WireGuard.xcodeproj/project.pbxproj | 97 ++++++++++----------------- 1 file changed, 36 insertions(+), 61 deletions(-) (limited to 'WireGuard/WireGuard.xcodeproj') diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj index 53f2524..311a1b8 100644 --- a/WireGuard/WireGuard.xcodeproj/project.pbxproj +++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj @@ -8,19 +8,15 @@ /* Begin PBXBuildFile section */ 5F45417D21C1B23600994C13 /* UITableViewCell+Reuse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45417C21C1B23600994C13 /* UITableViewCell+Reuse.swift */; }; - 5F45418A21C2D45B00994C13 /* TunnelEditKeyValueCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45418921C2D45B00994C13 /* TunnelEditKeyValueCell.swift */; }; + 5F45418A21C2D45B00994C13 /* EditableKeyValueCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45418921C2D45B00994C13 /* EditableKeyValueCell.swift */; }; 5F45418C21C2D48200994C13 /* TunnelEditReadOnlyKeyValueCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45418B21C2D48200994C13 /* TunnelEditReadOnlyKeyValueCell.swift */; }; - 5F45418E21C2D51100994C13 /* TunnelEditButtonCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45418D21C2D51100994C13 /* TunnelEditButtonCell.swift */; }; - 5F45419021C2D53800994C13 /* TunnelEditSwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45418F21C2D53800994C13 /* TunnelEditSwitchCell.swift */; }; - 5F45419221C2D55800994C13 /* TunnelEditSectionListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45419121C2D55800994C13 /* TunnelEditSectionListCell.swift */; }; - 5F45419421C2D5C500994C13 /* TunnelDetailActivateOnDemandCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45419321C2D5C500994C13 /* TunnelDetailActivateOnDemandCell.swift */; }; - 5F45419621C2D5DB00994C13 /* TunnelDetailButtonCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45419521C2D5DB00994C13 /* TunnelDetailButtonCell.swift */; }; - 5F45419821C2D60500994C13 /* TunnelDetailKeyValueCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45419721C2D60500994C13 /* TunnelDetailKeyValueCell.swift */; }; - 5F45419A21C2D61D00994C13 /* TunnelDetailStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45419921C2D61D00994C13 /* TunnelDetailStatusCell.swift */; }; - 5F45419C21C2D64800994C13 /* SettingsButtonCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45419B21C2D64800994C13 /* SettingsButtonCell.swift */; }; - 5F45419E21C2D66400994C13 /* SettingsKeyValueCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45419D21C2D66400994C13 /* SettingsKeyValueCell.swift */; }; + 5F45419021C2D53800994C13 /* SwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45418F21C2D53800994C13 /* SwitchCell.swift */; }; + 5F45419221C2D55800994C13 /* CheckmarkCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45419121C2D55800994C13 /* CheckmarkCell.swift */; }; + 5F45419821C2D60500994C13 /* KeyValueCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45419721C2D60500994C13 /* KeyValueCell.swift */; }; 5F4541A021C2D6B700994C13 /* TunnelListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45419F21C2D6B700994C13 /* TunnelListCell.swift */; }; 5F4541A221C2D6DF00994C13 /* BorderedTextButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F4541A121C2D6DF00994C13 /* BorderedTextButton.swift */; }; + 5F4541A621C4449E00994C13 /* ButtonCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F4541A521C4449E00994C13 /* ButtonCell.swift */; }; + 5F4541A921C451D100994C13 /* TunnelStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F4541A821C451D100994C13 /* TunnelStatus.swift */; }; 6BB8400421892C920003598F /* CopyableLabelTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BB8400321892C920003598F /* CopyableLabelTableViewCell.swift */; }; 6F0068572191AFD200419BE9 /* ScrollableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F0068562191AFD200419BE9 /* ScrollableLabel.swift */; }; 6F5A2B4621AFDED40081EDD8 /* FileManager+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F5A2B4421AFDE020081EDD8 /* FileManager+Extension.swift */; }; @@ -109,19 +105,15 @@ /* Begin PBXFileReference section */ 5F45417C21C1B23600994C13 /* UITableViewCell+Reuse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableViewCell+Reuse.swift"; sourceTree = ""; }; - 5F45418921C2D45B00994C13 /* TunnelEditKeyValueCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelEditKeyValueCell.swift; sourceTree = ""; }; + 5F45418921C2D45B00994C13 /* EditableKeyValueCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditableKeyValueCell.swift; sourceTree = ""; }; 5F45418B21C2D48200994C13 /* TunnelEditReadOnlyKeyValueCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelEditReadOnlyKeyValueCell.swift; sourceTree = ""; }; - 5F45418D21C2D51100994C13 /* TunnelEditButtonCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelEditButtonCell.swift; sourceTree = ""; }; - 5F45418F21C2D53800994C13 /* TunnelEditSwitchCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelEditSwitchCell.swift; sourceTree = ""; }; - 5F45419121C2D55800994C13 /* TunnelEditSectionListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelEditSectionListCell.swift; sourceTree = ""; }; - 5F45419321C2D5C500994C13 /* TunnelDetailActivateOnDemandCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelDetailActivateOnDemandCell.swift; sourceTree = ""; }; - 5F45419521C2D5DB00994C13 /* TunnelDetailButtonCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelDetailButtonCell.swift; sourceTree = ""; }; - 5F45419721C2D60500994C13 /* TunnelDetailKeyValueCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelDetailKeyValueCell.swift; sourceTree = ""; }; - 5F45419921C2D61D00994C13 /* TunnelDetailStatusCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelDetailStatusCell.swift; sourceTree = ""; }; - 5F45419B21C2D64800994C13 /* SettingsButtonCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsButtonCell.swift; sourceTree = ""; }; - 5F45419D21C2D66400994C13 /* SettingsKeyValueCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsKeyValueCell.swift; sourceTree = ""; }; + 5F45418F21C2D53800994C13 /* SwitchCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitchCell.swift; sourceTree = ""; }; + 5F45419121C2D55800994C13 /* CheckmarkCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckmarkCell.swift; sourceTree = ""; }; + 5F45419721C2D60500994C13 /* KeyValueCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyValueCell.swift; sourceTree = ""; }; 5F45419F21C2D6B700994C13 /* TunnelListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelListCell.swift; sourceTree = ""; }; 5F4541A121C2D6DF00994C13 /* BorderedTextButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BorderedTextButton.swift; sourceTree = ""; }; + 5F4541A521C4449E00994C13 /* ButtonCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonCell.swift; sourceTree = ""; }; + 5F4541A821C451D100994C13 /* TunnelStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelStatus.swift; sourceTree = ""; }; 6BB8400321892C920003598F /* CopyableLabelTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CopyableLabelTableViewCell.swift; sourceTree = ""; }; 6F0068562191AFD200419BE9 /* ScrollableLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollableLabel.swift; sourceTree = ""; }; 6F5A2B4421AFDE020081EDD8 /* FileManager+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FileManager+Extension.swift"; sourceTree = ""; }; @@ -136,7 +128,7 @@ 6F61F1EA21B937EF00483816 /* WireGuardResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireGuardResult.swift; sourceTree = ""; }; 6F628C3C217F09E9003482A3 /* TunnelViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelViewModel.swift; sourceTree = ""; }; 6F628C3E217F3413003482A3 /* DNSServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DNSServer.swift; sourceTree = ""; }; - 6F628C40217F47DB003482A3 /* TunnelDetailTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TunnelDetailTableViewController.swift; sourceTree = ""; }; + 6F628C40217F47DB003482A3 /* TunnelDetailTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TunnelDetailTableViewController.swift; path = TunnelDetail/TunnelDetailTableViewController.swift; sourceTree = ""; }; 6F689999218043390012E523 /* WireGuard-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WireGuard-Bridging-Header.h"; sourceTree = ""; }; 6F6899A42180447E0012E523 /* x25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x25519.h; sourceTree = ""; }; 6F6899A52180447E0012E523 /* x25519.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x25519.c; sourceTree = ""; }; @@ -202,49 +194,37 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 5F45418521C2C6AB00994C13 /* Settings */ = { - isa = PBXGroup; - children = ( - 6FDEF805218725D200D8FBF6 /* SettingsTableViewController.swift */, - 5F45419B21C2D64800994C13 /* SettingsButtonCell.swift */, - 5F45419D21C2D66400994C13 /* SettingsKeyValueCell.swift */, - ); - path = Settings; - sourceTree = ""; - }; 5F45418621C2C6B400994C13 /* EditTunnel */ = { isa = PBXGroup; children = ( 6F7774F221774263006A79B3 /* TunnelEditTableViewController.swift */, - 5F45418921C2D45B00994C13 /* TunnelEditKeyValueCell.swift */, 5F45418B21C2D48200994C13 /* TunnelEditReadOnlyKeyValueCell.swift */, - 5F45418D21C2D51100994C13 /* TunnelEditButtonCell.swift */, - 5F45418F21C2D53800994C13 /* TunnelEditSwitchCell.swift */, - 5F45419121C2D55800994C13 /* TunnelEditSectionListCell.swift */, ); path = EditTunnel; sourceTree = ""; }; - 5F45418721C2C6C100994C13 /* TunnelDetail */ = { + 5F45418821C2C6CC00994C13 /* TunnelList */ = { isa = PBXGroup; children = ( - 6F628C40217F47DB003482A3 /* TunnelDetailTableViewController.swift */, - 5F45419321C2D5C500994C13 /* TunnelDetailActivateOnDemandCell.swift */, - 5F45419521C2D5DB00994C13 /* TunnelDetailButtonCell.swift */, - 5F45419721C2D60500994C13 /* TunnelDetailKeyValueCell.swift */, - 5F45419921C2D61D00994C13 /* TunnelDetailStatusCell.swift */, + 6F7774E321718281006A79B3 /* TunnelsListTableViewController.swift */, + 5F45419F21C2D6B700994C13 /* TunnelListCell.swift */, ); - path = TunnelDetail; + path = TunnelList; sourceTree = ""; }; - 5F45418821C2C6CC00994C13 /* TunnelList */ = { + 5F4541A721C44F5B00994C13 /* SharedViews */ = { isa = PBXGroup; children = ( - 6F7774E321718281006A79B3 /* TunnelsListTableViewController.swift */, - 5F45419F21C2D6B700994C13 /* TunnelListCell.swift */, + 6BB8400321892C920003598F /* CopyableLabelTableViewCell.swift */, + 6F0068562191AFD200419BE9 /* ScrollableLabel.swift */, + 5F45418F21C2D53800994C13 /* SwitchCell.swift */, + 5F45419721C2D60500994C13 /* KeyValueCell.swift */, + 5F4541A521C4449E00994C13 /* ButtonCell.swift */, + 5F45419121C2D55800994C13 /* CheckmarkCell.swift */, + 5F45418921C2D45B00994C13 /* EditableKeyValueCell.swift */, 5F4541A121C2D6DF00994C13 /* BorderedTextButton.swift */, ); - path = TunnelList; + path = SharedViews; sourceTree = ""; }; 6F5D0C1B218352EF000F85AD /* WireGuardNetworkExtension */ = { @@ -303,16 +283,15 @@ 6F7774DE217181B1006A79B3 /* iOS */ = { isa = PBXGroup; children = ( + 5F4541A721C44F5B00994C13 /* SharedViews */, 5F45418821C2C6CC00994C13 /* TunnelList */, - 5F45418721C2C6C100994C13 /* TunnelDetail */, 5F45418621C2C6B400994C13 /* EditTunnel */, - 5F45418521C2C6AB00994C13 /* Settings */, - 6BB8400321892C920003598F /* CopyableLabelTableViewCell.swift */, 6FDEF7E52185EFAF00D8FBF6 /* QRScanViewController.swift */, + 6F628C40217F47DB003482A3 /* TunnelDetailTableViewController.swift */, + 6FDEF805218725D200D8FBF6 /* SettingsTableViewController.swift */, 6F7774E0217181B1006A79B3 /* AppDelegate.swift */, 6F7774DF217181B1006A79B3 /* MainViewController.swift */, 6F919EC2218A2AE90023B400 /* ErrorPresenter.swift */, - 6F0068562191AFD200419BE9 /* ScrollableLabel.swift */, 5F45417C21C1B23600994C13 /* UITableViewCell+Reuse.swift */, ); path = iOS; @@ -334,6 +313,7 @@ children = ( 6F7774EE21722D97006A79B3 /* TunnelsManager.swift */, 6FFA5DA32197085D0001E2F7 /* ActivateOnDemandSetting.swift */, + 5F4541A821C451D100994C13 /* TunnelStatus.swift */, ); path = Tunnel; sourceTree = ""; @@ -692,47 +672,42 @@ 6F7774EF21722D97006A79B3 /* TunnelsManager.swift in Sources */, 6BB8400421892C920003598F /* CopyableLabelTableViewCell.swift in Sources */, 5F45417D21C1B23600994C13 /* UITableViewCell+Reuse.swift in Sources */, - 5F45419221C2D55800994C13 /* TunnelEditSectionListCell.swift in Sources */, + 5F45419221C2D55800994C13 /* CheckmarkCell.swift in Sources */, 6FE254FF219C60290028284D /* ZipExporter.swift in Sources */, 6F693A562179E556008551C1 /* Endpoint.swift in Sources */, - 5F45418E21C2D51100994C13 /* TunnelEditButtonCell.swift in Sources */, 6F0068572191AFD200419BE9 /* ScrollableLabel.swift in Sources */, 6FDEF7E62185EFB200D8FBF6 /* QRScanViewController.swift in Sources */, 6FFA5D952194454A0001E2F7 /* NETunnelProviderProtocol+Extension.swift in Sources */, + 5F4541A921C451D100994C13 /* TunnelStatus.swift in Sources */, 6F61F1E921B932F700483816 /* WireGuardAppError.swift in Sources */, - 5F45418A21C2D45B00994C13 /* TunnelEditKeyValueCell.swift in Sources */, + 5F45418A21C2D45B00994C13 /* EditableKeyValueCell.swift in Sources */, 6F6899A62180447E0012E523 /* x25519.c in Sources */, 6F7774E2217181B1006A79B3 /* AppDelegate.swift in Sources */, 6FDEF80021863C0100D8FBF6 /* ioapi.c in Sources */, 6FDEF7FC21863B6100D8FBF6 /* zip.c in Sources */, 6F628C3F217F3413003482A3 /* DNSServer.swift in Sources */, - 5F45419C21C2D64800994C13 /* SettingsButtonCell.swift in Sources */, 6F628C3D217F09E9003482A3 /* TunnelViewModel.swift in Sources */, - 5F45419821C2D60500994C13 /* TunnelDetailKeyValueCell.swift in Sources */, + 5F4541A621C4449E00994C13 /* ButtonCell.swift in Sources */, + 5F45419821C2D60500994C13 /* KeyValueCell.swift in Sources */, 6F919EC3218A2AE90023B400 /* ErrorPresenter.swift in Sources */, 6F5A2B4821AFF49A0081EDD8 /* FileManager+Extension.swift in Sources */, 5F45418C21C2D48200994C13 /* TunnelEditReadOnlyKeyValueCell.swift in Sources */, 6FDEF8082187442100D8FBF6 /* WgQuickConfigFileWriter.swift in Sources */, 6FE254FB219C10800028284D /* ZipImporter.swift in Sources */, - 5F45419A21C2D61D00994C13 /* TunnelDetailStatusCell.swift in Sources */, 6F7774EA217229DB006A79B3 /* IPAddressRange.swift in Sources */, - 5F45419621C2D5DB00994C13 /* TunnelDetailButtonCell.swift in Sources */, 6F7774E82172020C006A79B3 /* Configuration.swift in Sources */, 6FDEF7FB21863B6100D8FBF6 /* unzip.c in Sources */, - 5F45419E21C2D66400994C13 /* SettingsKeyValueCell.swift in Sources */, 6F6899A8218044FC0012E523 /* Curve25519.swift in Sources */, 5F4541A021C2D6B700994C13 /* TunnelListCell.swift in Sources */, 6F628C41217F47DB003482A3 /* TunnelDetailTableViewController.swift in Sources */, 6F61F1EB21B937EF00483816 /* WireGuardResult.swift in Sources */, 6F7774F321774263006A79B3 /* TunnelEditTableViewController.swift in Sources */, 6FDEF802218646BA00D8FBF6 /* ZipArchive.swift in Sources */, - 5F45419021C2D53800994C13 /* TunnelEditSwitchCell.swift in Sources */, + 5F45419021C2D53800994C13 /* SwitchCell.swift in Sources */, 6FDEF806218725D200D8FBF6 /* SettingsTableViewController.swift in Sources */, 5F4541A221C2D6DF00994C13 /* BorderedTextButton.swift in Sources */, 6F7774E1217181B1006A79B3 /* MainViewController.swift in Sources */, 6FFA5DA42197085D0001E2F7 /* ActivateOnDemandSetting.swift in Sources */, - 5F45419421C2D5C500994C13 /* TunnelDetailActivateOnDemandCell.swift in Sources */, - 6FF717E521B2CB1E0045A474 /* InternetReachability.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; -- cgit v1.2.3-59-g8ed1b