Merge pull request #2528 from stuartbreckenridge/ios-addaccount-ui-refresh

Add Accounts UI Refresh

Mac/Resources/Assets.xcassets/Account icon colors/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Mac/Resources/Assets.xcassets/Account icon colors/bazquxColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.800",
+          "green" : "0.600",
+          "red" : "0.200"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.761",
+          "green" : "0.561",
+          "red" : "0.169"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Mac/Resources/Assets.xcassets/Account icon colors/cloudkitColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.698",
+          "green" : "0.682",
+          "red" : "0.682"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.400",
+          "green" : "0.388",
+          "red" : "0.388"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Mac/Resources/Assets.xcassets/Account icon colors/feedbinColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.808",
+          "green" : "0.369",
+          "red" : "0.027"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.753",
+          "green" : "0.271",
+          "red" : "0.027"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Mac/Resources/Assets.xcassets/Account icon colors/feedlyColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.298",
+          "green" : "0.694",
+          "red" : "0.169"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.220",
+          "green" : "0.616",
+          "red" : "0.090"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Mac/Resources/Assets.xcassets/Account icon colors/feedwranglerColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.737",
+          "green" : "0.569",
+          "red" : "0.118"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.698",
+          "green" : "0.529",
+          "red" : "0.078"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Mac/Resources/Assets.xcassets/Account icon colors/freshRSSColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.741",
+          "green" : "0.384",
+          "red" : "0.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.663",
+          "green" : "0.306",
+          "red" : "0.004"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Mac/Resources/Assets.xcassets/Account icon colors/inoreaderColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.780",
+          "green" : "0.482",
+          "red" : "0.004"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.702",
+          "green" : "0.404",
+          "red" : "0.004"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Mac/Resources/Assets.xcassets/Account icon colors/localColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "0.478",
+          "red" : "0.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "0.518",
+          "red" : "0.039"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Mac/Resources/Assets.xcassets/Account icon colors/newsblurColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.000",
+          "green" : "0.584",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.039",
+          "green" : "0.624",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Mac/Resources/Assets.xcassets/Account icon colors/theoldreaderColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.000",
+          "green" : "0.145",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.000",
+          "green" : "0.067",
+          "red" : "0.882"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NetNewsWire.xcodeproj/project.pbxproj

@@ -23,6 +23,8 @@
 		1729529524AA1CAA00D65E66 /* GeneralPreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1729529224AA1CAA00D65E66 /* GeneralPreferencesView.swift */; };
 		1729529724AA1CD000D65E66 /* MacPreferencePanes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1729529624AA1CD000D65E66 /* MacPreferencePanes.swift */; };
 		1729529B24AA1FD200D65E66 /* MacSearchField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1729529A24AA1FD200D65E66 /* MacSearchField.swift */; };
+		173A64172547BE0900267F6E /* AccountType+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173A64162547BE0900267F6E /* AccountType+Helpers.swift */; };
+		173A642C2547BE9600267F6E /* AccountType+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 173A64162547BE0900267F6E /* AccountType+Helpers.swift */; };
 		175942AA24AD533200585066 /* RefreshInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCE4226F4DFA0010922C /* RefreshInterval.swift */; };
 		175942AB24AD533200585066 /* RefreshInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5183CCE4226F4DFA0010922C /* RefreshInterval.swift */; };
 		1769E32224BC5925000E1E8E /* AccountsPreferencesModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1769E32124BC5925000E1E8E /* AccountsPreferencesModel.swift */; };
@@ -1453,6 +1455,7 @@
 		1729529224AA1CAA00D65E66 /* GeneralPreferencesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneralPreferencesView.swift; sourceTree = "<group>"; };
 		1729529624AA1CD000D65E66 /* MacPreferencePanes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MacPreferencePanes.swift; sourceTree = "<group>"; };
 		1729529A24AA1FD200D65E66 /* MacSearchField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacSearchField.swift; sourceTree = "<group>"; };
+		173A64162547BE0900267F6E /* AccountType+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AccountType+Helpers.swift"; sourceTree = "<group>"; };
 		1769E32124BC5925000E1E8E /* AccountsPreferencesModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsPreferencesModel.swift; sourceTree = "<group>"; };
 		1769E32424BC5A65000E1E8E /* AddAccountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAccountView.swift; sourceTree = "<group>"; };
 		1769E32624BC5B6C000E1E8E /* AddAccountModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAccountModel.swift; sourceTree = "<group>"; };
@@ -3303,6 +3306,7 @@
 				849A97561ED9EB0D007D329B /* Extensions */,
 				510C43F5243D0325009F70C3 /* ExtensionPoints */,
 				511D43CE231FA51100FB1562 /* Resources */,
