Skip to content

Commit

Permalink
1.1v
Browse files Browse the repository at this point in the history
  • Loading branch information
@lukasa1993
lukasa1993 committed Aug 29, 2018
1 parent 619e1b6 commit d8866d5
Show file tree
Hide file tree
Showing 13 changed files with 712 additions and 630 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.DS_Store
.build
.idea/
4 changes: 2 additions & 2 deletions NMSSH/NMSSH-iOS.xcodeproj/xcuserdata/ld.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
<key>18A0964E17D6A8C4008B76FB</key>
<dict>
<key>primary</key>
<true/>
<true />
</dict>
<key>18A0965D17D6A97C008B76FB</key>
<dict>
<key>primary</key>
<true/>
<true />
</dict>
</dict>
</dict>
Expand Down
17 changes: 17 additions & 0 deletions SCP.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@
6BC17E5220774D6300E2A999 /* Frameworks */,
6BC17E5320774D6300E2A999 /* Resources */,
6BC17E7E2077602000E2A999 /* Embed Frameworks */,
6B9CEB9B208DF296006E2332 /* ShellScript */,
);
buildRules = (
);
Expand Down Expand Up @@ -335,6 +336,22 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
6B9CEB9B208DF296006E2332 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "buildNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"$INFOPLIST_FILE\")\nbuildNumber=$(($buildNumber + 1))\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumber\" \"$INFOPLIST_FILE\"";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
6BC17E5120774D6300E2A999 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down
Binary file modified SCP.xcodeproj/project.xcworkspace/xcuserdata/ld.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions ...codeproj/project.xcworkspace/xcuserdata/ld.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict />
</plist>
132 changes: 66 additions & 66 deletions SCP/AddServerViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,80 +9,80 @@
import Eureka

class AddServerViewController: FormViewController {
var serverForm:Form? = nil

var serverForm: Form? = nil

override func viewDidLoad() {
super.viewDidLoad()
super.viewDidLoad()

serverForm = form +++ Section()
<<< NameRow(){ row in
row.title = "Name"
row.placeholder = "Name"
row.tag = "name"
}
<<< TextRow(){
$0.title = "Host"
$0.placeholder = "URL or IP of Host"
$0.tag = "host"
}
<<< IntRow(){
$0.title = "Port"
$0.placeholder = "Defaults to 22"
$0.tag = "port"
}
<<< TextRow(){
$0.title = "Username"
$0.placeholder = "Defaults to root"
$0.tag = "user"
}
<<< PasswordRow(){
$0.title = "Password"
$0.placeholder = "password"
$0.tag = "pass"
}
+++ Section()
<<< ButtonRow(){
$0.title = "Add Server"
}.onCellSelection { cell, row in
let keychain = Keychain()
do {
let nameRow: NameRow? = self.serverForm?.rowBy(tag: "name")
let portRow: IntRow? = self.serverForm?.rowBy(tag: "port")
let userRow: TextRow? = self.serverForm?.rowBy(tag: "user")
let hostRow: TextRow? = self.serverForm?.rowBy(tag: "host")
let passRow: PasswordRow? = self.serverForm?.rowBy(tag: "pass")

let name = nameRow?.value != nil ? nameRow?.value : "SSH Server"
let port = portRow?.value != nil ? portRow?.value : 22
let user = userRow?.value != nil ? userRow?.value : "root"

let server = SSHServer(name: name!,
host: hostRow!.value!,
port: port!,
user: user!,
pass: passRow!.value!)
<<< NameRow() { row in
row.title = "Name"
row.placeholder = "Name"
row.tag = "name"
}
<<< TextRow() {
$0.title = "Host"
$0.placeholder = "URL or IP of Host"
$0.tag = "host"
}
<<< IntRow() {
$0.title = "Port"
$0.placeholder = "Defaults to 22"
$0.tag = "port"
}
<<< TextRow() {
$0.title = "Username"
$0.placeholder = "Defaults to root"
$0.tag = "user"
}
<<< PasswordRow() {
$0.title = "Password"
$0.placeholder = "password"
$0.tag = "pass"
}
+++ Section()
<<< ButtonRow() {
$0.title = "Add Server"
}.onCellSelection { cell, row in
let keychain = Keychain()
do {
let nameRow: NameRow? = self.serverForm?.rowBy(tag: "name")
let portRow: IntRow? = self.serverForm?.rowBy(tag: "port")
let userRow: TextRow? = self.serverForm?.rowBy(tag: "user")
let hostRow: TextRow? = self.serverForm?.rowBy(tag: "host")
let passRow: PasswordRow? = self.serverForm?.rowBy(tag: "pass")

let name = nameRow?.value != nil ? nameRow?.value : "SSH Server"
let port = portRow?.value != nil ? portRow?.value : 22
let user = userRow?.value != nil ? userRow?.value : "root"

let jsonEncoder = JSONEncoder()
let jsonData = try jsonEncoder.encode(server)
let jsonString = String(data: jsonData, encoding: .utf8)

try keychain.set(jsonString!, key: UUID().uuidString)

_ = self.navigationController?.popViewController(animated: true)
} catch let error {
print("error: \(error)")
}
}
let server = SSHServer(name: name!,
host: hostRow!.value!,
port: port!,
user: user!,
pass: passRow!.value!)

let jsonEncoder = JSONEncoder()
let jsonData = try jsonEncoder.encode(server)
let jsonString = String(data: jsonData, encoding: .utf8)

try keychain.set(jsonString!, key: UUID().uuidString)

_ = self.navigationController?.popViewController(animated: true)
} catch let error {
print("error: \(error)")
}
}

}

override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}


