]> git.ipfire.org Git - thirdparty/wireguard-apple.git/commitdiff
Use a split-view controller as the main (root) view controller
authorRoopesh Chander <roop@roopc.net>
Sat, 13 Oct 2018 01:38:30 +0000 (07:08 +0530)
committerRoopesh Chander <roop@roopc.net>
Sat, 27 Oct 2018 09:43:01 +0000 (15:13 +0530)
Signed-off-by: Roopesh Chander <roop@roopc.net>
WireGuard/WireGuard.xcodeproj/project.pbxproj
WireGuard/WireGuard/UI/iOS/MainViewController.swift
WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift [new file with mode: 0644]

index 76cd4518af03d052fc9ab858931d4887cacb162b..e9d6dcce6f4c790750e3f0e25d93a983e4ac4952 100644 (file)
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
                6F7774E1217181B1006A79B3 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F7774DF217181B1006A79B3 /* MainViewController.swift */; };
                6F7774E2217181B1006A79B3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F7774E0217181B1006A79B3 /* AppDelegate.swift */; };
+               6F7774E421718281006A79B3 /* TunnelsListTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F7774E321718281006A79B3 /* TunnelsListTableViewController.swift */; };
                6FF4AC1F211EC472002C96EB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6FF4AC1E211EC472002C96EB /* Assets.xcassets */; };
                6FF4AC22211EC472002C96EB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6FF4AC20211EC472002C96EB /* LaunchScreen.storyboard */; };
                6FF4AC472120B9E0002C96EB /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6FF4AC462120B9E0002C96EB /* NetworkExtension.framework */; };
@@ -17,6 +18,7 @@
 /* Begin PBXFileReference section */
                6F7774DF217181B1006A79B3 /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
                6F7774E0217181B1006A79B3 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+               6F7774E321718281006A79B3 /* TunnelsListTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TunnelsListTableViewController.swift; sourceTree = "<group>"; };
                6FF4AC14211EC46F002C96EB /* WireGuard.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WireGuard.app; sourceTree = BUILT_PRODUCTS_DIR; };
                6FF4AC1E211EC472002C96EB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
                6FF4AC21211EC472002C96EB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -49,8 +51,9 @@
                6F7774DE217181B1006A79B3 /* iOS */ = {
                        isa = PBXGroup;
                        children = (
-                               6F7774DF217181B1006A79B3 /* MainViewController.swift */,
                                6F7774E0217181B1006A79B3 /* AppDelegate.swift */,
+                               6F7774DF217181B1006A79B3 /* MainViewController.swift */,
+                               6F7774E321718281006A79B3 /* TunnelsListTableViewController.swift */,
                        );
                        path = iOS;
                        sourceTree = "<group>";
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               6F7774E421718281006A79B3 /* TunnelsListTableViewController.swift in Sources */,
                                6F7774E2217181B1006A79B3 /* AppDelegate.swift in Sources */,
                                6F7774E1217181B1006A79B3 /* MainViewController.swift in Sources */,
                        );
index a296b5f3e6804116919765ed3054633e390f12e4..4672c273113ee4538e2a223758167f6e816d3469 100644 (file)
@@ -8,8 +8,16 @@
 
 import UIKit
 
-class MainViewController: UIViewController {
+class MainViewController: UISplitViewController {
     override func loadView() {
-        self.view = UIView()
+        let detailVC = UIViewController()
+        let detailNC = UINavigationController(rootViewController: detailVC)
+
+        let masterVC = TunnelsListTableViewController()
+        let masterNC = UINavigationController(rootViewController: masterVC)
+
+        self.viewControllers = [ masterNC, detailNC ]
+
+        super.loadView()
     }
 }
diff --git a/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
new file mode 100644 (file)
index 0000000..e886e4a
--- /dev/null
@@ -0,0 +1,35 @@
+//
+//  TunnelsListTableViewController.swift
+//  WireGuard
+//
+//  Created by Roopesh Chander on 12/10/18.
+//  Copyright © 2018 Roopesh Chander. All rights reserved.
+//
+
+import UIKit
+
+class TunnelsListTableViewController: UITableViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.title = "WireGuard"
+        let addButtonItem = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(addButtonTapped(sender:)))
+        self.navigationItem.rightBarButtonItem = addButtonItem
+    }
+
+    @objc func addButtonTapped(sender: UIBarButtonItem!) {
+        print("Add button tapped")
+    }
+}
+
+// MARK: UITableViewDataSource
+
+extension TunnelsListTableViewController {
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 0
+    }
+
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 0
+    }
+}