+				173A64162547BE0900267F6E /* AccountType+Helpers.swift */,
 			);
 			path = Shared;
 			sourceTree = "<group>";
@@ -5118,6 +5122,7 @@
 				5108F6B72375E612001ABC45 /* CacheCleaner.swift in Sources */,
 				518651DA235621840078E021 /* ImageTransition.swift in Sources */,
 				51C266EA238C334800F53014 /* ContextMenuPreviewViewController.swift in Sources */,
+				173A642C2547BE9600267F6E /* AccountType+Helpers.swift in Sources */,
 				51627A6923861DED007B3B4B /* MasterFeedViewController+Drop.swift in Sources */,
 				514219372352510100E07E2C /* ImageScrollView.swift in Sources */,
 				516AE9B32371C372007DEEAA /* MasterFeedTableViewSectionHeaderLayout.swift in Sources */,
@@ -5278,6 +5283,7 @@
 				848D578E21543519005FFAD5 /* PasteboardWebFeed.swift in Sources */,
 				5144EA2F2279FAB600D19003 /* AccountsDetailViewController.swift in Sources */,
 				849A97801ED9EC42007D329B /* DetailViewController.swift in Sources */,
+				173A64172547BE0900267F6E /* AccountType+Helpers.swift in Sources */,
 				518C3193237B00D9004D740F /* DetailIconSchemeHandler.swift in Sources */,
 				84C9FC6722629B9000D921D6 /* AppDelegate.swift in Sources */,
 				510C417F24E5D1AE008226FD /* ExtensionContainersFile.swift in Sources */,

Shared/AccountType+Helpers.swift

@@ -0,0 +1,64 @@
+//
+//  AccountType+Helpers.swift
+//  NetNewsWire
+//
+//  Created by Stuart Breckenridge on 27/10/20.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import Foundation
+import Account
+#if os(macOS)
+import AppKit
+#else
+import UIKit
+#endif
+
+extension AccountType {
+	
+	// TODO: Move this to the Account Package.
+	
+	func localizedAccountName() -> String {
+		
+		switch self {
+		case .onMyMac:
+			let defaultName: String
+			#if os(macOS)
+			defaultName = NSLocalizedString("On My Mac", comment: "Account name")
+			#else
+			if UIDevice.current.userInterfaceIdiom == .pad {
+				defaultName = NSLocalizedString("On My iPad", comment: "Account name")
+			} else {
+				defaultName = NSLocalizedString("On My iPhone", comment: "Account name")
+			}
+			#endif
+			return defaultName
+		case .bazQux:
+			return NSLocalizedString("BazQux", comment: "Account name")
+		case .cloudKit:
+			return NSLocalizedString("iCloud", comment: "Account name")
+		case .feedWrangler:
+			return NSLocalizedString("FeedWrangler", comment: "Account name")
+		case .feedbin:
+			return NSLocalizedString("Feedbin", comment: "Account name")
+		case .feedly:
+			return NSLocalizedString("Feedly", comment: "Account name")
+		case .freshRSS:
+			return NSLocalizedString("FreshRSS", comment: "Account name")
+		case .inoreader:
+			return NSLocalizedString("Inoreader", comment: "Account name")
+		case .newsBlur:
+			return NSLocalizedString("NewsBlur", comment: "Account name")
+		case .theOldReader:
+			return NSLocalizedString("The Old Reader", comment: "Account name")
+		default:
+			return ""
+		}
+		
+		
+		
+		
+		
+	}
+
+}

