Merge branch 'ios-release'

iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift

@@ -229,12 +229,13 @@ private extension MasterTimelineTableViewCell {
 			}
 			unreadIndicatorPropertyAnimator?.startAnimation()
 		} else {
+			unreadIndicatorView.alpha = 1
 			showOrHideView(unreadIndicatorView, cellData.read || cellData.starred)
 		}
 	}
 	
 	func updateStarView() {
-		if !starView.isHidden &&  cellData.read && !cellData.starred {
+		if !starView.isHidden && cellData.read && !cellData.starred {
 			starViewPropertyAnimator = UIViewPropertyAnimator(duration: 0.66, curve: .easeInOut) { [weak self] in
 				self?.starView.alpha = 0
 			}
@@ -245,6 +246,7 @@ private extension MasterTimelineTableViewCell {
 			}
 			starViewPropertyAnimator?.startAnimation()
 		} else {
+			starView.alpha = 1
 			showOrHideView(starView, !cellData.starred)
 		}
 	}

iOS/MasterTimeline/MasterTimelineViewController.swift

@@ -33,6 +33,12 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 
 	private let keyboardManager = KeyboardManager(type: .timeline)
 	override var keyCommands: [UIKeyCommand]? {
+		
+		// If the first responder is the WKWebView (PreloadedWebView) we don't want to supply any keyboard
+		// commands that the system is looking for by going up the responder chain. They will interfere with
+		// the WKWebViews built in hardware keyboard shortcuts, specifically the up and down arrow keys.
+		guard let current = UIResponder.currentFirstResponder, !(current is PreloadedWebView) else { return nil }
+		
 		return keyboardManager.keyCommands
 	}
 	
@@ -123,6 +129,15 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 	}
 	
 	// MARK: Actions
+	
+	@objc func openInBrowser(_ sender: Any?) {
+		coordinator.showBrowserForCurrentArticle()
+	}
+
+	@objc func openInAppBrowser(_ sender: Any?) {
+		coordinator.showInAppBrowser()
+	}
+	
 	@IBAction func toggleFilter(_ sender: Any) {
 		coordinator.toggleReadArticlesFilter()
 	}