From ecc20ad9e3ea18359feee129c12a948f244f48c0 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Sat, 28 Mar 2020 17:51:14 -0500
Subject: [PATCH] Enabled adding a CloudKit account on iOS.

---
 NetNewsWire.xcodeproj/project.pbxproj         |   4 +
 iOS/Account/Account.storyboard                |  82 +++++++++++++++++-
 .../CloudKitAccountViewController.swift       |  47 ++++++++++
 iOS/AppAssets.swift                           |   8 +-
 .../accountCloudKit.imageset/Contents.json    |  15 ++++
 .../accountCloudKit.imageset/icloud.pdf       | Bin 0 -> 4251 bytes
 iOS/Settings/AddAccountViewController.swift   |  13 ++-
 7 files changed, 161 insertions(+), 8 deletions(-)
 create mode 100644 iOS/Account/CloudKitAccountViewController.swift
 create mode 100644 iOS/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json
 create mode 100644 iOS/Resources/Assets.xcassets/accountCloudKit.imageset/icloud.pdf

diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index dbc9bcd58..6bc186734 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -45,6 +45,7 @@
 		512AF9C2236ED52C0066F8BE /* ImageHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 512AF9C1236ED52C0066F8BE /* ImageHeaderView.swift */; };
 		512AF9DD236F05230066F8BE /* InteractiveLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 512AF9DC236F05230066F8BE /* InteractiveLabel.swift */; };
 		512D554423C804DE0023FFFA /* OpenInSafariActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 512D554323C804DE0023FFFA /* OpenInSafariActivity.swift */; };
+		512DD4C92430086400C17B1F /* CloudKitAccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 512DD4C82430086400C17B1F /* CloudKitAccountViewController.swift */; };
 		512E08E62268800D00BDCFDD /* FolderTreeControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A97A11ED9F180007D329B /* FolderTreeControllerDelegate.swift */; };
 		512E08E72268801200BDCFDD /* WebFeedTreeControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A97611ED9EB96007D329B /* WebFeedTreeControllerDelegate.swift */; };
 		512E09012268907400BDCFDD /* MasterFeedTableViewSectionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 512E08F722688F7C00BDCFDD /* MasterFeedTableViewSectionHeader.swift */; };
@@ -1282,6 +1283,7 @@
 		512AF9C1236ED52C0066F8BE /* ImageHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageHeaderView.swift; sourceTree = "<group>"; };
 		512AF9DC236F05230066F8BE /* InteractiveLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InteractiveLabel.swift; sourceTree = "<group>"; };
 		512D554323C804DE0023FFFA /* OpenInSafariActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenInSafariActivity.swift; sourceTree = "<group>"; };
+		512DD4C82430086400C17B1F /* CloudKitAccountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudKitAccountViewController.swift; sourceTree = "<group>"; };
 		512E08F722688F7C00BDCFDD /* MasterFeedTableViewSectionHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterFeedTableViewSectionHeader.swift; sourceTree = "<group>"; };
 		51314617235A797400387FDC /* NetNewsWire_iOSintentextension_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetNewsWire_iOSintentextension_target.xcconfig; sourceTree = "<group>"; };
 		51314637235A7BBE00387FDC /* NetNewsWire iOS Intents Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "NetNewsWire iOS Intents Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1875,6 +1877,7 @@
 			children = (
 				516A093F2361240900EAE89B /* Account.storyboard */,
 				51A1698F235E10D600EB091F /* LocalAccountViewController.swift */,
+				512DD4C82430086400C17B1F /* CloudKitAccountViewController.swift */,
 				51A16996235E10D700EB091F /* FeedbinAccountViewController.swift */,
 				3B3A328B238B820900314204 /* FeedWranglerAccountViewController.swift */,
 				769F2D3643779DB02786278E /* NewsBlurAccountViewController.swift */,
@@ -3926,6 +3929,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				51E36E71239D6610006F47A5 /* AddWebFeedSelectFolderTableViewCell.swift in Sources */,
+				512DD4C92430086400C17B1F /* CloudKitAccountViewController.swift in Sources */,
 				840D617F2029031C009BC708 /* AppDelegate.swift in Sources */,
 				51236339236915B100951F16 /* RoundedProgressView.swift in Sources */,
 				512E08E72268801200BDCFDD /* WebFeedTreeControllerDelegate.swift in Sources */,
diff --git a/iOS/Account/Account.storyboard b/iOS/Account/Account.storyboard
index 868dbba71..9de54a8dd 100644
--- a/iOS/Account/Account.storyboard
+++ b/iOS/Account/Account.storyboard
@@ -10,7 +10,7 @@
         <!--Modal Navigation Controller-->
         <scene sceneID="98f-PW-S1C">
             <objects>