iOS/Resources/Assets.xcassets/Account icon colors/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Resources/Assets.xcassets/Account icon colors/bazquxColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "204",
+          "green" : "153",
+          "red" : "51"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "194",
+          "green" : "143",
+          "red" : "43"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Resources/Assets.xcassets/Account icon colors/cloudkitColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "178",
+          "green" : "174",
+          "red" : "174"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "102",
+          "green" : "99",
+          "red" : "99"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Resources/Assets.xcassets/Account icon colors/feedbinColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "206",
+          "green" : "94",
+          "red" : "7"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "192",
+          "green" : "69",
+          "red" : "7"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Resources/Assets.xcassets/Account icon colors/feedlyColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "76",
+          "green" : "177",
+          "red" : "43"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "56",
+          "green" : "157",
+          "red" : "23"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Resources/Assets.xcassets/Account icon colors/feedwranglerColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "188",
+          "green" : "145",
+          "red" : "30"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "178",
+          "green" : "135",
+          "red" : "20"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Resources/Assets.xcassets/Account icon colors/freshRSSColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "189",
+          "green" : "98",
+          "red" : "0"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "169",
+          "green" : "78",
+          "red" : "1"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Resources/Assets.xcassets/Account icon colors/inoreaderColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "199",
+          "green" : "123",
+          "red" : "1"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "179",
+          "green" : "103",
+          "red" : "1"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Resources/Assets.xcassets/Account icon colors/localColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "255",
+          "green" : "122",
+          "red" : "0"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "255",
+          "green" : "132",
+          "red" : "10"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Resources/Assets.xcassets/Account icon colors/newsblurColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0",
+          "green" : "149",
+          "red" : "255"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "10",
+          "green" : "159",
+          "red" : "255"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Resources/Assets.xcassets/Account icon colors/theoldreaderColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x00",
+          "green" : "0x25",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0",
+          "green" : "17",
+          "red" : "225"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOS/Resources/Assets.xcassets/accountBazQux.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "bazqux-logo.png",
+      "filename" : "bazqux-any.pdf",
       "idiom" : "universal"
     }
   ],
@@ -11,6 +11,6 @@
   },
   "properties" : {
     "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

iOS/Resources/Assets.xcassets/accountCloudKit.imageset/Contents.json

@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "icloud.pdf",
+      "filename" : "CloudKitAny.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "CloudKitDark.pdf",
       "idiom" : "universal"
     }
   ],
@@ -10,6 +20,6 @@
     "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

iOS/Resources/Assets.xcassets/accountFeedWrangler.imageset/Contents.json

@@ -1,15 +1,59 @@
 {
   "images" : [
     {
+      "filename" : "feedwranger-any.png",
       "idiom" : "universal",
-      "filename" : "outline-512.png"
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedwranger-dark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "feedwranger-any@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedwranger-dark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "feedwranger-any@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedwranger-dark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
-}
+}

iOS/Resources/Assets.xcassets/accountFeedbin.imageset/Contents.json

@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "feedbin-logo.pdf",
+      "filename" : "feedbin-logo-filled-1.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedbin-logo-filled.pdf",
       "idiom" : "universal"
     }
   ],
@@ -11,6 +21,6 @@
   },
   "properties" : {
     "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

iOS/Resources/Assets.xcassets/accountFeedly.imageset/Contents.json

@@ -1,15 +1,25 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
+      "filename" : "feedly-logo-any.pdf",
-      "filename" : "accountFeedly.pdf"
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "feedly-logo-dark.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
-}
+}

iOS/Resources/Assets.xcassets/accountFreshRSS.imageset/Contents.json

@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
+      "filename" : "freshrss-any.pdf",
-      "filename" : "accountFreshRSS.pdf"
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
-}
+}

iOS/Resources/Assets.xcassets/accountInoreader.imageset/Contents.json

@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "inoreader_logo.pdf",
+      "filename" : "inoreader_logo-any.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "inoreader_logo-dark.pdf",
       "idiom" : "universal"
     }
   ],
@@ -11,6 +21,6 @@
   },
   "properties" : {
     "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

iOS/Resources/Assets.xcassets/accountLocalPad.imageset/Contents.json

@@ -1,16 +1,26 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
+      "filename" : "accountLocalPad-any.pdf",
-      "filename" : "localAccountPad.pdf"
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "accountLocalPad-dark.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template",
+    "preserves-vector-representation" : true,
-    "preserves-vector-representation" : true
+    "template-rendering-intent" : "original"
   }
