aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Kuck <eric@bluelinelabs.com>2018-12-14 17:27:11 -0600
committerEric Kuck <eric@bluelinelabs.com>2018-12-14 17:27:11 -0600
commitcb051f695db44e7a52e3f423fa27de00c493a9ac (patch)
tree64b583809b17825a0660211f7f381dfc892ccf61
parentMost similar views now shared between ViewControllers (diff)
downloadwireguard-apple-cb051f695db44e7a52e3f423fa27de00c493a9ac.tar.xz
wireguard-apple-cb051f695db44e7a52e3f423fa27de00c493a9ac.zip
Reorganized project structure
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
-rw-r--r--WireGuard/WireGuard.xcodeproj/project.pbxproj46
-rw-r--r--WireGuard/WireGuard/UI/TunnelViewModel.swift1
-rw-r--r--WireGuard/WireGuard/UI/iOS/View/BorderedTextButton.swift (renamed from WireGuard/WireGuard/UI/iOS/SharedViews/BorderedTextButton.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/View/ButtonCell.swift (renamed from WireGuard/WireGuard/UI/iOS/SharedViews/ButtonCell.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/View/CheckmarkCell.swift (renamed from WireGuard/WireGuard/UI/iOS/SharedViews/CheckmarkCell.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/View/CopyableLabelTableViewCell.swift (renamed from WireGuard/WireGuard/UI/iOS/SharedViews/CopyableLabelTableViewCell.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/View/EditableKeyValueCell.swift (renamed from WireGuard/WireGuard/UI/iOS/SharedViews/EditableKeyValueCell.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/View/KeyValueCell.swift (renamed from WireGuard/WireGuard/UI/iOS/SharedViews/KeyValueCell.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/View/ScrollableLabel.swift (renamed from WireGuard/WireGuard/UI/iOS/SharedViews/ScrollableLabel.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/View/SwitchCell.swift (renamed from WireGuard/WireGuard/UI/iOS/SharedViews/SwitchCell.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/View/TunnelEditReadOnlyKeyValueCell.swift (renamed from WireGuard/WireGuard/UI/iOS/EditTunnel/TunnelEditReadOnlyKeyValueCell.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/View/TunnelListCell.swift (renamed from WireGuard/WireGuard/UI/iOS/TunnelList/TunnelListCell.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/ViewController/MainViewController.swift (renamed from WireGuard/WireGuard/UI/iOS/MainViewController.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/ViewController/QRScanViewController.swift (renamed from WireGuard/WireGuard/UI/iOS/QRScanViewController.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/ViewController/SettingsTableViewController.swift (renamed from WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift (renamed from WireGuard/WireGuard/UI/iOS/TunnelDetail/TunnelDetailTableViewController.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/ViewController/TunnelEditTableViewController.swift (renamed from WireGuard/WireGuard/UI/iOS/EditTunnel/TunnelEditTableViewController.swift)0
-rw-r--r--WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift (renamed from WireGuard/WireGuard/UI/iOS/TunnelList/TunnelsListTableViewController.swift)0
18 files changed, 20 insertions, 27 deletions
diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj
index 311a1b8a..dec77014 100644
--- a/WireGuard/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj
@@ -128,7 +128,7 @@
6F61F1EA21B937EF00483816 /* WireGuardResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WireGuardResult.swift; sourceTree = "<group>"; };
6F628C3C217F09E9003482A3 /* TunnelViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelViewModel.swift; sourceTree = "<group>"; };
6F628C3E217F3413003482A3 /* DNSServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DNSServer.swift; sourceTree = "<group>"; };
- 6F628C40217F47DB003482A3 /* TunnelDetailTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TunnelDetailTableViewController.swift; path = TunnelDetail/TunnelDetailTableViewController.swift; sourceTree = "<group>"; };
+ 6F628C40217F47DB003482A3 /* TunnelDetailTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TunnelDetailTableViewController.swift; sourceTree = "<group>"; };
6F689999218043390012E523 /* WireGuard-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WireGuard-Bridging-Header.h"; sourceTree = "<group>"; };
6F6899A42180447E0012E523 /* x25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x25519.h; sourceTree = "<group>"; };
6F6899A52180447E0012E523 /* x25519.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x25519.c; sourceTree = "<group>"; };
@@ -194,27 +194,11 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
- 5F45418621C2C6B400994C13 /* EditTunnel */ = {
+ 5F4541A721C44F5B00994C13 /* View */ = {
isa = PBXGroup;
children = (
- 6F7774F221774263006A79B3 /* TunnelEditTableViewController.swift */,
- 5F45418B21C2D48200994C13 /* TunnelEditReadOnlyKeyValueCell.swift */,
- );
- path = EditTunnel;
- sourceTree = "<group>";
- };
- 5F45418821C2C6CC00994C13 /* TunnelList */ = {
- isa = PBXGroup;
- children = (
- 6F7774E321718281006A79B3 /* TunnelsListTableViewController.swift */,
5F45419F21C2D6B700994C13 /* TunnelListCell.swift */,
- );
- path = TunnelList;
- sourceTree = "<group>";
- };
- 5F4541A721C44F5B00994C13 /* SharedViews */ = {
- isa = PBXGroup;
- children = (
+ 5F45418B21C2D48200994C13 /* TunnelEditReadOnlyKeyValueCell.swift */,
6BB8400321892C920003598F /* CopyableLabelTableViewCell.swift */,
6F0068562191AFD200419BE9 /* ScrollableLabel.swift */,
5F45418F21C2D53800994C13 /* SwitchCell.swift */,
@@ -224,7 +208,20 @@
5F45418921C2D45B00994C13 /* EditableKeyValueCell.swift */,
5F4541A121C2D6DF00994C13 /* BorderedTextButton.swift */,
);
- path = SharedViews;
+ path = View;
+ sourceTree = "<group>";
+ };
+ 5F4541AC21C4720B00994C13 /* ViewController */ = {
+ isa = PBXGroup;
+ children = (
+ 6F7774E321718281006A79B3 /* TunnelsListTableViewController.swift */,
+ 6F7774F221774263006A79B3 /* TunnelEditTableViewController.swift */,
+ 6FDEF7E52185EFAF00D8FBF6 /* QRScanViewController.swift */,
+ 6F628C40217F47DB003482A3 /* TunnelDetailTableViewController.swift */,
+ 6FDEF805218725D200D8FBF6 /* SettingsTableViewController.swift */,
+ 6F7774DF217181B1006A79B3 /* MainViewController.swift */,
+ );
+ path = ViewController;
sourceTree = "<group>";
};
6F5D0C1B218352EF000F85AD /* WireGuardNetworkExtension */ = {
@@ -283,14 +280,9 @@
6F7774DE217181B1006A79B3 /* iOS */ = {
isa = PBXGroup;
children = (
- 5F4541A721C44F5B00994C13 /* SharedViews */,
- 5F45418821C2C6CC00994C13 /* TunnelList */,
- 5F45418621C2C6B400994C13 /* EditTunnel */,
- 6FDEF7E52185EFAF00D8FBF6 /* QRScanViewController.swift */,
- 6F628C40217F47DB003482A3 /* TunnelDetailTableViewController.swift */,
- 6FDEF805218725D200D8FBF6 /* SettingsTableViewController.swift */,
+ 5F4541AC21C4720B00994C13 /* ViewController */,
+ 5F4541A721C44F5B00994C13 /* View */,
6F7774E0217181B1006A79B3 /* AppDelegate.swift */,
- 6F7774DF217181B1006A79B3 /* MainViewController.swift */,
6F919EC2218A2AE90023B400 /* ErrorPresenter.swift */,
5F45417C21C1B23600994C13 /* UITableViewCell+Reuse.swift */,
);
diff --git a/WireGuard/WireGuard/UI/TunnelViewModel.swift b/WireGuard/WireGuard/UI/TunnelViewModel.swift
index c9b1cf14..d542f986 100644
--- a/WireGuard/WireGuard/UI/TunnelViewModel.swift
+++ b/WireGuard/WireGuard/UI/TunnelViewModel.swift
@@ -3,6 +3,7 @@
import UIKit
+//swiftlint:disable:next type_body_length
class TunnelViewModel {
enum InterfaceField: String {
diff --git a/WireGuard/WireGuard/UI/iOS/SharedViews/BorderedTextButton.swift b/WireGuard/WireGuard/UI/iOS/View/BorderedTextButton.swift
index 94b76d62..94b76d62 100644
--- a/WireGuard/WireGuard/UI/iOS/SharedViews/BorderedTextButton.swift
+++ b/WireGuard/WireGuard/UI/iOS/View/BorderedTextButton.swift
diff --git a/WireGuard/WireGuard/UI/iOS/SharedViews/ButtonCell.swift b/WireGuard/WireGuard/UI/iOS/View/ButtonCell.swift
index 47029933..47029933 100644
--- a/WireGuard/WireGuard/UI/iOS/SharedViews/ButtonCell.swift
+++ b/WireGuard/WireGuard/UI/iOS/View/ButtonCell.swift
diff --git a/WireGuard/WireGuard/UI/iOS/SharedViews/CheckmarkCell.swift b/WireGuard/WireGuard/UI/iOS/View/CheckmarkCell.swift
index db4b6c95..db4b6c95 100644
--- a/WireGuard/WireGuard/UI/iOS/SharedViews/CheckmarkCell.swift
+++ b/WireGuard/WireGuard/UI/iOS/View/CheckmarkCell.swift
diff --git a/WireGuard/WireGuard/UI/iOS/SharedViews/CopyableLabelTableViewCell.swift b/WireGuard/WireGuard/UI/iOS/View/CopyableLabelTableViewCell.swift
index 93a9ef7e..93a9ef7e 100644
--- a/WireGuard/WireGuard/UI/iOS/SharedViews/CopyableLabelTableViewCell.swift
+++ b/WireGuard/WireGuard/UI/iOS/View/CopyableLabelTableViewCell.swift
diff --git a/WireGuard/WireGuard/UI/iOS/SharedViews/EditableKeyValueCell.swift b/WireGuard/WireGuard/UI/iOS/View/EditableKeyValueCell.swift
index 48956eb9..48956eb9 100644
--- a/WireGuard/WireGuard/UI/iOS/SharedViews/EditableKeyValueCell.swift
+++ b/WireGuard/WireGuard/UI/iOS/View/EditableKeyValueCell.swift
diff --git a/WireGuard/WireGuard/UI/iOS/SharedViews/KeyValueCell.swift b/WireGuard/WireGuard/UI/iOS/View/KeyValueCell.swift
index 78026eab..78026eab 100644
--- a/WireGuard/WireGuard/UI/iOS/SharedViews/KeyValueCell.swift
+++ b/WireGuard/WireGuard/UI/iOS/View/KeyValueCell.swift
diff --git a/WireGuard/WireGuard/UI/iOS/SharedViews/ScrollableLabel.swift b/WireGuard/WireGuard/UI/iOS/View/ScrollableLabel.swift
index bd6f5471..bd6f5471 100644
--- a/WireGuard/WireGuard/UI/iOS/SharedViews/ScrollableLabel.swift
+++ b/WireGuard/WireGuard/UI/iOS/View/ScrollableLabel.swift
diff --git a/WireGuard/WireGuard/UI/iOS/SharedViews/SwitchCell.swift b/WireGuard/WireGuard/UI/iOS/View/SwitchCell.swift
index d0c29aac..d0c29aac 100644
--- a/WireGuard/WireGuard/UI/iOS/SharedViews/SwitchCell.swift
+++ b/WireGuard/WireGuard/UI/iOS/View/SwitchCell.swift
diff --git a/WireGuard/WireGuard/UI/iOS/EditTunnel/TunnelEditReadOnlyKeyValueCell.swift b/WireGuard/WireGuard/UI/iOS/View/TunnelEditReadOnlyKeyValueCell.swift
index 15d58d60..15d58d60 100644
--- a/WireGuard/WireGuard/UI/iOS/EditTunnel/TunnelEditReadOnlyKeyValueCell.swift
+++ b/WireGuard/WireGuard/UI/iOS/View/TunnelEditReadOnlyKeyValueCell.swift
diff --git a/WireGuard/WireGuard/UI/iOS/TunnelList/TunnelListCell.swift b/WireGuard/WireGuard/UI/iOS/View/TunnelListCell.swift
index 14a71949..14a71949 100644
--- a/WireGuard/WireGuard/UI/iOS/TunnelList/TunnelListCell.swift
+++ b/WireGuard/WireGuard/UI/iOS/View/TunnelListCell.swift
diff --git a/WireGuard/WireGuard/UI/iOS/MainViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/MainViewController.swift
index 82e6f81a..82e6f81a 100644
--- a/WireGuard/WireGuard/UI/iOS/MainViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/ViewController/MainViewController.swift
diff --git a/WireGuard/WireGuard/UI/iOS/QRScanViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/QRScanViewController.swift
index 1e231ec9..1e231ec9 100644
--- a/WireGuard/WireGuard/UI/iOS/QRScanViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/ViewController/QRScanViewController.swift
diff --git a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/SettingsTableViewController.swift
index b583c5bf..b583c5bf 100644
--- a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/ViewController/SettingsTableViewController.swift
diff --git a/WireGuard/WireGuard/UI/iOS/TunnelDetail/TunnelDetailTableViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift
index ed48d0f0..ed48d0f0 100644
--- a/WireGuard/WireGuard/UI/iOS/TunnelDetail/TunnelDetailTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift
diff --git a/WireGuard/WireGuard/UI/iOS/EditTunnel/TunnelEditTableViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelEditTableViewController.swift
index 393294e5..393294e5 100644
--- a/WireGuard/WireGuard/UI/iOS/EditTunnel/TunnelEditTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelEditTableViewController.swift
diff --git a/WireGuard/WireGuard/UI/iOS/TunnelList/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift
index 0188c627..0188c627 100644
--- a/WireGuard/WireGuard/UI/iOS/TunnelList/TunnelsListTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift