From 58f980f185b736d64711421f76ee089ea849d7ba Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 13:44:01 -0600
Subject: [PATCH 01/31] =?UTF-8?q?Change=20=E2=80=9CUP=20NEXT=E2=80=9D=20to?=
 =?UTF-8?q?=20=E2=80=9CQUEUE=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Stormtrooper/Storyboards/Stream.storyboard             | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Storyboards/Stream.storyboard b/iOS/Stormtrooper/Stormtrooper/Storyboards/Stream.storyboard
index 89f337d..28b0057 100644
--- a/iOS/Stormtrooper/Stormtrooper/Storyboards/Stream.storyboard
+++ b/iOS/Stormtrooper/Stormtrooper/Storyboards/Stream.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -15,6 +15,9 @@
         <array key="OpenSans-Semibold.ttf">
             <string>OpenSans-Semibold</string>
         </array>
+        <array key="WorkSans-Medium.ttf">
+            <string>WorkSans-Medium</string>
+        </array>
         <array key="WorkSans-SemiBold.ttf">
             <string>WorkSans-SemiBold</string>
         </array>
@@ -216,7 +219,7 @@
                                             <outlet property="delegate" destination="BYZ-38-t0r" id="kd1-Sm-0Z4"/>
                                         </connections>
                                     </tableView>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="UP NEXT" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zJg-2p-vtP">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="QUEUE" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zJg-2p-vtP">
                                         <rect key="frame" x="16" y="8" width="160" height="18"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="18" id="euG-Od-hWs"/>

From c86472f588a44c5e3ce81a0c3200118e810fbed1 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 13:44:23 -0600
Subject: [PATCH 02/31] Update VideoQueueTableViewCell

---
 .../Views/VideoQueueTableViewCell.swift       | 56 +++++++++++---
 .../Views/VideoQueueTableViewCell.xib         | 74 +++++++++++--------
 2 files changed, 89 insertions(+), 41 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