/*
// MARK: - Navigation

Expand All @@ -92,5 +92,5 @@ class AddServerViewController: FormViewController {
// Pass the selected object to the new view controller.
}
*/

}
19 changes: 1 addition & 18 deletions SCP/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,12 @@
import UIKit

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDelegate {
class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
let splitViewController = window!.rootViewController as! UISplitViewController
let navigationController = splitViewController.viewControllers[splitViewController.viewControllers.count-1] as! UINavigationController
navigationController.topViewController!.navigationItem.leftBarButtonItem = splitViewController.displayModeButtonItem
splitViewController.delegate = self
return true
}

Expand All @@ -45,17 +40,5 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}

// MARK: - Split view

func splitViewController(_ splitViewController: UISplitViewController, collapseSecondary secondaryViewController:UIViewController, onto primaryViewController:UIViewController) -> Bool {
guard let secondaryAsNavController = secondaryViewController as? UINavigationController else { return false }
guard let topAsDetailController = secondaryAsNavController.topViewController as? DetailViewController else { return false }
if topAsDetailController.detailItem == nil {
// Return true to indicate that we have handled the collapse by doing nothing; the secondary controller will be discarded.
return true
}
return false
}

}

24 changes: 3 additions & 21 deletions SCP/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="RMx-3f-FxP">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
Expand Down Expand Up @@ -85,6 +85,7 @@
</prototypes>
</tableView>
</subviews>
<gestureRecognizers/>
<constraints>
<constraint firstItem="7GB-Gy-rlc" firstAttribute="leading" secondItem="Elt-Ps-0Gw" secondAttribute="trailing" id="44a-h5-Mat"/>
<constraint firstItem="7GB-Gy-rlc" firstAttribute="leading" secondItem="Elt-Ps-0Gw" secondAttribute="trailing" id="CeC-Qv-nbv"/>
Expand Down Expand Up @@ -131,20 +132,6 @@
</objects>
<point key="canvasLocation" x="709" y="129"/>
</scene>
<!--Split View Controller-->
<scene sceneID="Nki-YV-4Qg">
<objects>
<splitViewController id="H1p-Uh-vWS" sceneMemberID="viewController">
<toolbarItems/>
<connections>
<segue destination="RMx-3f-FxP" kind="relationship" relationship="masterViewController" id="BlO-5A-QYV"/>
<segue destination="vC3-pB-5Vb" kind="relationship" relationship="detailViewController" id="Tll-UG-LXB"/>
</connections>
</splitViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="cZU-Oi-B1e" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-856" y="-330"/>
</scene>
<!--Master-->
<scene sceneID="smW-Zh-WAh">
<objects>
Expand Down Expand Up @@ -178,9 +165,6 @@
</subviews>
</tableViewCellContentView>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<segue destination="vC3-pB-5Vb" kind="showDetail" identifier="showDetail" id="o78-16-a9E"/>
</connections>
</tableViewCell>
</prototypes>
<sections/>
Expand All @@ -194,6 +178,7 @@
</navigationItem>
<connections>
<segue destination="Med-nd-tev" kind="show" identifier="add_server" id="t5H-Yb-1Xp"/>
<segue destination="vC3-pB-5Vb" kind="presentation" identifier="showDetail" id="j63-C1-9tT"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Rux-fX-hf1" sceneMemberID="firstResponder"/>
Expand Down Expand Up @@ -232,7 +217,4 @@
<point key="canvasLocation" x="-45" y="129"/>
</scene>
</scenes>
<inferredMetricsTieBreakers>
<segue reference="Tll-UG-LXB"/>
</inferredMetricsTieBreakers>
</document>
Loading

0 comments on commit d8866d5

Please sign in to comment.