-                <navigationController storyboardIdentifier="AddLocalAccountNavigationViewController" id="TMY-HB-vAu" customClass="ModalNavigationController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="LocalAccountNavigationViewController" id="TMY-HB-vAu" customClass="ModalNavigationController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="p8g-7e-3f4">
                         <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -21,7 +21,7 @@
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="6sV-68-OXu" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2506" y="-528"/>
+            <point key="canvasLocation" x="1880" y="-528"/>
         </scene>
         <!--Modal Navigation Controller-->
         <scene sceneID="6i4-ho-e4F">
@@ -271,7 +271,7 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="XJD-sO-MSq" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2505.7971014492755" y="144.64285714285714"/>
+            <point key="canvasLocation" x="1880" y="145"/>
         </scene>
         <!--Feedbin-->
         <scene sceneID="IDj-HA-olN">
@@ -440,7 +440,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Username or Email" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="S4v-fs-DIO">
-                                                    <rect key="frame" x="20" y="11.5" width="334" height="21"/>
+                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="emailAddress" textContentType="username"/>
                                                 </textField>
@@ -555,6 +555,80 @@
             </objects>
             <point key="canvasLocation" x="4562" y="145"/>
         </scene>
+        <!--Modal Navigation Controller-->
+        <scene sceneID="gfi-2F-rht">
+            <objects>
+                <navigationController storyboardIdentifier="CloudKitAccountNavigationViewController" id="LhW-Dq-qqj" customClass="ModalNavigationController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="MVG-BZ-ALL">
+                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="qj9-Vr-VIU" kind="relationship" relationship="rootViewController" id="n8n-iF-qeC"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="z9f-5I-8GC" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2533" y="-528"/>
+        </scene>
+        <!--iCloud-->
+        <scene sceneID="ULt-VE-viU">
+            <objects>
+                <tableViewController id="qj9-Vr-VIU" customClass="CloudKitAccountViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="j6U-sh-M9y">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <sections>
+                            <tableViewSection id="bGn-Io-KuQ">
+                                <cells>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="FSY-KL-m3i" customClass="VibrantTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
+                                        <rect key="frame" x="20" y="18" width="374" height="43.5"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="FSY-KL-m3i" id="ds7-ib-VgJ">
+                                            <rect key="frame" x="0.0" y="0.0" width="374" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="T1S-zH-rIp" customClass="VibrantButton" customModule="NetNewsWire" customModuleProvider="target">
+                                                    <rect key="frame" x="0.0" y="0.0" width="374" height="44"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="44" id="dOv-Gz-h7s"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                    <state key="normal" title="Add Account">
+                                                        <color key="titleColor" name="secondaryAccentColor"/>
+                                                    </state>
+                                                    <connections>
+                                                        <action selector="add:" destination="qj9-Vr-VIU" eventType="touchUpInside" id="kUm-lW-g62"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="T1S-zH-rIp" firstAttribute="leading" secondItem="ds7-ib-VgJ" secondAttribute="leading" id="7F5-Ym-ew3"/>
+                                                <constraint firstAttribute="trailing" secondItem="T1S-zH-rIp" secondAttribute="trailing" id="ON3-nQ-kd8"/>
+                                                <constraint firstItem="T1S-zH-rIp" firstAttribute="centerY" secondItem="ds7-ib-VgJ" secondAttribute="centerY" id="dAM-F2-peY"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
+                        </sections>
+                        <connections>
+                            <outlet property="dataSource" destination="qj9-Vr-VIU" id="j7u-Yd-rbe"/>
+                            <outlet property="delegate" destination="qj9-Vr-VIU" id="NhE-Pt-JGp"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" title="iCloud" id="idp-kp-cGU">
+                        <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="hKZ-OI-mTV">
+                            <connections>
+                                <action selector="cancel:" destination="qj9-Vr-VIU" id="n5q-9M-3ME"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="weY-OS-9NV" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2533" y="145"/>
+        </scene>
     </scenes>
     <resources>
         <namedColor name="secondaryAccentColor">
diff --git a/iOS/Account/CloudKitAccountViewController.swift b/iOS/Account/CloudKitAccountViewController.swift
new file mode 100644
index 000000000..e26135ffd
--- /dev/null
+++ b/iOS/Account/CloudKitAccountViewController.swift
@@ -0,0 +1,47 @@
+//
+//  CloudKitAccountViewController.swift
+//  NetNewsWire-iOS
+//
+//  Created by Maurice Parker on 3/28/20.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import UIKit
+import Account
+
+class CloudKitAccountViewController: UITableViewController {
+
+	weak var delegate: AddAccountDismissDelegate?
+
+	override func viewDidLoad() {
+		super.viewDidLoad()
+
+		tableView.register(ImageHeaderView.self, forHeaderFooterViewReuseIdentifier: "SectionHeader")
+	}
+
+	@IBAction func cancel(_ sender: Any) {
+		dismiss(animated: true, completion: nil)
+		delegate?.dismiss()
+	}
+	
+	@IBAction func add(_ sender: Any) {
+		_ = AccountManager.shared.createAccount(type: .cloudKit)
+		dismiss(animated: true, completion: nil)
+		delegate?.dismiss()
+	}
+	
+	override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+		return section == 0 ? ImageHeaderView.rowHeight : super.tableView(tableView, heightForHeaderInSection: section)
+	}
+	
+	override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+		if section == 0 {
+			let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView
+			headerView.imageView.image = AppAssets.image(for: .cloudKit)
+			return headerView
+		} else {
+			return super.tableView(tableView, viewForHeaderInSection: section)
+		}
+	}
+	
+}
diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift
index 17473357b..58d600aef 100644
--- a/iOS/AppAssets.swift
+++ b/iOS/AppAssets.swift
@@ -19,6 +19,10 @@ struct AppAssets {
 		return UIImage(named: "accountLocalPhone")!
 	}()
 