index 797ed34..7419bca 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
@@ -9,19 +9,51 @@
 import UIKit
 
 class VideoQueueTableViewCell: UITableViewCell {
-    @IBOutlet weak var thumbnailImageView: UIImageView!
-    @IBOutlet weak var titleLabel: UILabel!
-    @IBOutlet weak var channelTitleLabel: UILabel!
-
-    override func awakeFromNib() {
-        super.awakeFromNib()
-        // Initialization code
+    @IBOutlet private weak var playImageView: UIImageView!
+    @IBOutlet private weak var numberLabel: UILabel!
+    @IBOutlet private weak var thumbnailImageView: UIImageView!
+    @IBOutlet private weak var titleLabel: UILabel!
+    @IBOutlet private weak var channelLabel: UILabel!
+    
+    private let highlightedBackgroundColor = UIColor(red: 251/255, green: 252/255, blue: 252/255, alpha: 0.10)
+    private let unhighlightedBackgroundColor = UIColor(red: 40/255, green: 36/255, blue: 36/255, alpha: 1.0)
+    
+    var number: Int? {
+        get { return Int(numberLabel.text ?? "") }
+        set { numberLabel.text = "\(newValue)" }
     }
-
-    override func setSelected(_ selected: Bool, animated: Bool) {
-        super.setSelected(selected, animated: animated)
-
-        // Configure the view for the selected state
+    
+    var thumbnail: UIImage? {
+        get { return thumbnailImageView.image }
+        set { thumbnailImageView.image = newValue }
     }
     
+    var title: String? {
+        get { return titleLabel.text }
+        set { titleLabel.text = newValue }
+    }
+    
+    var channel: String? {
+        get { return channelLabel.text }
+        set { channelLabel.text = newValue }
+    }
+    
+    private var _isCurrentVideo = false
+    var isCurrentVideo: Bool {
+        get { return _isCurrentVideo }
+        set {
+            _isCurrentVideo = newValue
+            if _isCurrentVideo {
+                // show play icon and highlighted background
+                playImageView.isHidden = false
+                numberLabel.isHidden = true
+                backgroundColor = highlightedBackgroundColor
+            } else {
+                // show number and unhighlighted background
+                playImageView.isHidden = true
+                numberLabel.isHidden = false
+                backgroundColor = unhighlightedBackgroundColor
+            }
+        }
+    }
 }
diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.xib b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.xib
index 0fd309f..065a114 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.xib
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.xib
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -16,6 +15,9 @@
         <array key="OpenSans-Semibold.ttf">
             <string>OpenSans-Semibold</string>
         </array>
+        <array key="WorkSans-SemiBold.ttf">
+            <string>WorkSans-SemiBold</string>
+        </array>
     </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -27,57 +29,71 @@
                 <rect key="frame" x="0.0" y="0.0" width="375" height="91"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="playing" translatesAutoresizingMaskIntoConstraints="NO" id="6JK-1q-vB2" userLabel="Play Icon">
+                        <rect key="frame" x="17" y="39" width="9" height="13"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="13" id="FmX-Oz-iat"/>
+                            <constraint firstAttribute="width" constant="9" id="MYv-yY-g9B"/>
+                        </constraints>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SCb-XO-XUo" userLabel="Number">
+                        <rect key="frame" x="17" y="38" width="9" height="14"/>
+                        <fontDescription key="fontDescription" name="WorkSans-SemiBold" family="Work Sans" pointSize="12"/>
+                        <color key="textColor" red="0.98431372549019602" green="0.9882352941176471" blue="0.9882352941176471" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="zeJ-L7-XaG">
-                        <rect key="frame" x="16" y="12" width="120" height="67.5"/>
+                        <rect key="frame" x="41" y="13" width="115" height="65"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="120" id="W09-zS-Fqk"/>
-                            <constraint firstAttribute="height" constant="67.5" id="jqo-eD-8hd"/>
+                            <constraint firstAttribute="height" constant="65" id="DUZ-hh-rXf"/>
+                            <constraint firstAttribute="width" constant="115" id="eFl-PQ-k6O"/>
                         </constraints>
                     </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bKH-c6-NpJ">
-                        <rect key="frame" x="149" y="27.5" width="34" height="18"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Beyoncé - XO, Official Video" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bKH-c6-NpJ" userLabel="Title">
+                        <rect key="frame" x="174" y="26" width="193" height="18"/>
                         <fontDescription key="fontDescription" name="OpenSans-Semibold" family="Open Sans" pointSize="13"/>
                         <color key="textColor" red="0.96470588239999999" green="0.96470588239999999" blue="0.96470588239999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Aho-q6-CFK">
-                        <rect key="frame" x="149" y="48.5" width="30.5" height="16.5"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="BeyoncéOfficial" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Aho-q6-CFK" userLabel="Channel">
+                        <rect key="frame" x="174" y="47" width="193" height="16.5"/>
                         <fontDescription key="fontDescription" name="OpenSans" family="Open Sans" pointSize="12"/>
                         <color key="textColor" red="0.96470588239999999" green="0.96470588239999999" blue="0.96470588239999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WHP-hA-r3x">
-                        <rect key="frame" x="16" y="90.5" width="359" height="1"/>
-                        <color key="backgroundColor" red="0.34901960780000002" green="0.34509803919999998" blue="0.34901960780000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="1" id="Nge-PW-dzu"/>
-                        </constraints>
-                    </view>
                 </subviews>
                 <color key="backgroundColor" red="0.15686274510000001" green="0.14117647059999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 <constraints>
-                    <constraint firstItem="WHP-hA-r3x" firstAttribute="leading" secondItem="zeJ-L7-XaG" secondAttribute="leading" id="7iY-HF-EFc"/>
-                    <constraint firstAttribute="bottom" secondItem="zeJ-L7-XaG" secondAttribute="bottom" constant="12.5" id="E15-ZJ-Z87"/>
-                    <constraint firstAttribute="leading" secondItem="zeJ-L7-XaG" secondAttribute="leading" constant="-16" id="HIm-Vd-4bl"/>
-                    <constraint firstAttribute="trailing" secondItem="WHP-hA-r3x" secondAttribute="trailing" id="Kcv-zX-sJx"/>
-                    <constraint firstItem="zeJ-L7-XaG" firstAttribute="top" secondItem="bKH-c6-NpJ" secondAttribute="top" constant="-15.5" id="ThB-1n-RK0"/>
-                    <constraint firstItem="Aho-q6-CFK" firstAttribute="top" secondItem="bKH-c6-NpJ" secondAttribute="bottom" constant="3" id="aK7-Oq-wCl"/>
-                    <constraint firstAttribute="bottom" secondItem="WHP-hA-r3x" secondAttribute="bottom" id="fDj-2e-V6x"/>
-                    <constraint firstItem="zeJ-L7-XaG" firstAttribute="top" secondItem="nuy-5u-3fy" secondAttribute="top" constant="12" id="feY-oS-xkM"/>
-                    <constraint firstItem="Aho-q6-CFK" firstAttribute="leading" secondItem="bKH-c6-NpJ" secondAttribute="leading" id="hu4-An-DV9"/>
-                    <constraint firstAttribute="trailingMargin" relation="greaterThanOrEqual" secondItem="Aho-q6-CFK" secondAttribute="trailing" id="rVs-wv-8yY"/>
-                    <constraint firstItem="bKH-c6-NpJ" firstAttribute="leading" secondItem="zeJ-L7-XaG" secondAttribute="trailing" constant="13" id="yeS-bM-1sm"/>
-                    <constraint firstAttribute="trailingMargin" relation="greaterThanOrEqual" secondItem="bKH-c6-NpJ" secondAttribute="trailing" id="yrc-jQ-bdi"/>
+                    <constraint firstItem="zeJ-L7-XaG" firstAttribute="leading" secondItem="SCb-XO-XUo" secondAttribute="trailing" constant="15" id="4Lo-je-Dck"/>
+                    <constraint firstItem="SCb-XO-XUo" firstAttribute="centerY" secondItem="nuy-5u-3fy" secondAttribute="centerY" id="8ny-Wo-fHd"/>
+                    <constraint firstItem="zeJ-L7-XaG" firstAttribute="leading" secondItem="6JK-1q-vB2" secondAttribute="trailing" constant="15" id="EIZ-Iv-ntS"/>
+                    <constraint firstItem="Aho-q6-CFK" firstAttribute="top" secondItem="bKH-c6-NpJ" secondAttribute="bottom" constant="3" id="G2o-gF-LRl"/>
+                    <constraint firstItem="Aho-q6-CFK" firstAttribute="leading" secondItem="bKH-c6-NpJ" secondAttribute="leading" id="IEg-Ce-wv2"/>
+                    <constraint firstAttribute="bottom" secondItem="Aho-q6-CFK" secondAttribute="bottom" constant="28" id="IN6-Mg-8XE"/>
+                    <constraint firstAttribute="trailing" secondItem="bKH-c6-NpJ" secondAttribute="trailing" constant="8" id="TY0-gq-aj1"/>
+                    <constraint firstItem="SCb-XO-XUo" firstAttribute="leading" secondItem="nuy-5u-3fy" secondAttribute="leading" constant="17" id="dy7-gR-pzu"/>
+                    <constraint firstItem="6JK-1q-vB2" firstAttribute="leading" secondItem="nuy-5u-3fy" secondAttribute="leading" constant="17" id="fOY-a4-nSp"/>
+                    <constraint firstItem="bKH-c6-NpJ" firstAttribute="leading" secondItem="zeJ-L7-XaG" secondAttribute="trailing" constant="18" id="hXb-vl-xBW"/>
+                    <constraint firstItem="6JK-1q-vB2" firstAttribute="centerY" secondItem="nuy-5u-3fy" secondAttribute="centerY" id="kSr-SR-cSK"/>
+                    <constraint firstItem="bKH-c6-NpJ" firstAttribute="top" secondItem="nuy-5u-3fy" secondAttribute="top" constant="26" id="ukX-U2-YCu"/>
+                    <constraint firstAttribute="trailing" secondItem="Aho-q6-CFK" secondAttribute="trailing" constant="8" id="wKK-4v-KYO"/>
+                    <constraint firstItem="zeJ-L7-XaG" firstAttribute="centerY" secondItem="nuy-5u-3fy" secondAttribute="centerY" id="wwx-oc-Qpc"/>
                 </constraints>
             </tableViewCellContentView>
             <color key="backgroundColor" red="0.15686274510000001" green="0.14117647059999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <gestureRecognizers/>
+            <inset key="separatorInset" minX="15" minY="0.0" maxX="0.0" maxY="0.0"/>
             <connections>
-                <outlet property="channelTitleLabel" destination="Aho-q6-CFK" id="H1I-SK-Zcb"/>
+                <outlet property="channelLabel" destination="Aho-q6-CFK" id="AGt-VW-jkc"/>
+                <outlet property="numberLabel" destination="SCb-XO-XUo" id="j7d-lv-RCH"/>
+                <outlet property="playImageView" destination="6JK-1q-vB2" id="vIn-5Q-ywA"/>
                 <outlet property="thumbnailImageView" destination="zeJ-L7-XaG" id="ZSs-Xv-Zwi"/>
                 <outlet property="titleLabel" destination="bKH-c6-NpJ" id="jHz-eP-J81"/>
             </connections>
             <point key="canvasLocation" x="41.5" y="51"/>
         </tableViewCell>
     </objects>
+    <resources>
+        <image name="playing" width="9" height="13"/>
+    </resources>
 </document>

From 1d4a66efa5f672838ad226df927f69ed6474799d Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 13:44:32 -0600
Subject: [PATCH 03/31] Add play icon to assets

---
 .../playing.imageset/Contents.json               |  12 ++++++++++++
 .../Assets.xcassets/playing.imageset/path.pdf    | Bin 0 -> 3893 bytes
 2 files changed, 12 insertions(+)
 create mode 100644 iOS/Stormtrooper/Stormtrooper/Assets.xcassets/playing.imageset/Contents.json
 create mode 100644 iOS/Stormtrooper/Stormtrooper/Assets.xcassets/playing.imageset/path.pdf

diff --git a/iOS/Stormtrooper/Stormtrooper/Assets.xcassets/playing.imageset/Contents.json b/iOS/Stormtrooper/Stormtrooper/Assets.xcassets/playing.imageset/Contents.json
new file mode 100644
index 0000000..97087d6
--- /dev/null
+++ b/iOS/Stormtrooper/Stormtrooper/Assets.xcassets/playing.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "path.pdf"
+    }
+  ],
+  "info" : {
+    "author" : "zeplin",
+    "version" : "1"
+  }
+}
\ No newline at end of file
diff --git a/iOS/Stormtrooper/Stormtrooper/Assets.xcassets/playing.imageset/path.pdf b/iOS/Stormtrooper/Stormtrooper/Assets.xcassets/playing.imageset/path.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..c2b242ab36baa81f830529b32df9460e88a9437e
GIT binary patch
literal 3893
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

literal 0
HcmV?d00001


From 3e3e37790197623ece8a5fe4e8ffa7d5131b1461 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 13:44:55 -0600
Subject: [PATCH 04/31] Update cellFor(queueTableView:at:)