-}
+}

iOS/Resources/Assets.xcassets/accountLocalPhone.imageset/Contents.json

@@ -1,16 +1,26 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
+      "filename" : "accountLocalPhone-any.pdf",
-      "filename" : "localAccountPhone.pdf"
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "accountLocalPhone-dark.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template",
+    "preserves-vector-representation" : true,
-    "preserves-vector-representation" : true
+    "template-rendering-intent" : "original"
   }
-}
+}

iOS/Resources/Assets.xcassets/accountNewsBlur.imageset/Contents.json

@@ -1,15 +1,15 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
+      "filename" : "NewsBlur.pdf",
-      "filename" : "newsblur-512.png"
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
-}
+}

iOS/Resources/Assets.xcassets/accountTheOldReader.imageset/Contents.json

@@ -1,7 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "oldreader-icon.pdf",
+      "filename" : "theOldReaderAny.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "theOldReaderDark.pdf",
       "idiom" : "universal"
     }
   ],
@@ -11,6 +21,6 @@
   },
   "properties" : {
     "preserves-vector-representation" : true,
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original"
   }
 }

iOS/Settings/AddAccountViewController.swift

@@ -16,6 +16,52 @@ protocol AddAccountDismissDelegate: UIViewController {
 
 class AddAccountViewController: UITableViewController, AddAccountDismissDelegate {
 
+	private enum AddAccountSections: Int, CaseIterable {
+		case local = 0
+		case icloud
+		case web
+		case selfhosted
+		
+		var sectionHeader: String {
+			switch self {
+			case .local:
+				return NSLocalizedString("Local", comment: "Local Account")
+			case .icloud:
+				return NSLocalizedString("iCloud", comment: "iCloud Account")
+			case .web:
+				return NSLocalizedString("Web", comment: "Web Account")
+			case .selfhosted:
+				return NSLocalizedString("Self-hosted", comment: "Self hosted Account")
+			}
+		}
+		
+		var sectionFooter: String {
+			switch self {
+			case .local:
+				return NSLocalizedString("Local accounts do not sync your subscriptions across devices.", comment: "Local Account")
+			case .icloud:
+				return NSLocalizedString("Use your iCloud account to sync your subscriptions across your iOS and macOS devices.", comment: "iCloud Account")
+			case .web:
+				return NSLocalizedString("Web accounts sync your subscriptions across all your devices.", comment: "Web Account")
+			case .selfhosted:
+				return NSLocalizedString("Self-hosted accounts sync your subscriptions across all your devices.", comment: "Self hosted Account")
+			}
+		}
+		
+		var sectionContent: [AccountType] {
+			switch self {
+			case .local:
+				return [.onMyMac]
+			case .icloud:
+				return [.cloudKit]
+			case .web:
+				return [.bazQux, .feedbin, .feedly, .feedWrangler, .inoreader, .newsBlur, .theOldReader]
+			case .selfhosted:
+				return [.freshRSS]
+			}
+		}
+	}
+	
 	#if DEBUG
 	private var addableAccountTypes: [AccountType] = [.onMyMac, .cloudKit, .feedbin, .feedly, .inoreader, .newsBlur, .feedWrangler, .bazQux, .theOldReader, .freshRSS]
 	#else
@@ -24,62 +70,118 @@ class AddAccountViewController: UITableViewController, AddAccountDismissDelegate
 
 	override func viewDidLoad() {
 		super.viewDidLoad()
-		restrictAccounts()
 	}
 
 	override func numberOfSections(in tableView: UITableView) -> Int {
-		1
+		return AddAccountSections.allCases.count
 	}
 	
 	override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-		return addableAccountTypes.count
+		if section == AddAccountSections.local.rawValue {
+			return AddAccountSections.local.sectionContent.count
+		}
+		
+		if section == AddAccountSections.icloud.rawValue {
+			return AddAccountSections.icloud.sectionContent.count
+		}
+		
+		if section == AddAccountSections.web.rawValue {
+			return AddAccountSections.web.sectionContent.count
+		}
+		
+		if section == AddAccountSections.selfhosted.rawValue {
+			return AddAccountSections.selfhosted.sectionContent.count
+		}
+
+		return 0
 	}
 	
-	override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+	override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-		return 52.0
+		switch section {
+		case AddAccountSections.local.rawValue:
+			return AddAccountSections.local.sectionHeader
+		case AddAccountSections.icloud.rawValue:
+			return AddAccountSections.icloud.sectionHeader
+		case AddAccountSections.web.rawValue:
+			return AddAccountSections.web.sectionHeader
+		case AddAccountSections.selfhosted.rawValue:
+			return AddAccountSections.selfhosted.sectionHeader
+		default:
+			return nil
+		}
 	}
 	
