[app] clean up some design stuff; remove 1x graphics

Author: kirb

NewTerm/UI/Keyboard/KeyboardButton.swift

@@ -41,10 +41,10 @@ class KeyboardButton: UIButton {
 		adjustsImageWhenHighlighted = false
 		setTitleColor(tintColor, for: .normal)
 		setTitleColor(.black, for: .selected)
-		setBackgroundImage(image(of: UIColor(white: 0.3529411765, alpha: 1)), for: .normal)
-		setBackgroundImage(image(of: UIColor(white: 0.2078431373, alpha: 1)), for: .highlighted)
-		setBackgroundImage(image(of: UIColor(white: 0.6784313725, alpha: 1)), for: .selected)
-		setBackgroundImage(image(of: UIColor(white: 0.6784313725, alpha: 1)), for: [ .highlighted, .selected ])
+		setBackgroundImage(image(of: UIColor(white: 1, alpha: 69 / 255)), for: .normal)
+		setBackgroundImage(image(of: UIColor(white: 1, alpha: 32 / 255)), for: .highlighted)
+		setBackgroundImage(image(of: UIColor(white: 1, alpha: 182 / 255)), for: .selected)
+		setBackgroundImage(image(of: UIColor(white: 1, alpha: 32 / 255)), for: [ .highlighted, .selected ])
 
 		addTarget(UIDevice.current, action: #selector(UIDevice.playInputClick), for: .touchUpInside)
 	}
@@ -79,6 +79,18 @@ class KeyboardButton: UIButton {
 		return size
 	}
 
+	override var isSelected: Bool {
+		didSet {
+			tintColor = isSelected && !isHighlighted ? .black : .white
+		}
+	}
+
+	override var isHighlighted: Bool {
+		didSet {
+			tintColor = isSelected && !isHighlighted ? .black : .white
+		}
+	}
+
 	private func image(of color: UIColor) -> UIImage {
 		return UIGraphicsImageRenderer(size: CGSize(width: 1, height: 1)).image { context in
 			color.setFill()

NewTerm/UI/Keyboard/KeyboardPopupToolbar.swift

@@ -31,10 +31,11 @@ class KeyboardPopupToolbar: UIView {
 		backdropView.delegate = self
 		addSubview(backdropView)
 
-		let height = isSmallDevice ? 36 : 44
+		let height = isSmallDevice ? 37 : 45
 		let outerXSpacing = CGFloat(3)
 		let xSpacing = CGFloat(6)
-		let ySpacing = CGFloat(isSmallDevice ? 2 : 4)
+		let topSpacing = CGFloat(isSmallDevice ? 2 : 3)
+		let bottomSpacing = CGFloat(isSmallDevice ? 3 : 4)
 
 		let homeEndSpacerView = UIView()
 		let pageUpDownSpacerView = UIView()
@@ -50,8 +51,6 @@ class KeyboardPopupToolbar: UIView {
 			"max": CGFloat.greatestFiniteMagnitude
 		], views: nil)
 
-		deleteKey.titleLabel!.font = UIFont(name: "Helvetica Neue", size: deleteKey.titleLabel!.font.pointSize)
-
 		buttons = [
 			homeKey, endKey,
 			pageUpKey, pageDownKey,
@@ -86,14 +85,15 @@ class KeyboardPopupToolbar: UIView {
 
 		addCompactConstraints([
 			"self.height = height",
-			"stackView.top = toolbar.top + ySpacing",
-			"stackView.bottom = toolbar.bottom - ySpacing",
+			"stackView.top = toolbar.top + topSpacing",
+			"stackView.bottom = toolbar.bottom - bottomSpacing",
 			"stackView.left = toolbar.left + outerXSpacing",
 			"stackView.right = toolbar.right - outerXSpacing"
 		], metrics: [
 			"height": height,
 			"outerXSpacing": outerXSpacing,
-			"ySpacing": ySpacing
+			"topSpacing": topSpacing,
+			"bottomSpacing": bottomSpacing
 		], views: [
 			"toolbar": self,
 			"stackView": stackView
@@ -129,7 +129,7 @@ class KeyboardPopupToolbar: UIView {
 
 	override var intrinsicContentSize: CGSize {
 		var size = super.intrinsicContentSize
-		size.height = isSmallDevice ? 36 : 44
+		size.height = isSmallDevice ? 37 : 45
 		return size
 	}
 

NewTerm/UI/Keyboard/KeyboardToolbar.swift

@@ -37,7 +37,7 @@ class KeyboardToolbar: UIView {
 		let outerXSpacing = CGFloat(3)
 		let xSpacing = CGFloat(6)
 		let topSpacing = CGFloat(isSmallDevice ? 2 : 4)
-		let bottomSpacing = CGFloat(isSmallDevice ? 0 : 2)
+		let bottomSpacing = CGFloat(2)
 
 		let spacerView = UIView()
 

NewTerm/UI/Keyboard/TerminalKeyInput.swift

@@ -201,7 +201,7 @@ class TerminalKeyInput: TextInputBase {
 		if !visible && animated {
 			UIView.animate(withDuration: 0.2, animations: {
 				self.moreToolbar.alpha = 0
-			}, completion: { (_) in
+			}, completion: { _ in
 				self.moreToolbar.isHidden = true
 			})
 		} else {

NewTerm/UI/TopBar/TabCollectionViewCell.swift

@@ -27,7 +27,7 @@ class TabCollectionViewCell: UICollectionViewCell {
 		super.init(frame: frame)
 
 		selectedBackgroundView = UIView()
-		selectedBackgroundView!.backgroundColor = UIColor(white: 85 / 255, alpha: 0.7)
+		selectedBackgroundView!.backgroundColor = UIColor(white: 1, alpha: 69 / 255)
 
 		textLabel.translatesAutoresizingMaskIntoConstraints = false
 		textLabel.font = UIFont.systemFont(ofSize: 16)

NewTerm/ViewControllers/RootViewController.swift

@@ -153,7 +153,7 @@ class RootViewController: UIViewController {
 			}
 
 			self.tabsCollectionView.selectItem(at: IndexPath(item: selectedTabIndex, section: 0), animated: true, scrollPosition: .centeredHorizontally)
-		}, completion: { (_) in
+		}, completion: { _ in
 			// TODO: hack because the previous tab doesn’t deselect for some reason and ugh i hate this
 			self.tabsCollectionView.reloadData()
 		})