---
 .../Controllers/StreamViewController.swift    | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index 834e016..30f6d4c 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -774,22 +774,21 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
     }
     
 	private func cellFor(queueTableView tableView: UITableView, at indexPath: IndexPath) -> UITableViewCell {
-        guard
-        let cell = tableView.dequeueReusableCell(withIdentifier: "queueCell") as? VideoQueueTableViewCell,
-        let video = viewModel.videoQueue?[indexPath.row] else {
-            return UITableViewCell()
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: "queueCell") as? VideoQueueTableViewCell,
+            let video = viewModel.videoQueue?[indexPath.row] else {
+                return UITableViewCell()
         }
-        cell.titleLabel.text = video.title
-        cell.channelTitleLabel.text = video.channelTitle
+        
+        cell.number = indexPath.row
+        cell.title = video.title
+        cell.channel = video.channelTitle
+        cell.isCurrentVideo = (viewModel.currentVideoIndex == indexPath.row)
+        
         YouTubeDataManager.sharedInstance.getThumbnailForVideo(with: video.mediumThumbnailURL) {error, image in
-            if let image = image {
-                cell.thumbnailImageView.image = image
-            }
-        }
-        if indexPath.row == viewModel.currentVideoIndex {
-            cell.isSelected = true
+            guard let image = image else { return }
+            cell.thumbnail = image
         }
-        cell.selectionStyle = .none
+        
         return cell
     }
 }

From afb2c6da33acf9e55321b7aea2354020956008f5 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 13:48:18 -0600
Subject: [PATCH 05/31] Set background color of content view

---
 .../Stormtrooper/Views/VideoQueueTableViewCell.swift          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
index 7419bca..ed18065 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
@@ -47,12 +47,12 @@ class VideoQueueTableViewCell: UITableViewCell {
                 // show play icon and highlighted background
                 playImageView.isHidden = false
                 numberLabel.isHidden = true
-                backgroundColor = highlightedBackgroundColor
+                contentView.backgroundColor = highlightedBackgroundColor
             } else {
                 // show number and unhighlighted background
                 playImageView.isHidden = true
                 numberLabel.isHidden = false
-                backgroundColor = unhighlightedBackgroundColor
+                contentView.backgroundColor = unhighlightedBackgroundColor
             }
         }
     }

From cbff1ee88209a6912221aa31fb89c09e0cd65c7d Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 13:57:42 -0600
Subject: [PATCH 06/31] Change separator color for queue table view

---
 iOS/Stormtrooper/Stormtrooper/Storyboards/Stream.storyboard | 1 +
 1 file changed, 1 insertion(+)

diff --git a/iOS/Stormtrooper/Stormtrooper/Storyboards/Stream.storyboard b/iOS/Stormtrooper/Stormtrooper/Storyboards/Stream.storyboard
index 28b0057..d9f9cf7 100644
--- a/iOS/Stormtrooper/Stormtrooper/Storyboards/Stream.storyboard
+++ b/iOS/Stormtrooper/Stormtrooper/Storyboards/Stream.storyboard
@@ -214,6 +214,7 @@
                                     <tableView clipsSubviews="YES" tag="1" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="89" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="iC4-5G-MpH">
                                         <rect key="frame" x="0.0" y="42" width="375" height="247"/>
                                         <color key="backgroundColor" red="0.15686274510000001" green="0.14117647059999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="separatorColor" red="0.34901960784313724" green="0.34509803921568627" blue="0.34901960784313724" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <connections>
                                             <outlet property="dataSource" destination="BYZ-38-t0r" id="2Ly-0p-jhB"/>
                                             <outlet property="delegate" destination="BYZ-38-t0r" id="kd1-Sm-0Z4"/>

From 9b7eadec6ba592a65eb3c30ff3374739190fe17e Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 14:01:26 -0600
Subject: [PATCH 07/31] Improve comments

---
 .../Stormtrooper/Views/VideoQueueTableViewCell.swift          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