+	override func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {
+		switch section {
+		case AddAccountSections.local.rawValue:
+			return AddAccountSections.local.sectionFooter
+		case AddAccountSections.icloud.rawValue:
+			return AddAccountSections.icloud.sectionFooter
+		case AddAccountSections.web.rawValue:
+			return AddAccountSections.web.sectionFooter
+		case AddAccountSections.selfhosted.rawValue:
+			return AddAccountSections.selfhosted.sectionFooter
+		default:
+			return nil
+		}
+	}
+	
+//	override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+//		return 52.0
+//	}
+	
 	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
 		let cell = tableView.dequeueReusableCell(withIdentifier: "SettingsAccountTableViewCell", for: indexPath) as! SettingsComboTableViewCell
 		
-		switch addableAccountTypes[indexPath.row] {
+		switch indexPath.section {
-		case .onMyMac:
+		case AddAccountSections.local.rawValue:
-			cell.comboNameLabel?.text = Account.defaultLocalAccountName
+			cell.comboNameLabel?.text = AddAccountSections.local.sectionContent[indexPath.row].localizedAccountName()
 			cell.comboImage?.image = AppAssets.image(for: .onMyMac)
-		case .cloudKit:
+		case AddAccountSections.icloud.rawValue:
-			cell.comboNameLabel?.text = NSLocalizedString("iCloud", comment: "iCloud")
+			cell.comboNameLabel?.text = AddAccountSections.icloud.sectionContent[indexPath.row].localizedAccountName()
-			cell.comboImage?.image = AppAssets.accountCloudKitImage
+			cell.comboImage?.image = AppAssets.image(for: AddAccountSections.icloud.sectionContent[indexPath.row])
-		case .feedbin:
+			if AppDefaults.shared.isDeveloperBuild {
-			cell.comboNameLabel?.text = NSLocalizedString("Feedbin", comment: "Feedbin")
+				cell.isUserInteractionEnabled = false
-			cell.comboImage?.image = AppAssets.accountFeedbinImage
+			}
-		case .feedWrangler:
+		case AddAccountSections.web.rawValue:
-			cell.comboNameLabel?.text = NSLocalizedString("Feed Wrangler", comment: "Feed Wrangler")
+			cell.comboNameLabel?.text = AddAccountSections.web.sectionContent[indexPath.row].localizedAccountName()
-			cell.comboImage?.image = AppAssets.accountFeedWranglerImage
+			cell.comboImage?.image = AppAssets.image(for: AddAccountSections.web.sectionContent[indexPath.row])
-		case .feedly:
+			let type = AddAccountSections.web.sectionContent[indexPath.row]
-			cell.comboNameLabel?.text = NSLocalizedString("Feedly", comment: "Feedly")
+			if (type == .feedly || type == .feedWrangler) && AppDefaults.shared.isDeveloperBuild {
-			cell.comboImage?.image = AppAssets.accountFeedlyImage
+				cell.isUserInteractionEnabled = false
-		case .newsBlur:
+			}
-			cell.comboNameLabel?.text = NSLocalizedString("NewsBlur", comment: "NewsBlur")
+		case AddAccountSections.selfhosted.rawValue:
-			cell.comboImage?.image = AppAssets.accountNewsBlurImage
+			cell.comboNameLabel?.text = AddAccountSections.selfhosted.sectionContent[indexPath.row].localizedAccountName()
-		case .bazQux:
+			cell.comboImage?.image = AppAssets.image(for: AddAccountSections.selfhosted.sectionContent[indexPath.row])
-			cell.comboNameLabel?.text = NSLocalizedString("BazQux", comment: "BazQux")
+			
-			cell.comboImage?.image = AppAssets.accountBazQuxImage
+		default:
-		case .theOldReader:
+			return cell
-			cell.comboNameLabel?.text = NSLocalizedString("The Old Reader", comment: "The Old Reader")
-			cell.comboImage?.image = AppAssets.accountTheOldReaderImage
-		case .freshRSS:
-			cell.comboNameLabel?.text = NSLocalizedString("FreshRSS", comment: "FreshRSS")
-			cell.comboImage?.image = AppAssets.accountFreshRSSImage
-		case .inoreader:
-			cell.comboNameLabel?.text = NSLocalizedString("Inoreader", comment: "Inoreader")
-			cell.comboImage?.image = AppAssets.accountInoreaderImage
 		}
-		
 		return cell
 	}
 	
 	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-		switch addableAccountTypes[indexPath.row] {
+		
+		switch indexPath.section {
+		case AddAccountSections.local.rawValue:
+			let type = AddAccountSections.local.sectionContent[indexPath.row]
+			presentController(for: type)
+		case AddAccountSections.icloud.rawValue:
+			let type = AddAccountSections.icloud.sectionContent[indexPath.row]
+			presentController(for: type)
+		case AddAccountSections.web.rawValue:
+			let type = AddAccountSections.web.sectionContent[indexPath.row]
+			presentController(for: type)
+		case AddAccountSections.selfhosted.rawValue:
+			let type = AddAccountSections.selfhosted.sectionContent[indexPath.row]
+			presentController(for: type)
+		default:
+			return
+		}
+	}
+	
+	private func presentController(for accountType: AccountType) {
+		switch accountType {
 		case .onMyMac:
 			let navController = UIStoryboard.account.instantiateViewController(withIdentifier: "LocalAccountNavigationViewController") as! UINavigationController
 			navController.modalPresentationStyle = .currentContext
@@ -119,7 +221,7 @@ class AddAccountViewController: UITableViewController, AddAccountDismissDelegate
 			let navController = UIStoryboard.account.instantiateViewController(withIdentifier: "ReaderAPIAccountNavigationViewController") as! UINavigationController
 			navController.modalPresentationStyle = .currentContext
 			let addViewController = navController.topViewController as! ReaderAPIAccountViewController
-			addViewController.accountType = addableAccountTypes[indexPath.row]
+			addViewController.accountType = accountType
 			addViewController.delegate = self
 			present(navController, animated: true)
 		}
@@ -155,28 +257,3 @@ extension AddAccountViewController: OAuthAccountAuthorizationOperationDelegate {
 		presentError(error)
 	}
 }
