Merge pull request #11 from ArchimboldiMao/master

Version 1.0.4 (Build 6)

Author: ArchimboldiMao

remotex-iOS.xcodeproj/project.pbxproj

@@ -644,6 +644,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
@@ -669,6 +670,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -696,6 +698,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -713,6 +716,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -724,6 +728,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "remotex-iOS/Info.plist";
@@ -743,6 +748,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "remotex-iOS/Info.plist";

remotex-iOS/Controller/JobFeedTableNodeController.swift

@@ -175,9 +175,10 @@ extension JobFeedTableNodeController: ASTableDelegate, ASTableDataSource {
 
     func tableNode(_ tableNode: ASTableNode, didSelectRowAt indexPath: IndexPath) {
         let job = jobFeed.jobs[indexPath.row]
+        let jobTitle = job.jobTitle
         let jobID = job.jobID
         let url = URL.URLForJobRedirect(withID: jobID)
-        let jobViewController = JobWebViewController.init(withURL: url)
+        let jobViewController = JobWebViewController.init(withURL: url, withTitle: jobTitle)
         self.navigationController?.pushViewController(jobViewController, animated: true)
         tableNode.deselectRow(at: indexPath, animated: false)
     }
@@ -188,9 +189,10 @@ extension JobFeedTableNodeController: UIViewControllerPreviewingDelegate {
     public func previewingContext(_ previewingContext: UIViewControllerPreviewing, viewControllerForLocation location: CGPoint) -> UIViewController? {
         if let indexPath = self.node.indexPathForRow(at: location) {
             let job = jobFeed.jobs[indexPath.row]
+            let jobTitle = job.jobTitle
             let jobID = job.jobID
             let url = URL.URLForJobRedirect(withID: jobID)
-            let jobViewController = JobWebViewController.init(withURL: url)
+            let jobViewController = JobWebViewController.init(withURL: url, withTitle: jobTitle)
             return jobViewController
         } else {
             return nil

remotex-iOS/Controller/JobWebViewController.swift

@@ -12,17 +12,19 @@ import WebKit
 class JobWebViewController: UIViewController, WKNavigationDelegate {
 
     var url: URL!
+    var jobTitle: String!
 
     var webView: WKWebView!
 
     var progressView: UIProgressView!
 
     convenience init() {
-        self.init(withURL: nil)
+        self.init(withURL: nil, withTitle: nil)
     }
 
-    init(withURL url: URL!) {
+    init(withURL url: URL!, withTitle jobTitle: String!) {
         self.url = url
+        self.jobTitle = jobTitle
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -46,11 +48,11 @@ class JobWebViewController: UIViewController, WKNavigationDelegate {
         super.viewDidLoad()
 
         setupProgressView()
+        setupNavigation()
         webView.load(URLRequest(url: url))
         webView.allowsBackForwardNavigationGestures = true
         webView.allowsLinkPreview = true
         webView.addObserver(self, forKeyPath: #keyPath(WKWebView.estimatedProgress), options: .new, context: nil)
-        
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -107,6 +109,21 @@ class JobWebViewController: UIViewController, WKNavigationDelegate {
         }
     }
 
+    func setupNavigation() {
+        self.navigationItem.rightBarButtonItem = UIBarButtonItem.init(barButtonSystemItem: UIBarButtonSystemItem.action, target: self, action: #selector(shareAction))
+    }
+    
+    func shareAction() {
+        let image = Constants.ShareContext.LogoImage
+        let shareTitle: String! = self.jobTitle
+        let shareURL: URL! = self.url
+        var shareObject = [Any]()
+        shareObject = [image, shareURL, shareTitle] as [Any]
+        let activityViewController = UIActivityViewController(activityItems: shareObject, applicationActivities: nil)
+        activityViewController.popoverPresentationController?.sourceView = self.view // so that iPads won't crash
+        self.present(activityViewController, animated: true, completion: nil)
+    }
+    
     func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
         setupProgressView()
     }

remotex-iOS/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.3</string>
+	<string>1.0.4</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>6</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

remotex-iOS/Model/AboutModel.swift

@@ -35,7 +35,7 @@ struct AboutModel {
         self.remoteXWebSite = "https://remotex.ooclab.org"
         self.remoteXSlack = "https://remotex.slack.com"
         self.remoteXEmail = "admin@ooclab.org"
-        self.linkInfo = "联系方式\n网 站：\(remoteXWebSite)\nSlack：\(remoteXSlack)\n邮 件：\(remoteXEmail)\nqq群: remotex 633498747\n微信群: 加 lijian_gnu 拉入群"
+        self.linkInfo = "联系方式\n网 站：\(remoteXWebSite)\nSlack：\(remoteXSlack)\n邮 件：\(remoteXEmail)\nQQ: RemoteX 633498747\n微信: lijian_gnu（手动拉入微信群）"
 
     }
 }

remotex-iOSTests/View/AboutNodeTests.swift

@@ -66,7 +66,7 @@ class AboutNodeTests: FBSnapshotTestCase {
 
         XCTAssertNotNil(linkInfoNode)
         XCTAssertEqual(linkInfoNode.view.frame, CGRect.init(x: 0, y: 0, width: 0, height: 0))
-        let linkInfoText = "联系方式\n网 站：https://remotex.ooclab.org\nSlack：https://remotex.slack.com\n邮 件：admin@ooclab.org\nqq群: remotex 633498747\n微信群: 加 lijian_gnu 拉入群"
+        let linkInfoText = "联系方式\n网 站：https://remotex.ooclab.org\nSlack：https://remotex.slack.com\n邮 件：admin@ooclab.org\nQQ: RemoteX 633498747\n微信: lijian_gnu（手动拉入微信群）"
         XCTAssertEqual(linkInfoNode.attributedText?.string, linkInfoText)
 
         XCTAssertNotNil(versionNode)