index ed18065..2ac13d6 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
@@ -44,12 +44,12 @@ class VideoQueueTableViewCell: UITableViewCell {
         set {
             _isCurrentVideo = newValue
             if _isCurrentVideo {
-                // show play icon and highlighted background
+                // update design for current video
                 playImageView.isHidden = false
                 numberLabel.isHidden = true
                 contentView.backgroundColor = highlightedBackgroundColor
             } else {
-                // show number and unhighlighted background
+                // update design for queued video
                 playImageView.isHidden = true
                 numberLabel.isHidden = false
                 contentView.backgroundColor = unhighlightedBackgroundColor

From d73162830dda159aed731a28875ccb9b12d4927c Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 14:01:34 -0600
Subject: [PATCH 08/31] Hide separator for current video

---
 .../Stormtrooper/Views/VideoQueueTableViewCell.swift             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
index 2ac13d6..327e65d 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
@@ -48,6 +48,7 @@ class VideoQueueTableViewCell: UITableViewCell {
                 playImageView.isHidden = false
                 numberLabel.isHidden = true
                 contentView.backgroundColor = highlightedBackgroundColor
+                separatorInset = UIEdgeInsetsMake(0, 0, 0, bounds.size.width)
             } else {
                 // update design for queued video
                 playImageView.isHidden = true

From e0423dc9066dc110c8841baaea6ead103976dd09 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 14:28:54 -0600
Subject: [PATCH 09/31] Change number property from Int? to String?

---
 .../Stormtrooper/Controllers/StreamViewController.swift     | 2 +-
 .../Stormtrooper/Views/VideoQueueTableViewCell.swift        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index 30f6d4c..d2e62e8 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -779,7 +779,7 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
                 return UITableViewCell()
         }
         
-        cell.number = indexPath.row
+        cell.number = "\(indexPath.row)"
         cell.title = video.title
         cell.channel = video.channelTitle
         cell.isCurrentVideo = (viewModel.currentVideoIndex == indexPath.row)
diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
index 327e65d..649b370 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
@@ -18,9 +18,9 @@ class VideoQueueTableViewCell: UITableViewCell {
     private let highlightedBackgroundColor = UIColor(red: 251/255, green: 252/255, blue: 252/255, alpha: 0.10)
     private let unhighlightedBackgroundColor = UIColor(red: 40/255, green: 36/255, blue: 36/255, alpha: 1.0)
     
-    var number: Int? {
-        get { return Int(numberLabel.text ?? "") }
-        set { numberLabel.text = "\(newValue)" }
+    var number: String? {
+        get { return numberLabel.text }
+        set { numberLabel.text = newValue }
     }
     
     var thumbnail: UIImage? {

From dfc30e01223e600ebb8bde51b23392dd0b85e965 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 14:29:12 -0600
Subject: [PATCH 10/31] Make current video editable

---
 .../Controllers/StreamViewController.swift             | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index d2e62e8..36d9429 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -662,12 +662,10 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
-        if tableView.tag == chatTableTag {
-            return false
-        } else if tableView.tag == queueTableTag {
-            return indexPath.row != viewModel.currentVideoIndex
-        } else {
-            return false
+        switch tableView.tag {
+        case chatTableTag: return false
+        case queueTableTag: return true
+        default: return false
         }
     }
     

From 31db63afe3146f4a568f819e4a0244a8e09a6888 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 14:31:39 -0600
Subject: [PATCH 11/31] Set selection style to none

---
 .../Stormtrooper/Views/VideoQueueTableViewCell.xib            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.xib b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.xib
index 065a114..2d07edb 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.xib
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.xib
@@ -22,7 +22,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="95" id="pjQ-Xb-dT9" customClass="VideoQueueTableViewCell" customModule="Stormtrooper" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="95" id="pjQ-Xb-dT9" customClass="VideoQueueTableViewCell" customModule="Stormtrooper" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="92"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pjQ-Xb-dT9" id="nuy-5u-3fy">
@@ -37,7 +37,7 @@
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SCb-XO-XUo" userLabel="Number">
-                        <rect key="frame" x="17" y="38" width="9" height="14"/>
+                        <rect key="frame" x="17" y="38" width="9" height="15"/>
                         <fontDescription key="fontDescription" name="WorkSans-SemiBold" family="Work Sans" pointSize="12"/>
                         <color key="textColor" red="0.98431372549019602" green="0.9882352941176471" blue="0.9882352941176471" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>

From b246743a626aeda26dd0ead955984be7f2dc60e3 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 15:56:14 -0600
Subject: [PATCH 12/31] Update highlighted color

---
 .../Stormtrooper/Views/VideoQueueTableViewCell.swift            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
index 649b370..dd73258 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
@@ -15,7 +15,7 @@ class VideoQueueTableViewCell: UITableViewCell {
     @IBOutlet private weak var titleLabel: UILabel!
     @IBOutlet private weak var channelLabel: UILabel!
     
-    private let highlightedBackgroundColor = UIColor(red: 251/255, green: 252/255, blue: 252/255, alpha: 0.10)
+    private let highlightedBackgroundColor = UIColor(red: 59/255, green: 59/255, blue: 59/255, alpha: 1.0)
     private let unhighlightedBackgroundColor = UIColor(red: 40/255, green: 36/255, blue: 36/255, alpha: 1.0)
     
     var number: String? {

From 053169e3a7e95a3d53147b4e4472dbc9cb379fbc Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 15:56:28 -0600
Subject: [PATCH 13/31] Highlight background of current video when editing

---
 .../Stormtrooper/Views/VideoQueueTableViewCell.swift             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
index dd73258..554d313 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
@@ -47,6 +47,7 @@ class VideoQueueTableViewCell: UITableViewCell {
                 // update design for current video
                 playImageView.isHidden = false
                 numberLabel.isHidden = true
+                backgroundColor = highlightedBackgroundColor
                 contentView.backgroundColor = highlightedBackgroundColor
                 separatorInset = UIEdgeInsetsMake(0, 0, 0, bounds.size.width)
             } else {

From e5b9265a61fc3b143ff97612363e9146f5431e86 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 15:56:42 -0600
Subject: [PATCH 14/31] Start counting videos from 1 instead of 0

---
 .../Stormtrooper/Controllers/StreamViewController.swift         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index 36d9429..86c16dc 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -777,7 +777,7 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
                 return UITableViewCell()
         }
         
-        cell.number = "\(indexPath.row)"
+        cell.number = "\(indexPath.row + 1)"
         cell.title = video.title
         cell.channel = video.channelTitle
         cell.isCurrentVideo = (viewModel.currentVideoIndex == indexPath.row)

From 4530d293b8d49d13151a43cbdf05210a80672e25 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 18:19:30 -0600
Subject: [PATCH 15/31] Swap highlighting when a new video is selected

---
 .../Controllers/StreamViewController.swift    | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index 86c16dc..90bdeb7 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -725,11 +725,24 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        if viewModel.currentVideoIndex != indexPath.row {
-            viewModel.currentVideoIndex = indexPath.row
-            playerView.cueVideo(byId: viewModel.videoQueue?[indexPath.row].id ?? "", startSeconds: 0, suggestedQuality: .default)
-            playerView.playVideo()
-        }
+        guard viewModel.currentVideoIndex != indexPath.row else { return }
+        guard let currentVideoIndex = viewModel.currentVideoIndex else { return }
+        
+        // remove highlight for the current video
+        let currentVideoIndexPath = IndexPath(row: currentVideoIndex, section: 0)
+        let currentVideoCell = tableView.cellForRow(at: currentVideoIndexPath) as? VideoQueueTableViewCell
+        currentVideoCell?.isCurrentVideo = false
+        
+        // add highlight for the selected video
+        let selectedVideoCell = tableView.cellForRow(at: indexPath) as? VideoQueueTableViewCell
+        selectedVideoCell?.isCurrentVideo = true
+        
+        // update the view model
+        viewModel.currentVideoIndex = indexPath.row
+        
+        // play the selected video
+        playerView.cueVideo(byId: viewModel.videoQueue?[indexPath.row].id ?? "", startSeconds: 0, suggestedQuality: .default)
+        playerView.playVideo()
     }
 	
     private func cellFor(chatTableView tableView: UITableView, at indexPath: IndexPath) -> UITableViewCell {

From c789879aaaef87605b0851ae4bb06326c45fe082 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 18:42:13 -0600
Subject: [PATCH 16/31] Swap highlight when video ends

---
 .../Controllers/StreamViewController.swift    | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index 90bdeb7..401c007 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -866,11 +866,8 @@ extension StreamViewController: YTPlayerViewDelegate {
 			}
             break
         case .ended:
-            if viewModel.isHost, let queue = viewModel.videoQueue, var queueIndex = viewModel.currentVideoIndex {
-                queueIndex = queueIndex < queue.count - 1 ? queueIndex + 1 : 0
-                playerView.cueVideo(byId: queue[queueIndex].id, startSeconds: 0, suggestedQuality: .default)
-                viewModel.currentVideoIndex = queueIndex
-                playerView.playVideo()
+            if viewModel.isHost {
+                playNextVideo()
             }
             break
         case .queued:
@@ -882,6 +879,31 @@ extension StreamViewController: YTPlayerViewDelegate {
         }
     }
     
+    private func playNextVideo() {
+        guard let videoQueue = viewModel.videoQueue else { return }
+        guard let currentVideoIndex = viewModel.currentVideoIndex else { return }
+        
+        // identify the next video (wrapping around, if necessary)
+        let nextVideoIndex = currentVideoIndex < videoQueue.count-1 ? currentVideoIndex+1 : 0
+        
+        // remove highlight for the current video
+        let currentVideoIndexPath = IndexPath(row: currentVideoIndex, section: 0)
+        let currentVideoCell = queueTableView.cellForRow(at: currentVideoIndexPath) as? VideoQueueTableViewCell
+        currentVideoCell?.isCurrentVideo = false
+        
+        // add highlight for the next video
+        let nextVideoIndexPath = IndexPath(row: nextVideoIndex, section: 0)
+        let selectedVideoCell = queueTableView.cellForRow(at: nextVideoIndexPath) as? VideoQueueTableViewCell
+        selectedVideoCell?.isCurrentVideo = true
+        
+        // update view model
+        viewModel.currentVideoIndex = nextVideoIndex
+        
+        // play the next video
+        let nextVideoId = videoQueue[nextVideoIndex].id
+        playerView.cueVideo(byId: nextVideoId, startSeconds: 0, suggestedQuality: .default)
+        playerView.playVideo()
+    }
 }
 
 extension StreamViewController: UITextFieldDelegate {

From a9e3b209a7f9b96e03f7e302092fdbebe98b3596 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 19:04:33 -0600
Subject: [PATCH 17/31] Update comments and formatting

---
 .../Stormtrooper/Views/VideoQueueTableViewCell.swift     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
index 554d313..7ba8eea 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
@@ -9,6 +9,7 @@
 import UIKit
 
 class VideoQueueTableViewCell: UITableViewCell {
+    
     @IBOutlet private weak var playImageView: UIImageView!
     @IBOutlet private weak var numberLabel: UILabel!
     @IBOutlet private weak var thumbnailImageView: UIImageView!
@@ -18,27 +19,35 @@ class VideoQueueTableViewCell: UITableViewCell {
     private let highlightedBackgroundColor = UIColor(red: 59/255, green: 59/255, blue: 59/255, alpha: 1.0)
     private let unhighlightedBackgroundColor = UIColor(red: 40/255, green: 36/255, blue: 36/255, alpha: 1.0)
     
+    private var _isCurrentVideo = false
+    
+    /// The video's position in the playlist.
     var number: String? {
         get { return numberLabel.text }
         set { numberLabel.text = newValue }
     }
     
+    /// The video's thumbnail.
     var thumbnail: UIImage? {
         get { return thumbnailImageView.image }
         set { thumbnailImageView.image = newValue }
     }
     
+    /// The video's title.
     var title: String? {
         get { return titleLabel.text }
         set { titleLabel.text = newValue }
     }
     
+    /// The video's channel.
     var channel: String? {
         get { return channelLabel.text }
         set { channelLabel.text = newValue }
     }
     
     private var _isCurrentVideo = false
+    /// Is this the current video in the queue?
+    /// (If so, then its design will be updated.)
     var isCurrentVideo: Bool {
         get { return _isCurrentVideo }
         set {

From 70f2befea3c04c760ff266600c256b9b95fdf5ea Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 19:04:58 -0600
Subject: [PATCH 18/31] Reset background color and separator when no longer the
 current video

---
 .../Stormtrooper/Views/VideoQueueTableViewCell.swift            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
index 7ba8eea..ab5c86c 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
@@ -63,7 +63,9 @@ class VideoQueueTableViewCell: UITableViewCell {
                 // update design for queued video
                 playImageView.isHidden = true
                 numberLabel.isHidden = false
+                backgroundColor = unhighlightedBackgroundColor
                 contentView.backgroundColor = unhighlightedBackgroundColor
+                separatorInset = UIEdgeInsetsMake(0, 15, 0, 0)
             }
         }
     }

From 38bbcc9a513bfc9af3c9bdd9b3a8e2f76b110986 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Tue, 7 Feb 2017 19:05:15 -0600
Subject: [PATCH 19/31] Hide separator of previous video

---
 .../Views/VideoQueueTableViewCell.swift            | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
index ab5c86c..d195c58 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
@@ -19,6 +19,7 @@ class VideoQueueTableViewCell: UITableViewCell {
     private let highlightedBackgroundColor = UIColor(red: 59/255, green: 59/255, blue: 59/255, alpha: 1.0)
     private let unhighlightedBackgroundColor = UIColor(red: 40/255, green: 36/255, blue: 36/255, alpha: 1.0)
     
+    private var _isPreviousVideo = false
     private var _isCurrentVideo = false
     
     /// The video's position in the playlist.
@@ -45,7 +46,18 @@ class VideoQueueTableViewCell: UITableViewCell {
         set { channelLabel.text = newValue }
     }
     
-    private var _isCurrentVideo = false
+    /// Is this the video immediately prior to the current video in the queue?
+    /// (If so, then its separator will be hidden.)
+    var isPreviousVideo: Bool {
+        get { return _isPreviousVideo }
+        set {
+            _isPreviousVideo = newValue
+            let visibleSeparator = UIEdgeInsetsMake(0, 15, 0, 0)
+            let hiddenSeparator = UIEdgeInsetsMake(0, 0, 0, bounds.size.width)
+            separatorInset = _isPreviousVideo ? hiddenSeparator : visibleSeparator
+        }
+    }
+    
     /// Is this the current video in the queue?
     /// (If so, then its design will be updated.)
     var isCurrentVideo: Bool {

From e2eb49db450e76200b6805f0b743f592d4443296 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Wed, 8 Feb 2017 09:28:55 -0600
Subject: [PATCH 20/31] Code cleanup

---
 .../Controllers/StreamViewController.swift    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index 401c007..b05c76b 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -699,24 +699,25 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, moveRowAt sourceIndexPath: IndexPath, to destinationIndexPath: IndexPath) {
-        guard let currentVideoIndex = viewModel.currentVideoIndex, let video = viewModel.videoQueue?.remove(at: sourceIndexPath.row) else {
-            return
-        }
+        guard let currentVideoIndex = viewModel.currentVideoIndex else { return }
+        guard let video = viewModel.videoQueue?.remove(at: sourceIndexPath.row) else { return }
         viewModel.videoQueue?.insert(video, at: destinationIndexPath.row)
+        
+        // update the view model's current video index
         if sourceIndexPath.row == currentVideoIndex {
+            // moved the current video
             viewModel.currentVideoIndex = destinationIndexPath.row
-        }
-        else if destinationIndexPath.row == currentVideoIndex {
+        } else if destinationIndexPath.row == currentVideoIndex {
+            // moved a video to the current video's index
             viewModel.currentVideoIndex = destinationIndexPath.row + (sourceIndexPath.row > destinationIndexPath.row ? 1 : -1)
-        }
-        // left-to-right
-        else if sourceIndexPath.row < currentVideoIndex, currentVideoIndex < destinationIndexPath.row {
+        } else if sourceIndexPath.row < currentVideoIndex, currentVideoIndex < destinationIndexPath.row {
+            // moved a video from the left-side of the current video to the right-side
             viewModel.currentVideoIndex = currentVideoIndex - 1
+        } else if sourceIndexPath.row > currentVideoIndex, currentVideoIndex > destinationIndexPath.row {
+            // moved a video from the right-side of the current video to the left-side
+            viewModel.currentVideoIndex = currentVideoIndex + 1
         }
         
-        // right-to-left
-        else if sourceIndexPath.row > currentVideoIndex, currentVideoIndex > destinationIndexPath.row {
-            viewModel.currentVideoIndex = currentVideoIndex + 1
         }
     }
     

From 49465338e47a4ced6acc2e2fedbe155391094a74 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Wed, 8 Feb 2017 09:29:21 -0600
Subject: [PATCH 21/31] Update row numbering after moving a video

---
 .../Controllers/StreamViewController.swift          | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index b05c76b..d05cfda 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -718,6 +718,19 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
             viewModel.currentVideoIndex = currentVideoIndex + 1
         }
         
+        // update the row numbering
+        let first = min(sourceIndexPath.row, destinationIndexPath.row)
+        let last = max(sourceIndexPath.row, destinationIndexPath.row)
+        let update = (sourceIndexPath.row < destinationIndexPath.row) ? -1 : 1
+        for row in first...last {
+            let indexPath = IndexPath(row: row, section: 0)
+            if let cell = tableView.cellForRow(at: indexPath) as? VideoQueueTableViewCell {
+                if row == sourceIndexPath.row {
+                    cell.number = "\(destinationIndexPath.row + 1)" // set number of moved row
+                } else {
+                    cell.number = "\(row + 1 + update)" // set number of intermediate row
+                }
+            }
         }
     }
     

From b1e321d958bc85d428b520957c2288a93694cdb9 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Wed, 8 Feb 2017 09:33:37 -0600
Subject: [PATCH 22/31] Reload rows to update video numbers

---
 .../Controllers/StreamViewController.swift        | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index d05cfda..7fd5cee 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -718,20 +718,11 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
             viewModel.currentVideoIndex = currentVideoIndex + 1
         }
         
-        // update the row numbering
+        // update the video numbers
         let first = min(sourceIndexPath.row, destinationIndexPath.row)
         let last = max(sourceIndexPath.row, destinationIndexPath.row)
-        let update = (sourceIndexPath.row < destinationIndexPath.row) ? -1 : 1
-        for row in first...last {
-            let indexPath = IndexPath(row: row, section: 0)
-            if let cell = tableView.cellForRow(at: indexPath) as? VideoQueueTableViewCell {
-                if row == sourceIndexPath.row {
-                    cell.number = "\(destinationIndexPath.row + 1)" // set number of moved row
-                } else {
-                    cell.number = "\(row + 1 + update)" // set number of intermediate row
-                }
-            }
-        }
+        let rows = [Int](first...last).map() { row in IndexPath(row: row, section: 0) }
+        tableView.reloadRows(at: rows, with: .automatic)
     }
     
     func tableView(_ tableView: UITableView, targetIndexPathForMoveFromRowAt sourceIndexPath: IndexPath, toProposedIndexPath proposedDestinationIndexPath: IndexPath) -> IndexPath {

From ee2507d022fdc7d61344786ecff5b82c564e1310 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Wed, 8 Feb 2017 09:55:47 -0600
Subject: [PATCH 23/31] Remove row numbering for now

---
 .../Stormtrooper/Controllers/StreamViewController.swift     | 6 ------
 .../Stormtrooper/Views/VideoQueueTableViewCell.swift        | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index 7fd5cee..a8b3e36 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -717,12 +717,6 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
             // moved a video from the right-side of the current video to the left-side
             viewModel.currentVideoIndex = currentVideoIndex + 1
         }
-        
-        // update the video numbers
-        let first = min(sourceIndexPath.row, destinationIndexPath.row)
-        let last = max(sourceIndexPath.row, destinationIndexPath.row)
-        let rows = [Int](first...last).map() { row in IndexPath(row: row, section: 0) }
-        tableView.reloadRows(at: rows, with: .automatic)
     }
     
     func tableView(_ tableView: UITableView, targetIndexPathForMoveFromRowAt sourceIndexPath: IndexPath, toProposedIndexPath proposedDestinationIndexPath: IndexPath) -> IndexPath {
diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
index d195c58..f7061bb 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
@@ -74,7 +74,7 @@ class VideoQueueTableViewCell: UITableViewCell {
             } else {
                 // update design for queued video
                 playImageView.isHidden = true
-                numberLabel.isHidden = false
+                numberLabel.isHidden = true // TODO: set to false when moveRowAt updates the number
                 backgroundColor = unhighlightedBackgroundColor
                 contentView.backgroundColor = unhighlightedBackgroundColor
                 separatorInset = UIEdgeInsetsMake(0, 15, 0, 0)

From a495f49be420f26c4ac470f9f9156b7a1f99605e Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Wed, 8 Feb 2017 10:07:40 -0600
Subject: [PATCH 24/31] Scroll to current video when showing the queue

---
 .../Stormtrooper/Controllers/StreamViewController.swift       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index a8b3e36..586a1cf 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -398,6 +398,10 @@ class StreamViewController: UIViewController {
                 self.headerArrowImageView.transform = CGAffineTransform(rotationAngle: CGFloat.pi)
             }, completion: { complete in
                 self.queueView.isHidden = false
+                if let currentVideoIndex = self.viewModel.currentVideoIndex {
+                    let currentVideoIndexPath = IndexPath(row: currentVideoIndex, section: 0)
+                    self.queueTableView.scrollToRow(at: currentVideoIndexPath, at: .top, animated: true)
+                }
             })
         }
         else {

From 63b3f783c9d79c3c808ded40f4c081c59cbf5fc0 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Wed, 8 Feb 2017 11:44:59 -0600
Subject: [PATCH 25/31] Add helper function to highlight/unhighlight

---
 .../Controllers/StreamViewController.swift    | 46 +++++++------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index 586a1cf..91e61e0 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -539,7 +539,18 @@ class StreamViewController: UIViewController {
             }
         }
     }
-
+    
+    fileprivate func setHighlightForVideo(at row: Int, highlighted: Bool) {
+        // update the previous video (i.e. whether to hide its separator)
+        let previousIndexPath = IndexPath(row: row-1, section: 0)
+        let previousVideoCell = queueTableView.cellForRow(at: previousIndexPath) as? VideoQueueTableViewCell
+        previousVideoCell?.isPreviousVideo = highlighted
+        
+        // update the current video (i.e. whether to highlight it)
+        let indexPath = IndexPath(row: row, section: 0)
+        let videoCell = queueTableView.cellForRow(at: indexPath) as? VideoQueueTableViewCell
+        videoCell?.isCurrentVideo = highlighted
+    }
 }
 
 extension StreamViewController: StreamViewModelDelegate {
@@ -730,20 +741,9 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         guard viewModel.currentVideoIndex != indexPath.row else { return }
         guard let currentVideoIndex = viewModel.currentVideoIndex else { return }
-        
-        // remove highlight for the current video
-        let currentVideoIndexPath = IndexPath(row: currentVideoIndex, section: 0)
-        let currentVideoCell = tableView.cellForRow(at: currentVideoIndexPath) as? VideoQueueTableViewCell
-        currentVideoCell?.isCurrentVideo = false
-        
-        // add highlight for the selected video
-        let selectedVideoCell = tableView.cellForRow(at: indexPath) as? VideoQueueTableViewCell
-        selectedVideoCell?.isCurrentVideo = true
-        
-        // update the view model
+        setHighlightForVideo(at: currentVideoIndex, highlighted: false)
+        setHighlightForVideo(at: indexPath.row, highlighted: true)
         viewModel.currentVideoIndex = indexPath.row
-        
-        // play the selected video
         playerView.cueVideo(byId: viewModel.videoQueue?[indexPath.row].id ?? "", startSeconds: 0, suggestedQuality: .default)
         playerView.playVideo()
     }
@@ -885,24 +885,10 @@ extension StreamViewController: YTPlayerViewDelegate {
     private func playNextVideo() {
         guard let videoQueue = viewModel.videoQueue else { return }
         guard let currentVideoIndex = viewModel.currentVideoIndex else { return }
-        
-        // identify the next video (wrapping around, if necessary)
         let nextVideoIndex = currentVideoIndex < videoQueue.count-1 ? currentVideoIndex+1 : 0
-        
-        // remove highlight for the current video
-        let currentVideoIndexPath = IndexPath(row: currentVideoIndex, section: 0)
-        let currentVideoCell = queueTableView.cellForRow(at: currentVideoIndexPath) as? VideoQueueTableViewCell
-        currentVideoCell?.isCurrentVideo = false
-        
-        // add highlight for the next video
-        let nextVideoIndexPath = IndexPath(row: nextVideoIndex, section: 0)
-        let selectedVideoCell = queueTableView.cellForRow(at: nextVideoIndexPath) as? VideoQueueTableViewCell
-        selectedVideoCell?.isCurrentVideo = true
-        
-        // update view model
+        setHighlightForVideo(at: currentVideoIndex, highlighted: false)
+        setHighlightForVideo(at: nextVideoIndex, highlighted: true)
         viewModel.currentVideoIndex = nextVideoIndex
-        
-        // play the next video
         let nextVideoId = videoQueue[nextVideoIndex].id
         playerView.cueVideo(byId: nextVideoId, startSeconds: 0, suggestedQuality: .default)
         playerView.playVideo()

From 736bbc3fe7099a4eea824f80347453a618bf3b89 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Wed, 8 Feb 2017 11:45:19 -0600
Subject: [PATCH 26/31] Set previous video when loading cells

---
 .../Stormtrooper/Controllers/StreamViewController.swift     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index 91e61e0..238f71b 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -789,14 +789,16 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
     
 	private func cellFor(queueTableView tableView: UITableView, at indexPath: IndexPath) -> UITableViewCell {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "queueCell") as? VideoQueueTableViewCell,
-            let video = viewModel.videoQueue?[indexPath.row] else {
+            let video = viewModel.videoQueue?[indexPath.row],
+            let currentVideoIndex = viewModel.currentVideoIndex else {
                 return UITableViewCell()
         }
         
         cell.number = "\(indexPath.row + 1)"
         cell.title = video.title
         cell.channel = video.channelTitle
-        cell.isCurrentVideo = (viewModel.currentVideoIndex == indexPath.row)
+        cell.isPreviousVideo = (currentVideoIndex-1 == indexPath.row)
+        cell.isCurrentVideo = (currentVideoIndex == indexPath.row)
         
         YouTubeDataManager.sharedInstance.getThumbnailForVideo(with: video.mediumThumbnailURL) {error, image in
             guard let image = image else { return }

From c12b799bad231bf9a7665cc45f7a5191c0ea2b41 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Wed, 8 Feb 2017 11:46:14 -0600
Subject: [PATCH 27/31] Add support for deleting the current video

---
 .../Controllers/StreamViewController.swift    | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index 238f71b..d9b94a4 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -551,6 +551,38 @@ class StreamViewController: UIViewController {
         let videoCell = queueTableView.cellForRow(at: indexPath) as? VideoQueueTableViewCell
         videoCell?.isCurrentVideo = highlighted
     }
+    
+    fileprivate func deleteVideo(at indexPath: IndexPath) {
+        guard let currentVideoIndex = viewModel.currentVideoIndex else { return }
+        let previousIndexPath = IndexPath(row: indexPath.row - 1, section: 0)
+        let nextIndexPath = IndexPath(row: indexPath.row + 1, section: 0)
+        
+        // deleted the previous video
+        if indexPath.row == currentVideoIndex - 1 {
+            let previousCell = queueTableView.cellForRow(at: previousIndexPath)
+            let previousVideoCell = previousCell as? VideoQueueTableViewCell
+            previousVideoCell?.isPreviousVideo = true
+        }
+        
+        // deleted the current video
+        if indexPath.row == currentVideoIndex {
+            guard let videoQueue = viewModel.videoQueue else { return }
+            setHighlightForVideo(at: nextIndexPath.row, highlighted: true)
+            viewModel.currentVideoIndex = nextIndexPath.row
+            let nextVideoId = videoQueue[nextIndexPath.row].id
+            playerView.cueVideo(byId: nextVideoId, startSeconds: 0, suggestedQuality: .default)
+            playerView.playVideo()
+        }
+        
+        // remove deleted video from queue and view model
+        queueTableView.beginUpdates()
+        queueTableView.deleteRows(at: [indexPath], with: .automatic)
+        viewModel.videoQueue?.remove(at: indexPath.row)
+        if currentVideoIndex > indexPath.row {
+            viewModel.currentVideoIndex = currentVideoIndex - 1
+        }
+        queueTableView.endUpdates()
+    }
 }
 
 extension StreamViewController: StreamViewModelDelegate {
@@ -685,14 +717,9 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
-        if editingStyle == .delete, indexPath.row != viewModel.currentVideoIndex {
-            tableView.beginUpdates()
-            viewModel.videoQueue?.remove(at: indexPath.row)
-            tableView.deleteRows(at: [indexPath], with: .automatic)
-            if viewModel.currentVideoIndex ?? 0 > indexPath.row {
-                viewModel.currentVideoIndex = (viewModel.currentVideoIndex ?? 0) - 1
-            }
-            tableView.endUpdates()
+        switch editingStyle {
+        case .delete: deleteVideo(at: indexPath)
+        default: break
         }
     }
 	

From aa1574409a2e69f647aebbdbd750e2edb832cbd5 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Wed, 8 Feb 2017 11:46:30 -0600
Subject: [PATCH 28/31] =?UTF-8?q?Code=20cleanup=20=E2=80=94=20use=20switch?=
 =?UTF-8?q?=20instead=20of=20if/else?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/StreamViewController.swift    | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index d9b94a4..541ad96 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -680,13 +680,11 @@ extension StreamViewController: StreamViewModelDelegate {
 
 extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
 	func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        if tableView.tag == chatTableTag {
-            return cellFor(chatTableView: tableView, at: indexPath)
-        }
-        else if tableView.tag == queueTableTag {
-            return cellFor(queueTableView: tableView, at: indexPath)
+        switch tableView.tag {
+        case chatTableTag: return cellFor(chatTableView: tableView, at: indexPath)
+        case queueTableTag: return cellFor(queueTableView: tableView, at: indexPath)
+        default: return UITableViewCell()
         }
-        return UITableViewCell()
 	}
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
@@ -701,8 +699,7 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
         if isKeyboardShowing {
             visualEffectView.isHidden = false
             dismissView.isHidden = false
-        }
-        else {
+        } else {
             visualEffectView.isHidden = true
             dismissView.isHidden = true
         }
@@ -724,20 +721,19 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
     }
 	
 	func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if tableView.tag == chatTableTag {
-            return viewModel.messages.count //TODO: limit this to 50 or whatever performance allows
-        }
-        else if tableView.tag == queueTableTag {
-            return viewModel.videoQueue?.count ?? 0
+        switch tableView.tag {
+        case chatTableTag: return viewModel.messages.count
+        case queueTableTag: return viewModel.videoQueue?.count ?? 0
+        default: return 0
         }
-        return 0
 	}
     
     func tableView(_ tableView: UITableView, canMoveRowAt indexPath: IndexPath) -> Bool {
-        if tableView.tag == queueTableTag {
-            return true
+        switch tableView.tag {
+        case chatTableTag: return false
+        case queueTableTag: return true
+        default: return false
         }
-        return false
     }
     
     func tableView(_ tableView: UITableView, moveRowAt sourceIndexPath: IndexPath, to destinationIndexPath: IndexPath) {

From 76aa0bee19f60db045b3010f62732d1bd7d4861e Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Wed, 8 Feb 2017 14:47:44 -0600
Subject: [PATCH 29/31] Remove ability to delete the current video

---
 .../Stormtrooper/Controllers/StreamViewController.swift         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index 541ad96..2b4570f 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -708,7 +708,7 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
         switch tableView.tag {
         case chatTableTag: return false
-        case queueTableTag: return true
+        case queueTableTag: return indexPath.row != viewModel.currentVideoIndex
         default: return false
         }
     }

From 2e4fab369df7deae2905641a01002ca3d75a6c4c Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Wed, 8 Feb 2017 14:48:04 -0600
Subject: [PATCH 30/31] Remove video cell numbers and play icon

---
 .../Controllers/StreamViewController.swift    |  1 -
 .../Views/VideoQueueTableViewCell.swift       | 12 -------
 .../Views/VideoQueueTableViewCell.xib         | 36 +++----------------
 3 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index 2b4570f..94f5e0a 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -817,7 +817,6 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
                 return UITableViewCell()
         }
         
-        cell.number = "\(indexPath.row + 1)"
         cell.title = video.title
         cell.channel = video.channelTitle
         cell.isPreviousVideo = (currentVideoIndex-1 == indexPath.row)
diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
index f7061bb..4c33e6a 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.swift
@@ -10,8 +10,6 @@ import UIKit
 
 class VideoQueueTableViewCell: UITableViewCell {
     
-    @IBOutlet private weak var playImageView: UIImageView!
-    @IBOutlet private weak var numberLabel: UILabel!
     @IBOutlet private weak var thumbnailImageView: UIImageView!
     @IBOutlet private weak var titleLabel: UILabel!
     @IBOutlet private weak var channelLabel: UILabel!
@@ -22,12 +20,6 @@ class VideoQueueTableViewCell: UITableViewCell {
     private var _isPreviousVideo = false
     private var _isCurrentVideo = false
     
-    /// The video's position in the playlist.
-    var number: String? {
-        get { return numberLabel.text }
-        set { numberLabel.text = newValue }
-    }
-    
     /// The video's thumbnail.
     var thumbnail: UIImage? {
         get { return thumbnailImageView.image }
@@ -66,15 +58,11 @@ class VideoQueueTableViewCell: UITableViewCell {
             _isCurrentVideo = newValue
             if _isCurrentVideo {
                 // update design for current video
-                playImageView.isHidden = false
-                numberLabel.isHidden = true
                 backgroundColor = highlightedBackgroundColor
                 contentView.backgroundColor = highlightedBackgroundColor
                 separatorInset = UIEdgeInsetsMake(0, 0, 0, bounds.size.width)
             } else {
                 // update design for queued video
-                playImageView.isHidden = true
-                numberLabel.isHidden = true // TODO: set to false when moveRowAt updates the number
                 backgroundColor = unhighlightedBackgroundColor
                 contentView.backgroundColor = unhighlightedBackgroundColor
                 separatorInset = UIEdgeInsetsMake(0, 15, 0, 0)
diff --git a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.xib b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.xib
index 2d07edb..66cdead 100644
--- a/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.xib
+++ b/iOS/Stormtrooper/Stormtrooper/Views/VideoQueueTableViewCell.xib
@@ -15,9 +15,6 @@
         <array key="OpenSans-Semibold.ttf">
             <string>OpenSans-Semibold</string>
         </array>
-        <array key="WorkSans-SemiBold.ttf">
-            <string>WorkSans-SemiBold</string>
-        </array>
     </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -26,37 +23,24 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="92"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pjQ-Xb-dT9" id="nuy-5u-3fy">
-                <rect key="frame" x="0.0" y="0.0" width="375" height="91"/>
+                <rect key="frame" x="0.0" y="0.0" width="375" height="91.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="playing" translatesAutoresizingMaskIntoConstraints="NO" id="6JK-1q-vB2" userLabel="Play Icon">
-                        <rect key="frame" x="17" y="39" width="9" height="13"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="13" id="FmX-Oz-iat"/>
-                            <constraint firstAttribute="width" constant="9" id="MYv-yY-g9B"/>
-                        </constraints>
-                    </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SCb-XO-XUo" userLabel="Number">
-                        <rect key="frame" x="17" y="38" width="9" height="15"/>
-                        <fontDescription key="fontDescription" name="WorkSans-SemiBold" family="Work Sans" pointSize="12"/>
-                        <color key="textColor" red="0.98431372549019602" green="0.9882352941176471" blue="0.9882352941176471" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <nil key="highlightedColor"/>
-                    </label>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="zeJ-L7-XaG">
-                        <rect key="frame" x="41" y="13" width="115" height="65"/>
+                        <rect key="frame" x="17" y="13" width="115" height="65"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="65" id="DUZ-hh-rXf"/>
                             <constraint firstAttribute="width" constant="115" id="eFl-PQ-k6O"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Beyoncé - XO, Official Video" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bKH-c6-NpJ" userLabel="Title">
-                        <rect key="frame" x="174" y="26" width="193" height="18"/>
+                        <rect key="frame" x="150" y="26" width="217" height="18"/>
                         <fontDescription key="fontDescription" name="OpenSans-Semibold" family="Open Sans" pointSize="13"/>
                         <color key="textColor" red="0.96470588239999999" green="0.96470588239999999" blue="0.96470588239999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="BeyoncéOfficial" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Aho-q6-CFK" userLabel="Channel">
-                        <rect key="frame" x="174" y="47" width="193" height="16.5"/>
+                        <rect key="frame" x="150" y="47" width="217" height="16.5"/>
                         <fontDescription key="fontDescription" name="OpenSans" family="Open Sans" pointSize="12"/>
                         <color key="textColor" red="0.96470588239999999" green="0.96470588239999999" blue="0.96470588239999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
@@ -64,17 +48,12 @@
                 </subviews>
                 <color key="backgroundColor" red="0.15686274510000001" green="0.14117647059999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 <constraints>
-                    <constraint firstItem="zeJ-L7-XaG" firstAttribute="leading" secondItem="SCb-XO-XUo" secondAttribute="trailing" constant="15" id="4Lo-je-Dck"/>
-                    <constraint firstItem="SCb-XO-XUo" firstAttribute="centerY" secondItem="nuy-5u-3fy" secondAttribute="centerY" id="8ny-Wo-fHd"/>
-                    <constraint firstItem="zeJ-L7-XaG" firstAttribute="leading" secondItem="6JK-1q-vB2" secondAttribute="trailing" constant="15" id="EIZ-Iv-ntS"/>
                     <constraint firstItem="Aho-q6-CFK" firstAttribute="top" secondItem="bKH-c6-NpJ" secondAttribute="bottom" constant="3" id="G2o-gF-LRl"/>
+                    <constraint firstItem="zeJ-L7-XaG" firstAttribute="leading" secondItem="nuy-5u-3fy" secondAttribute="leading" constant="17" id="GdT-Wl-o2u"/>
                     <constraint firstItem="Aho-q6-CFK" firstAttribute="leading" secondItem="bKH-c6-NpJ" secondAttribute="leading" id="IEg-Ce-wv2"/>
                     <constraint firstAttribute="bottom" secondItem="Aho-q6-CFK" secondAttribute="bottom" constant="28" id="IN6-Mg-8XE"/>
                     <constraint firstAttribute="trailing" secondItem="bKH-c6-NpJ" secondAttribute="trailing" constant="8" id="TY0-gq-aj1"/>
-                    <constraint firstItem="SCb-XO-XUo" firstAttribute="leading" secondItem="nuy-5u-3fy" secondAttribute="leading" constant="17" id="dy7-gR-pzu"/>
-                    <constraint firstItem="6JK-1q-vB2" firstAttribute="leading" secondItem="nuy-5u-3fy" secondAttribute="leading" constant="17" id="fOY-a4-nSp"/>
                     <constraint firstItem="bKH-c6-NpJ" firstAttribute="leading" secondItem="zeJ-L7-XaG" secondAttribute="trailing" constant="18" id="hXb-vl-xBW"/>
-                    <constraint firstItem="6JK-1q-vB2" firstAttribute="centerY" secondItem="nuy-5u-3fy" secondAttribute="centerY" id="kSr-SR-cSK"/>
                     <constraint firstItem="bKH-c6-NpJ" firstAttribute="top" secondItem="nuy-5u-3fy" secondAttribute="top" constant="26" id="ukX-U2-YCu"/>
                     <constraint firstAttribute="trailing" secondItem="Aho-q6-CFK" secondAttribute="trailing" constant="8" id="wKK-4v-KYO"/>
                     <constraint firstItem="zeJ-L7-XaG" firstAttribute="centerY" secondItem="nuy-5u-3fy" secondAttribute="centerY" id="wwx-oc-Qpc"/>
@@ -85,15 +64,10 @@
             <inset key="separatorInset" minX="15" minY="0.0" maxX="0.0" maxY="0.0"/>
             <connections>
                 <outlet property="channelLabel" destination="Aho-q6-CFK" id="AGt-VW-jkc"/>
-                <outlet property="numberLabel" destination="SCb-XO-XUo" id="j7d-lv-RCH"/>
-                <outlet property="playImageView" destination="6JK-1q-vB2" id="vIn-5Q-ywA"/>
                 <outlet property="thumbnailImageView" destination="zeJ-L7-XaG" id="ZSs-Xv-Zwi"/>
                 <outlet property="titleLabel" destination="bKH-c6-NpJ" id="jHz-eP-J81"/>
             </connections>
             <point key="canvasLocation" x="41.5" y="51"/>
         </tableViewCell>
     </objects>
-    <resources>
-        <image name="playing" width="9" height="13"/>
-    </resources>
 </document>

From 8a2af980695d42ad7c868debcd2c891f935a1172 Mon Sep 17 00:00:00 2001
From: "Glenn R. Fisher" <glennrfisher@gmail.com>
Date: Wed, 8 Feb 2017 14:50:17 -0600
Subject: [PATCH 31/31] Update guard statements

---
 .../Controllers/StreamViewController.swift           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
index 94f5e0a..9c92d6d 100644
--- a/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
+++ b/iOS/Stormtrooper/Stormtrooper/Controllers/StreamViewController.swift
@@ -737,8 +737,10 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, moveRowAt sourceIndexPath: IndexPath, to destinationIndexPath: IndexPath) {
-        guard let currentVideoIndex = viewModel.currentVideoIndex else { return }
-        guard let video = viewModel.videoQueue?.remove(at: sourceIndexPath.row) else { return }
+        guard let currentVideoIndex = viewModel.currentVideoIndex,
+            let video = viewModel.videoQueue?.remove(at: sourceIndexPath.row) else {
+                return
+        }
         viewModel.videoQueue?.insert(video, at: destinationIndexPath.row)
         
         // update the view model's current video index
@@ -762,8 +764,10 @@ extension StreamViewController: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        guard viewModel.currentVideoIndex != indexPath.row else { return }
-        guard let currentVideoIndex = viewModel.currentVideoIndex else { return }
+        guard viewModel.currentVideoIndex != indexPath.row,
+            let currentVideoIndex = viewModel.currentVideoIndex else {
+                return
+        }
         setHighlightForVideo(at: currentVideoIndex, highlighted: false)
         setHighlightForVideo(at: indexPath.row, highlighted: true)
         viewModel.currentVideoIndex = indexPath.row