-
-// MARK: Private
-
-private extension AddAccountViewController {
-	
-	func restrictAccounts() {
-		func removeAccountType(_ accountType: AccountType) {
-			if let index = addableAccountTypes.firstIndex(of: accountType) {
-				addableAccountTypes.remove(at: index)
-			}
-		}
-		
-		if AppDefaults.shared.isDeveloperBuild {
-			removeAccountType(.cloudKit)
-			removeAccountType(.feedly)
-			removeAccountType(.feedWrangler)
-			return
-		}
-
-		if AccountManager.shared.activeAccounts.firstIndex(where: { $0.type == .cloudKit }) != nil {
-			removeAccountType(.cloudKit)
-		}
-	}
-	
-}

iOS/Settings/Settings.storyboard

@@ -575,19 +575,19 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="iTt-HT-Ane">
-                                            <rect key="frame" x="20" y="11.5" width="217.5" height="32"/>
+                                            <rect key="frame" x="20" y="15" width="147.5" height="25"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="accountLocal" translatesAutoresizingMaskIntoConstraints="NO" id="tb2-dO-AhR">
-                                                    <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="25" height="25"/>
                                                     <color key="tintColor" systemColor="labelColor"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="32" id="0GF-vU-aEc"/>
+                                                        <constraint firstAttribute="height" constant="25" id="0GF-vU-aEc"/>
-                                                        <constraint firstAttribute="width" constant="32" id="xDy-t7-26A"/>
+                                                        <constraint firstAttribute="width" constant="25" id="xDy-t7-26A"/>
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="On My iPhone" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="116-rt-msI">
-                                                    <rect key="frame" x="48" y="0.0" width="169.5" height="32"/>
+                                                    <rect key="frame" x="41" y="0.0" width="106.5" height="25"/>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>