+	static var accountCloudKitImage: UIImage = {
+		return UIImage(named: "accountCloudKit")!
+	}()
+
 	static var accountFeedbinImage: UIImage = {
 		return UIImage(named: "accountFeedbin")!
 	}()
@@ -234,6 +238,8 @@ struct AppAssets {
 			} else {
 				return AppAssets.accountLocalPhoneImage
 			}
+		case .cloudKit:
+			return AppAssets.accountCloudKitImage
 		case .feedbin:
 			return AppAssets.accountFeedbinImage
 		case .feedly:
@@ -244,8 +250,6 @@ struct AppAssets {
 			return AppAssets.accountFreshRSSImage
 		case .newsBlur:
 			return AppAssets.accountNewsBlurImage
-		default:
-			return nil
 		}
 	}
 	
diff --git a/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json b/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json
new file mode 100644
index 000000000..fc07d2975
--- /dev/null
+++ b/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "icloud.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/icloud.pdf b/iOS/Resources/Assets.xcassets/accountCloudKit.imageset/icloud.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..74406f4cbf5e9bdd80f425de4421e074993302ef
GIT binary patch
literal 4251
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

literal 0
HcmV?d00001

diff --git a/iOS/Settings/AddAccountViewController.swift b/iOS/Settings/AddAccountViewController.swift
index 7b3b91318..e3d55dc1f 100644
--- a/iOS/Settings/AddAccountViewController.swift
+++ b/iOS/Settings/AddAccountViewController.swift
@@ -17,7 +17,7 @@ protocol AddAccountDismissDelegate: UIViewController {
 class AddAccountViewController: UITableViewController, AddAccountDismissDelegate {
 
 	#if DEBUG
-	private var addableAccountTypes: [AccountType] = [.onMyMac, .feedbin, .feedly, .feedWrangler, .newsBlur]
+	private var addableAccountTypes: [AccountType] = [.onMyMac, .cloudKit, .feedbin, .feedly, .feedWrangler, .newsBlur]
 	#else
 	private var addableAccountTypes: [AccountType] = [.onMyMac, .feedbin, .feedly]
 	#endif
@@ -46,6 +46,9 @@ class AddAccountViewController: UITableViewController, AddAccountDismissDelegate
 		case .onMyMac:
 			cell.accountNameLabel?.text = Account.defaultLocalAccountName
 			cell.accountImage?.image = AppAssets.image(for: .onMyMac)
+		case .cloudKit:
+			cell.accountNameLabel?.text = NSLocalizedString("CloudKit", comment: "CloudKit")
+			cell.accountImage?.image = AppAssets.accountCloudKitImage
 		case .feedbin:
 			cell.accountNameLabel?.text = NSLocalizedString("Feedbin", comment: "Feedbin")
 			cell.accountImage?.image = AppAssets.accountFeedbinImage
@@ -68,11 +71,17 @@ class AddAccountViewController: UITableViewController, AddAccountDismissDelegate
 	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
 		switch addableAccountTypes[indexPath.row] {
 		case .onMyMac:
-			let navController = UIStoryboard.account.instantiateViewController(withIdentifier: "AddLocalAccountNavigationViewController") as! UINavigationController
+			let navController = UIStoryboard.account.instantiateViewController(withIdentifier: "LocalAccountNavigationViewController") as! UINavigationController
 			navController.modalPresentationStyle = .currentContext
 			let addViewController = navController.topViewController as! LocalAccountViewController
 			addViewController.delegate = self
 			present(navController, animated: true)
+		case .cloudKit:
+			let navController = UIStoryboard.account.instantiateViewController(withIdentifier: "CloudKitAccountNavigationViewController") as! UINavigationController
+			navController.modalPresentationStyle = .currentContext
+			let addViewController = navController.topViewController as! CloudKitAccountViewController
+			addViewController.delegate = self
+			present(navController, animated: true)
 		case .feedbin:
 			let navController = UIStoryboard.account.instantiateViewController(withIdentifier: "FeedbinAccountNavigationViewController") as! UINavigationController
 			navController.modalPresentationStyle = .currentContext