Implement NetNewsWire Blue for cell selection and tint. Issue #691 & #692

iOS/AppAssets.swift

@@ -36,26 +36,21 @@ struct AppAssets {
 		return RSImage(named: "faviconTemplateImage")!
 	}()
 	
-	static var feedColor: UIColor = {
-		return UIColor(named: "feedColor")!
-	}()
-
 	static var feedImage: RSImage = {
-		let image = RSImage(named: "feedImage")!
+		return RSImage(named: "feedImage")!
-		return image.maskWithColor(color: AppAssets.feedColor.cgColor)!
 	}()
 	
 	static var masterFolderColor: UIColor = {
 		return UIColor(named: "masterFolderColor")!
 	}()
-	
+
 	static var masterFolderImage: RSImage = {
 		let image = RSImage(named: "folderImage")!
 		return image.maskWithColor(color: AppAssets.masterFolderColor.cgColor)!
 	}()
 	
-	static var selectionBackgroundColor: UIColor = {
+	static var netNewsWireBlueColor: UIColor = {
-		return UIColor(named: "selectionBackgroundColor")!
+		return UIColor(named: "netNewsWireBlueColor")!
 	}()
 	
 	static var smartFeedColor: UIColor = {

iOS/AppDelegate.swift

@@ -71,6 +71,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
 		navigationController.topViewController!.navigationItem.leftBarButtonItem = splitViewController.displayModeButtonItem
 		splitViewController.delegate = self
 		
+		window!.tintColor = AppAssets.netNewsWireBlueColor
+		
 		AppDefaults.registerDefaults()
 		let isFirstRun = AppDefaults.isFirstRun
 		if isFirstRun {

iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift

@@ -144,7 +144,7 @@ private extension MasterFeedTableViewCell {
 
 	func theme() {
 		let bgView = UIView()
-		bgView.backgroundColor = AppAssets.selectionBackgroundColor
+		bgView.backgroundColor = AppAssets.netNewsWireBlueColor
 		selectedBackgroundView = bgView
 	}
 

iOS/MasterTimeline/Cell/MasterTimelineCellLayout.swift

@@ -28,7 +28,7 @@ extension MasterTimelineCellLayout {
 		var r = CGRect.zero
 		r.size = CGSize(width: MasterTimelineDefaultCellLayout.unreadCircleDimension, height: MasterTimelineDefaultCellLayout.unreadCircleDimension)
 		r.origin.x = point.x
-		r.origin.y = point.y + 4
+		r.origin.y = point.y + 5
 		return r
 	}
 	
@@ -38,7 +38,7 @@ extension MasterTimelineCellLayout {
 		r.size.width = MasterTimelineDefaultCellLayout.starDimension
 		r.size.height = MasterTimelineDefaultCellLayout.starDimension
 		r.origin.x = floor(point.x - ((MasterTimelineDefaultCellLayout.starDimension - MasterTimelineDefaultCellLayout.unreadCircleDimension) / 2.0))
-		r.origin.y = point.y + 2
+		r.origin.y = point.y + 3
 		return r
 	}
 	

iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift

@@ -123,7 +123,7 @@ private extension MasterTimelineTableViewCell {
 	
 	func theme() {
 		let bgView = UIView()
-		bgView.backgroundColor = AppAssets.selectionBackgroundColor
+		bgView.backgroundColor = AppAssets.netNewsWireBlueColor
 		selectedBackgroundView = bgView
 	}
 

iOS/MasterTimeline/MasterTimelineViewController.swift

@@ -139,7 +139,7 @@ class MasterTimelineViewController: ProgressTableViewController, UndoableCommand
 		}
 		
 		readAction.image = AppAssets.circleClosedImage
-		readAction.backgroundColor = AppAssets.timelineUnreadCircleColor
+		readAction.backgroundColor = AppAssets.netNewsWireBlueColor
 		
 		// Set up the star action
 		let starTitle = article.status.starred ?

iOS/Resources/Assets.xcassets/feedColor.colorset/Contents.json

@@ -1,20 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "colors" : [
-    {
-      "idiom" : "universal",
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "red" : "20",
-          "alpha" : "1.000",
-          "blue" : "243",
-          "green" : "140"
-        }
-      }
-    }
-  ]
-}

iOS/Resources/Assets.xcassets/netNewsWireBlueColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0x08",
+          "alpha" : "1.000",
+          "blue" : "0xEE",
+          "green" : "0x6A"
+        }
+      }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0x44",
+          "alpha" : "1.000",
+          "blue" : "0xE2",
+          "green" : "0x90"
+        }
+      }
+    }
+  ]
+}

iOS/Resources/Assets.xcassets/selectionBackgroundColor.colorset/Contents.json

@@ -1,20 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "colors" : [
-    {
-      "idiom" : "universal",
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "red" : "111",
-          "alpha" : "1.000",
-          "blue" : "250",
-          "green" : "175"
-        }
-      }
-    }
-  ]
-}

iOS/Settings/UIKit/DetailAccountViewController.swift

@@ -59,7 +59,7 @@ extension DetailAccountViewController {
 		}
 		
 		let bgView = UIView()
-		bgView.backgroundColor = AppAssets.selectionBackgroundColor
+		bgView.backgroundColor = AppAssets.netNewsWireBlueColor
 		cell.selectedBackgroundView = bgView
 		return cell
 	}

iOS/Settings/UIKit/RefreshIntervalViewController.swift

@@ -25,7 +25,7 @@ class RefreshIntervalViewController: UITableViewController {
 		cell.textLabel?.adjustsFontForContentSizeCategory = true
 		
 		let bgView = UIView()
-		bgView.backgroundColor = AppAssets.selectionBackgroundColor
+		bgView.backgroundColor = AppAssets.netNewsWireBlueColor
 		cell.selectedBackgroundView = bgView
 
 		let userRefreshInterval = AppDefaults.refreshInterval

iOS/Settings/UIKit/SettingsViewController.swift

@@ -93,7 +93,7 @@ class SettingsViewController: UITableViewController {
 		}
 		
 		let bgView = UIView()
-		bgView.backgroundColor = AppAssets.selectionBackgroundColor
+		bgView.backgroundColor = AppAssets.netNewsWireBlueColor
 		cell.selectedBackgroundView = bgView
 		return cell
 		

iOS/Settings/UIKit/TimelineNumberOfLinesViewController.swift

@@ -25,7 +25,7 @@ class TimelineNumberOfLinesViewController: UITableViewController {
 		cell.textLabel?.adjustsFontForContentSizeCategory = true
 		
 		let bgView = UIView()
-		bgView.backgroundColor = AppAssets.selectionBackgroundColor
+		bgView.backgroundColor = AppAssets.netNewsWireBlueColor
 		cell.selectedBackgroundView = bgView
 		
 		cell.textLabel?.text = "\(2 + indexPath.row)" + NSLocalizedString(" lines", comment: "Lines")