From e723cd8e3b689a9ca1a7eae654515da85866fa82 Mon Sep 17 00:00:00 2001
From: Saagar Jha <saagar@saagarjha.com>
Date: Thu, 27 Sep 2018 23:31:23 -0700
Subject: [PATCH 1/2] Update for iOS 12

---
 .travis.yml                                   |  2 +-
 iOS/break/break-watchOS Extension/Info.plist  |  2 +-
 iOS/break/break-watchOS/Info.plist            |  2 +-
 iOS/break/break/Resources/Info.plist          |  2 +-
 .../Locker/LockerItemCollectionViewCell.swift |  8 --
 .../break/Locker/LockerViewController.swift   | 16 ++++
 iOS/break/break/break/Main.storyboard         | 82 +++++++++----------
 7 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1bd1500..d0b101e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
 language: objective-c
-osx_image: xcode9.4
+osx_image: xcode10
 
 script: xcodebuild -project iOS/break/break.xcodeproj -scheme break CODE_SIGNING_ALLOWED=NO
diff --git a/iOS/break/break-watchOS Extension/Info.plist b/iOS/break/break-watchOS Extension/Info.plist
index ad6b893..f3b4cc6 100644
--- a/iOS/break/break-watchOS Extension/Info.plist	
+++ b/iOS/break/break-watchOS Extension/Info.plist	
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1401</string>
+	<string>1402</string>
 	<key>CLKComplicationPrincipalClass</key>
 	<string>$(PRODUCT_MODULE_NAME).ComplicationController</string>
 	<key>CLKComplicationPrincipalClass - 2</key>
diff --git a/iOS/break/break-watchOS/Info.plist b/iOS/break/break-watchOS/Info.plist
index fe24be2..284a384 100644
--- a/iOS/break/break-watchOS/Info.plist
+++ b/iOS/break/break-watchOS/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1401</string>
+	<string>1402</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
diff --git a/iOS/break/break/Resources/Info.plist b/iOS/break/break/Resources/Info.plist
index 48e7e9c..a078eb3 100644
--- a/iOS/break/break/Resources/Info.plist
+++ b/iOS/break/break/Resources/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1401</string>
+	<string>1402</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSFaceIDUsageDescription</key>
diff --git a/iOS/break/break/break/Locker/LockerItemCollectionViewCell.swift b/iOS/break/break/break/Locker/LockerItemCollectionViewCell.swift
index 2aa5e4d..5d56d6a 100644
--- a/iOS/break/break/break/Locker/LockerItemCollectionViewCell.swift
+++ b/iOS/break/break/break/Locker/LockerItemCollectionViewCell.swift
@@ -11,12 +11,4 @@ import UIKit
 class LockerItemCollectionViewCell: UICollectionViewCell {
 	@IBOutlet weak var typeImageView: UIImageView!
 	@IBOutlet weak var nameLabel: UILabel!
-	@IBOutlet weak var typeImageViewWidthConstraint: NSLayoutConstraint! {
-		didSet {
-			// Not sure why this is necessary, but adding it makes AutoLayout
-			// stop complaining
-			contentView.translatesAutoresizingMaskIntoConstraints = false
-			nameLabel.preferredMaxLayoutWidth = typeImageViewWidthConstraint.constant
-		}
-	}
 }
diff --git a/iOS/break/break/break/Locker/LockerViewController.swift b/iOS/break/break/break/Locker/LockerViewController.swift
index d3996da..1a2afcc 100644
--- a/iOS/break/break/break/Locker/LockerViewController.swift
+++ b/iOS/break/break/break/Locker/LockerViewController.swift
@@ -15,6 +15,7 @@ class LockerViewController: UIViewController, UICollectionViewDataSource, UIColl
 	static let cellIdentifier = "lockerItem"
 
 	static let cellWidth: CGFloat = 144
+	static let otherCellHeight: CGFloat = 128 + 8
 
 	var path = "/"
 
@@ -137,6 +138,21 @@ class LockerViewController: UIViewController, UICollectionViewDataSource, UIColl
 			return UIEdgeInsets(inset: inset)
 		}
 	}
+	
+	func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+		let width: CGFloat
+		if #available(iOS 11.0, *) {
+			width = lockerCollectionView.frame.width - lockerCollectionView.safeAreaInsets.right - lockerCollectionView.safeAreaInsets.left
+		} else {
+			width = lockerCollectionView.frame.width
+		}
+		let rowSize = Int(width / LockerViewController.cellWidth)
+		let startIndex = indexPath.row / rowSize
+		let maxTextHeight = (startIndex..<min(lockerItems.endIndex, startIndex + rowSize)).map { index in
+			(lockerItems[index].name as NSString).boundingRect(with: CGSize(width: LockerViewController.cellWidth, height: .infinity), options: .usesLineFragmentOrigin, attributes: [.font: UIFont.preferredFont(forTextStyle: .headline)], context: nil).height
+			}.max() ?? 0
+		return CGSize(width: LockerViewController.cellWidth, height: LockerViewController.otherCellHeight + maxTextHeight)
+	}
 
 	func numberOfSections(in collectionView: UICollectionView) -> Int {
 		return 1
diff --git a/iOS/break/break/break/Main.storyboard b/iOS/break/break/break/Main.storyboard
index 68b5ee6..d92a93a 100644
--- a/iOS/break/break/break/Main.storyboard
+++ b/iOS/break/break/break/Main.storyboard
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="VA0-KO-lQk">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.15" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="VA0-KO-lQk">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
-        <capability name="Alignment constraints to the first baseline" minToolsVersion="6.0"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.9"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -31,22 +28,22 @@
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                         <subviews>
                                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Full School Name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4QA-5T-P9E">
-                                                <rect key="frame" x="76" y="281" width="223" height="30"/>
+                                                <rect key="frame" x="76" y="280.5" width="223" height="30"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits" autocapitalizationType="words" autocorrectionType="no" returnKeyType="next"/>
                                             </textField>
                                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Username" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Pw9-f5-ZVc">
-                                                <rect key="frame" x="76" y="319" width="223" height="30"/>
+                                                <rect key="frame" x="76" y="318.5" width="223" height="30"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="next"/>
                                             </textField>
                                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Password" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="L0c-ty-z1U">
-                                                <rect key="frame" x="76" y="357" width="223" height="30"/>
+                                                <rect key="frame" x="76" y="356.5" width="223" height="30"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done"/>
                                             </textField>
                                             <stackView opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="oXX-Qp-n0g">
-                                                <rect key="frame" x="76" y="173" width="223" height="100"/>
+                                                <rect key="frame" x="76" y="172.5" width="223" height="100"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="AppIconiOS11Hack" translatesAutoresizingMaskIntoConstraints="NO" id="Oe1-ED-gEo">
                                                         <rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
@@ -77,7 +74,7 @@
                                                 </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cnn-Ty-sq3">
-                                                <rect key="frame" x="76" y="395" width="223" height="34"/>
+                                                <rect key="frame" x="76" y="394.5" width="223" height="34"/>
                                                 <color key="backgroundColor" red="0.039215686270000001" green="0.4823529412" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <state key="normal" title="Log in"/>
                                                 <state key="disabled" title="Logging in…"/>
@@ -154,7 +151,7 @@
                         <outlet property="privacyPolicyButton" destination="eB2-rL-PLz" id="0g5-87-zDx"/>
                         <outlet property="schoolNameTextField" destination="4QA-5T-P9E" id="KkR-vs-Zpg"/>
                         <outlet property="usernameTextField" destination="Pw9-f5-ZVc" id="DpD-h8-xb8"/>
-                        <segue destination="wro-wY-77c" kind="show" identifier="logInSegue" action="showDetailViewController:sender:" id="jTU-L5-zDX"/>
+                        <segue destination="wro-wY-77c" kind="show" identifier="logInSegue" id="jTU-L5-zDX"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
@@ -177,7 +174,7 @@
                                 <rect key="frame" x="42.5" y="269.5" width="290.5" height="128.5"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="IcA-ia-2WB">
-                                        <rect key="frame" x="36" y="0.0" width="219" height="100"/>
+                                        <rect key="frame" x="35.5" y="0.0" width="219" height="100"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="AppIconiOS11Hack" translatesAutoresizingMaskIntoConstraints="NO" id="p4J-UV-7tV">
                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
@@ -262,49 +259,47 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="QQw-IV-Ygu">
-                            <size key="itemSize" width="144" height="170"/>
+                            <size key="itemSize" width="144" height="154"/>
                             <size key="headerReferenceSize" width="0.0" height="0.0"/>
                             <size key="footerReferenceSize" width="0.0" height="0.0"/>
                             <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                         </collectionViewFlowLayout>
                         <cells>
                             <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="lockerItem" id="IY5-Hg-Yh1" customClass="LockerItemCollectionViewCell" customModule="break" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="144" height="170"/>
+                                <rect key="frame" x="0.0" y="0.0" width="144" height="154"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                                    <rect key="frame" x="0.0" y="0.0" width="144" height="170"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="144" height="154"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hiR-Ae-M92">
-                                            <rect key="frame" x="53" y="144" width="38" height="18"/>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="File" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hiR-Ae-M92">
+                                            <rect key="frame" x="60" y="136" width="24" height="18"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5ki-cs-85E">
-                                            <rect key="frame" x="8" y="8" width="128" height="128"/>
+                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="FileIcon" translatesAutoresizingMaskIntoConstraints="NO" id="5ki-cs-85E">
+                                            <rect key="frame" x="8" y="0.0" width="128" height="128"/>
                                             <constraints>
-                                                <constraint firstAttribute="width" secondItem="5ki-cs-85E" secondAttribute="height" multiplier="1:1" id="g0h-cA-2P1"/>
-                                                <constraint firstAttribute="width" constant="128" id="pMQ-QR-qtU"/>
+                                                <constraint firstAttribute="width" secondItem="5ki-cs-85E" secondAttribute="height" multiplier="1:1" id="6Oo-cs-KgV"/>
+                                                <constraint firstAttribute="width" constant="128" id="sHt-Nj-yJi"/>
                                             </constraints>
                                         </imageView>
                                     </subviews>
                                 </view>
                                 <constraints>
-                                    <constraint firstItem="5ki-cs-85E" firstAttribute="leading" secondItem="IY5-Hg-Yh1" secondAttribute="leading" constant="8" id="1xk-v5-K2H"/>
-                                    <constraint firstItem="5ki-cs-85E" firstAttribute="top" secondItem="IY5-Hg-Yh1" secondAttribute="topMargin" id="DjP-o8-gAO"/>
-                                    <constraint firstAttribute="trailingMargin" relation="greaterThanOrEqual" secondItem="hiR-Ae-M92" secondAttribute="trailing" id="aBT-em-eWI"/>
-                                    <constraint firstItem="hiR-Ae-M92" firstAttribute="top" secondItem="5ki-cs-85E" secondAttribute="bottom" constant="8" symbolic="YES" id="fVA-Pm-lqO"/>
-                                    <constraint firstAttribute="bottomMargin" secondItem="hiR-Ae-M92" secondAttribute="bottom" id="grG-Yn-K8m"/>
-                                    <constraint firstItem="hiR-Ae-M92" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="IY5-Hg-Yh1" secondAttribute="leadingMargin" id="hKe-gT-0nP"/>
-                                    <constraint firstItem="hiR-Ae-M92" firstAttribute="centerX" secondItem="IY5-Hg-Yh1" secondAttribute="centerX" id="j2O-vh-a04"/>
-                                    <constraint firstAttribute="trailing" secondItem="5ki-cs-85E" secondAttribute="trailing" constant="8" id="klW-d5-cVJ"/>
-                                    <constraint firstItem="5ki-cs-85E" firstAttribute="centerX" secondItem="IY5-Hg-Yh1" secondAttribute="centerX" id="qDl-w3-xYm"/>
+                                    <constraint firstItem="5ki-cs-85E" firstAttribute="top" secondItem="IY5-Hg-Yh1" secondAttribute="top" id="3Gy-pl-ff6"/>
+                                    <constraint firstAttribute="leading" relation="lessThanOrEqual" secondItem="hiR-Ae-M92" secondAttribute="leading" id="A93-8q-mKK"/>
+                                    <constraint firstItem="hiR-Ae-M92" firstAttribute="centerX" secondItem="IY5-Hg-Yh1" secondAttribute="centerX" id="D0H-h2-O4g"/>
+                                    <constraint firstAttribute="trailingMargin" secondItem="5ki-cs-85E" secondAttribute="trailing" id="DPA-Yf-AGZ"/>
+                                    <constraint firstItem="5ki-cs-85E" firstAttribute="centerX" secondItem="IY5-Hg-Yh1" secondAttribute="centerX" id="dXg-37-fJU"/>
+                                    <constraint firstItem="hiR-Ae-M92" firstAttribute="trailing" relation="lessThanOrEqual" secondItem="IY5-Hg-Yh1" secondAttribute="trailing" id="eFA-sU-7Nr"/>
+                                    <constraint firstItem="hiR-Ae-M92" firstAttribute="top" secondItem="5ki-cs-85E" secondAttribute="bottom" constant="8" symbolic="YES" id="ebM-eo-7p9"/>
+                                    <constraint firstItem="5ki-cs-85E" firstAttribute="leading" secondItem="IY5-Hg-Yh1" secondAttribute="leadingMargin" id="xxA-BZ-r2o"/>
                                 </constraints>
                                 <connections>
                                     <outlet property="nameLabel" destination="hiR-Ae-M92" id="JXW-Es-Yny"/>
                                     <outlet property="typeImageView" destination="5ki-cs-85E" id="jXf-ae-g0J"/>
-                                    <outlet property="typeImageViewWidthConstraint" destination="pMQ-QR-qtU" id="d4m-hR-NPo"/>
                                 </connections>
                             </collectionViewCell>
                         </cells>
@@ -351,7 +346,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Author" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YhY-hW-B7X">
-                                            <rect key="frame" x="16" y="43" width="47" height="18"/>
+                                            <rect key="frame" x="16" y="43" width="46.5" height="18"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
@@ -380,7 +375,7 @@
                                     <outlet property="authorNameLabel" destination="YhY-hW-B7X" id="sCW-bJ-A8z"/>
                                     <outlet property="createdDateLabel" destination="wcn-2k-mXg" id="UNG-Ae-gEG"/>
                                     <outlet property="titleLabel" destination="x00-or-XUI" id="tZq-3U-cDI"/>
-                                    <segue destination="C3g-Wi-Qlm" kind="show" action="showDetailViewController:sender:" id="5NF-Pm-XDR"/>
+                                    <segue destination="C3g-Wi-Qlm" kind="showDetail" id="5NF-Pm-XDR"/>
                                 </connections>
                             </tableViewCell>
                         </prototypes>
@@ -453,7 +448,7 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Class" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rNG-8n-mew">
-                                            <rect key="frame" x="16" y="43" width="38" height="18"/>
+                                            <rect key="frame" x="16" y="43" width="37.5" height="18"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
@@ -489,7 +484,7 @@
                                     <outlet property="courseNameDiscriminatorView" destination="gNz-In-8Fb" id="OM8-3y-2A9"/>
                                     <outlet property="courseNameLabel" destination="rNG-8n-mew" id="YPS-4k-eZO"/>
                                     <outlet property="titleLabel" destination="GMP-RG-Uvo" id="7d3-rf-0Qj"/>
-                                    <segue destination="JQh-ht-K4w" kind="show" action="showDetailViewController:sender:" id="lf4-uT-lwL"/>
+                                    <segue destination="JQh-ht-K4w" kind="showDetail" id="lf4-uT-lwL"/>
                                 </connections>
                             </tableViewCell>
                         </prototypes>
@@ -588,7 +583,7 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xuq-fW-2lp">
-                                            <rect key="frame" x="16" y="69" width="33" height="18"/>
+                                            <rect key="frame" x="16" y="69" width="32.5" height="18"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
@@ -631,7 +626,7 @@
                                     <outlet property="dateLabel" destination="xuq-fW-2lp" id="2va-6H-36k"/>
                                     <outlet property="senderLabel" destination="0W3-S7-1hd" id="YXz-DF-JtC"/>
                                     <outlet property="subjectLabel" destination="nl9-SD-wDU" id="hik-1Q-s4N"/>
-                                    <segue destination="2PU-JK-wmk" kind="show" action="showDetailViewController:sender:" id="NsP-zp-qXh"/>
+                                    <segue destination="2PU-JK-wmk" kind="showDetail" id="NsP-zp-qXh"/>
                                 </connections>
                             </tableViewCell>
                         </prototypes>
@@ -968,13 +963,13 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Category" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YpK-Dm-4qS" customClass="CategoryNameLabel" customModule="break" customModuleProvider="target">
-                                            <rect key="frame" x="16" y="43" width="71" height="18"/>
+                                            <rect key="frame" x="16" y="43" width="70.5" height="18"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MfW-rw-Sj2">
-                                            <rect key="frame" x="0.0" y="0.0" width="4" height="72"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="4" height="71.5"/>
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="4" id="jEC-jr-T9u"/>
@@ -1019,7 +1014,7 @@
                                     <outlet property="percentScoreLabel" destination="u2X-hE-AD0" id="JXc-k8-AIL"/>
                                     <outlet property="scoreLabel" destination="cy1-Fn-LqD" id="Q11-4c-TWv"/>
                                     <outlet property="titleLabel" destination="5jv-DX-1cL" id="UJT-DH-rbL"/>
-                                    <segue destination="GxX-QL-UIG" kind="show" action="showDetailViewController:sender:" id="v8Y-jo-fnM"/>
+                                    <segue destination="GxX-QL-UIG" kind="show" id="v8Y-jo-fnM"/>
                                 </connections>
                             </tableViewCell>
                         </prototypes>
@@ -1066,7 +1061,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" layoutMarginsFollowReadableWidth="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="RdB-G4-6DP">
-                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="554"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <view key="tableFooterView" contentMode="scaleToFill" id="qWh-Ui-D7A">
                                     <rect key="frame" x="0.0" y="72" width="375" height="0.0"/>
@@ -1305,7 +1300,7 @@
                                     <outlet property="periodLabel" destination="RM1-xl-LoU" id="bFl-hw-XXo"/>
                                     <outlet property="scoreLabel" destination="xgc-Ii-2Sv" id="CSJ-35-oeh"/>
                                     <outlet property="teacherNameLabel" destination="1gd-ZT-aQI" id="pY9-0x-V0H"/>
-                                    <segue destination="5O3-dv-Hal" kind="show" action="showDetailViewController:sender:" id="be6-eD-QfN"/>
+                                    <segue destination="5O3-dv-Hal" kind="showDetail" id="be6-eD-QfN"/>
                                 </connections>
                             </tableViewCell>
                         </prototypes>
@@ -1375,6 +1370,7 @@
         <image name="AppIconiOS11Hack" width="512" height="512"/>
         <image name="AssignmentsTabBarIcon" width="25" height="25"/>
         <image name="CoursesTabBarIcon" width="25" height="25"/>
+        <image name="FileIcon" width="512" height="512"/>
         <image name="LockerTabBarIcon" width="25" height="25"/>
         <image name="LoopMailTabBarIcon" width="25" height="25"/>
         <image name="NewsTabBarIcon" width="25" height="25"/>
@@ -1382,7 +1378,7 @@
         <image name="ShowBarButtonIcon" width="22" height="22"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="xbe-A4-Sbm"/>
+        <segue reference="Hvv-ep-Y5l"/>
         <segue reference="be6-eD-QfN"/>
         <segue reference="NsP-zp-qXh"/>
         <segue reference="lf4-uT-lwL"/>

From eb2b0c75805f7756b0da65e36b110971120ff9b6 Mon Sep 17 00:00:00 2001
From: Vihan Bhargava <>
Date: Tue, 4 Dec 2018 21:11:19 -0800
Subject: [PATCH 2/2] Modify loopmail ui

Signed-off-by: Vihan Bhargava <>
Signed-off-by: Vihan <vihan+github@vihan.org>
---
 iOS/break/break-watchOS Extension/Info.plist  |   2 +-
 iOS/break/break-watchOS/Info.plist            |   2 +-
 iOS/break/break.xcodeproj/project.pbxproj     |  34 +++---
 iOS/break/break/Resources/LoopMail.css        |  31 +++++
 .../LoopMailMessageViewController.swift       |  17 ++-
 .../LoopMail/LoopMailViewController.swift     |   5 +
 iOS/break/break/break/Main.storyboard         | 114 +++++++++++-------
 7 files changed, 143 insertions(+), 62 deletions(-)
 create mode 100644 iOS/break/break/Resources/LoopMail.css

diff --git a/iOS/break/break-watchOS Extension/Info.plist b/iOS/break/break-watchOS Extension/Info.plist
index f3b4cc6..126842a 100644
--- a/iOS/break/break-watchOS Extension/Info.plist	
+++ b/iOS/break/break-watchOS Extension/Info.plist	
@@ -39,7 +39,7 @@
 		<key>NSExtensionAttributes</key>
 		<dict>
 			<key>WKAppBundleIdentifier</key>
-			<string>com.saagarjha.break.watchkitapp</string>
+			<string>org.vihan.break.watchkitapp</string>
 		</dict>
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.watchkit</string>
diff --git a/iOS/break/break-watchOS/Info.plist b/iOS/break/break-watchOS/Info.plist
index 284a384..c73660b 100644
--- a/iOS/break/break-watchOS/Info.plist
+++ b/iOS/break/break-watchOS/Info.plist
@@ -28,7 +28,7 @@
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
 	<key>WKCompanionAppBundleIdentifier</key>
-	<string>com.saagarjha.break</string>
+	<string>org.vihan.break</string>
 	<key>WKWatchKitApp</key>
 	<true/>
 </dict>
diff --git a/iOS/break/break.xcodeproj/project.pbxproj b/iOS/break/break.xcodeproj/project.pbxproj
index e37c974..1a6b69e 100644
--- a/iOS/break/break.xcodeproj/project.pbxproj
+++ b/iOS/break/break.xcodeproj/project.pbxproj
@@ -109,6 +109,7 @@
 		49DF2B2E1CF3BDF900DC1EB7 /* CourseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49DF2B2D1CF3BDF900DC1EB7 /* CourseViewController.swift */; };
 		49E1BD091CF006EE002E819D /* SchoolLoopCategory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49E1BD081CF006EE002E819D /* SchoolLoopCategory.swift */; };
 		49F128C41F5F365F0000E19A /* RatingsReviewsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49F128C31F5F365F0000E19A /* RatingsReviewsTableViewController.swift */; };
+		D84C2DBB21B788F3005F4442 /* LoopMail.css in Resources */ = {isa = PBXBuildFile; fileRef = D84C2DBA21B788F3005F4442 /* LoopMail.css */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -257,6 +258,7 @@
 		49DF2B2D1CF3BDF900DC1EB7 /* CourseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseViewController.swift; sourceTree = "<group>"; };
 		49E1BD081CF006EE002E819D /* SchoolLoopCategory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SchoolLoopCategory.swift; sourceTree = "<group>"; };
 		49F128C31F5F365F0000E19A /* RatingsReviewsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RatingsReviewsTableViewController.swift; sourceTree = "<group>"; };
+		D84C2DBA21B788F3005F4442 /* LoopMail.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = LoopMail.css; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -502,6 +504,7 @@
 				498665721C8D24E9004BA249 /* Info.plist */,
 				498665731C8D24E9004BA249 /* LaunchScreen.storyboard */,
 				498665671C8D24E9004BA249 /* Main.storyboard */,
+				D84C2DBA21B788F3005F4442 /* LoopMail.css */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -610,17 +613,17 @@
 				TargetAttributes = {
 					4906AB781CCDBFB800610448 = {
 						CreatedOnToolsVersion = 7.3;
-						DevelopmentTeam = X4A9GH5NN2;
+						DevelopmentTeam = AP83862692;
 						LastSwiftMigration = 0900;
 					};
 					4906AB841CCDBFBA00610448 = {
 						CreatedOnToolsVersion = 7.3;
-						DevelopmentTeam = X4A9GH5NN2;
+						DevelopmentTeam = AP83862692;
 						LastSwiftMigration = 0900;
 					};
 					493E17751C63E95000AFC7A6 = {
 						CreatedOnToolsVersion = 7.2.1;
-						DevelopmentTeam = X4A9GH5NN2;
+						DevelopmentTeam = AP83862692;
 						LastSwiftMigration = 0900;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
@@ -689,6 +692,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D84C2DBB21B788F3005F4442 /* LoopMail.css in Resources */,
 				493DDDEC1EA71AEA006104D4 /* AppIcon.xcassets in Resources */,
 				4986659E1C8D24E9004BA249 /* Main.storyboard in Resources */,
 				498665A71C8D24E9004BA249 /* LaunchScreen.storyboard in Resources */,
@@ -879,10 +883,10 @@
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = X4A9GH5NN2;
+				DEVELOPMENT_TEAM = AP83862692;
 				IBSC_MODULE = break_watchOS_Extension;
 				INFOPLIST_FILE = "break-watchOS/Info.plist";
-				PRODUCT_BUNDLE_IDENTIFIER = com.saagarjha.break.watchkitapp;
+				PRODUCT_BUNDLE_IDENTIFIER = org.vihan.break.watchkitapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
@@ -899,10 +903,10 @@
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = X4A9GH5NN2;
+				DEVELOPMENT_TEAM = AP83862692;
 				IBSC_MODULE = break_watchOS_Extension;
 				INFOPLIST_FILE = "break-watchOS/Info.plist";
-				PRODUCT_BUNDLE_IDENTIFIER = com.saagarjha.break.watchkitapp;
+				PRODUCT_BUNDLE_IDENTIFIER = org.vihan.break.watchkitapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
@@ -918,10 +922,10 @@
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = X4A9GH5NN2;
+				DEVELOPMENT_TEAM = AP83862692;
 				INFOPLIST_FILE = "break-watchOS Extension/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.saagarjha.break.watchkitapp.watchkitextension;
+				PRODUCT_BUNDLE_IDENTIFIER = org.vihan.break.watchkitapp.watchkitextension;
 				PRODUCT_NAME = "${TARGET_NAME}";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
@@ -938,10 +942,10 @@
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = X4A9GH5NN2;
+				DEVELOPMENT_TEAM = AP83862692;
 				INFOPLIST_FILE = "break-watchOS Extension/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.saagarjha.break.watchkitapp.watchkitextension;
+				PRODUCT_BUNDLE_IDENTIFIER = org.vihan.break.watchkitapp.watchkitextension;
 				PRODUCT_NAME = "${TARGET_NAME}";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
@@ -1064,11 +1068,11 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_ENTITLEMENTS = break/break.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = X4A9GH5NN2;
+				DEVELOPMENT_TEAM = AP83862692;
 				INFOPLIST_FILE = "$(SRCROOT)/break/Resources/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.saagarjha.break;
+				PRODUCT_BUNDLE_IDENTIFIER = org.vihan.break;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.0;
@@ -1083,11 +1087,11 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_ENTITLEMENTS = break/break.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = X4A9GH5NN2;
+				DEVELOPMENT_TEAM = AP83862692;
 				INFOPLIST_FILE = "$(SRCROOT)/break/Resources/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.saagarjha.break;
+				PRODUCT_BUNDLE_IDENTIFIER = org.vihan.break;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 4.0;
diff --git a/iOS/break/break/Resources/LoopMail.css b/iOS/break/break/Resources/LoopMail.css
new file mode 100644
index 0000000..d07ffc9
--- /dev/null
+++ b/iOS/break/break/Resources/LoopMail.css
@@ -0,0 +1,31 @@
+html, body {
+    font-size: 16px;
+    margin: 0.5rem;
+}
+
+h1.subject {
+    font-weight: bold;
+    font-size: 1.4rem;
+    margin-bottom: 0.2rem;
+}
+
+.sender {
+    color: #AAA;
+    font-weight: 300;
+}
+
+.user {
+    display: inline-block;
+    font-size: 1rem;
+    padding: 2px 16px;
+    border-radius: 16px;
+    background: rgba(26, 188, 156, 0.25);
+    color: rgba(26, 188, 156, 1.0);
+}
+
+hr.divider {
+    border: none;
+    border: 0.5px solid rgba(0, 0, 0, 0.1
+    );
+    margin: 1rem 0 2rem 0;
+}
diff --git a/iOS/break/break/break/LoopMail/LoopMailMessageViewController.swift b/iOS/break/break/break/LoopMail/LoopMailMessageViewController.swift
index 3599415..384f5d3 100644
--- a/iOS/break/break/break/LoopMail/LoopMailMessageViewController.swift
+++ b/iOS/break/break/break/LoopMail/LoopMailMessageViewController.swift
@@ -56,14 +56,25 @@ class LoopMailMessageViewController: WebViewToSafariViewControllerShimViewContro
 						return
 					}
 					`self`.loopMail = loopMail
-					`self`.message = "\(breakConstants.webViewDefaultStyle)<h4><span style=\"font-weight:normal\">From: \(loopMail.sender.name)</span></h4><h3>\(loopMail.subject)</h3><hr>\(loopMail.message)"
+                    `self`.message = """
+<html>
+<head>
+\(breakConstants.webViewDefaultStyle)
+<link rel="stylesheet" href="LoopMail.css"/>
+</head>
+<body>
+<h1 class="subject">\(loopMail.subject)</h1>
+<span class="sender">From:&nbsp;&nbsp;<span class="user">\(loopMail.sender.name)</span></span>
+<hr class="divider">
+<div class="body">\(loopMail.message)</div>
+"""
 					if !loopMail.links.isEmpty {
-						`self`.message += "<hr><h3><span style=\"font-weight:normal\">Links:</span></h3>"
+						`self`.message += "<hr class=\"divider\"><h3><span style=\"font-weight:normal\">Links:</span></h3>"
 					}
 					for link in loopMail.links {
 						`self`.message += "<a href=\(link.URL)>\(link.title)</a><br>"
 					}
-					`self`.webView.loadHTMLString(`self`.message, baseURL: nil)
+					`self`.webView.loadHTMLString(`self`.message, baseURL: Bundle.main.resourceURL)
 				}
 			}
 		}
diff --git a/iOS/break/break/break/LoopMail/LoopMailViewController.swift b/iOS/break/break/break/LoopMail/LoopMailViewController.swift
index 87cd8ae..3930485 100644
--- a/iOS/break/break/break/LoopMail/LoopMailViewController.swift
+++ b/iOS/break/break/break/LoopMail/LoopMailViewController.swift
@@ -14,6 +14,7 @@ class LoopMailViewController: UITableViewController, Refreshable, UISearchResult
 
 	static let dateFormatter: DateFormatter = {
 		let dateFormatter = DateFormatter()
+        dateFormatter.doesRelativeDateFormatting = true
 		dateFormatter.dateStyle = .long
 		dateFormatter.timeStyle = .short
 		return dateFormatter
@@ -100,6 +101,10 @@ class LoopMailViewController: UITableViewController, Refreshable, UISearchResult
 		tableView.deselectRow(at: indexPath, animated: true)
 	}
 
+    override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return UITableViewAutomaticDimension
+    }
+    
 	override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
 		let replyAction = UITableViewRowAction(style: .default, title: "Reply") { [weak self] _, indexPath in
 			guard let `self` = self else {
diff --git a/iOS/break/break/break/Main.storyboard b/iOS/break/break/break/Main.storyboard
index d92a93a..e9aa2e5 100644
--- a/iOS/break/break/break/Main.storyboard
+++ b/iOS/break/break/break/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.15" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="VA0-KO-lQk">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="VA0-KO-lQk">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.9"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -130,7 +130,7 @@
                                 </constraints>
                             </scrollView>
                         </subviews>
-                        <color key="backgroundColor" red="0.1019607843" green="0.73725490199999999" blue="0.61176470589999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="0.10007033497095108" green="0.73665314912796021" blue="0.61070448160171509" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="w8V-P8-tzK" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" id="3SP-hl-ydc"/>
                             <constraint firstItem="wnv-Xu-9nT" firstAttribute="height" secondItem="8bC-Xf-vdC" secondAttribute="height" priority="999" id="4bk-i8-FKm"/>
@@ -575,50 +575,80 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="LoopMail" rowHeight="98" id="Un8-XW-WwP" customClass="LoopMailTableViewCell" customModule="break" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="28" width="375" height="98"/>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="LoopMail" rowHeight="70" id="Un8-XW-WwP" customClass="LoopMailTableViewCell" customModule="break" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="28" width="375" height="70"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Un8-XW-WwP" id="ZbS-Im-hKS">
-                                    <rect key="frame" x="0.0" y="0.0" width="341" height="97.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="341" height="69.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xuq-fW-2lp">
-                                            <rect key="frame" x="16" y="69" width="32.5" height="18"/>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Date" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xuq-fW-2lp">
+                                            <rect key="frame" x="300.5" y="15" width="32.5" height="18"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="From:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dii-mg-XT8">
-                                            <rect key="frame" x="16" y="43" width="40" height="18"/>
-                                            <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subject" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nl9-SD-wDU">
-                                            <rect key="frame" x="16" y="11" width="66.5" height="24"/>
-                                            <fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sender" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0W3-S7-1hd">
-                                            <rect key="frame" x="64" y="43" width="49" height="18"/>
-                                            <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
+                                            <rect key="frame" x="16" y="11" width="70" height="23"/>
+                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="19"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
+                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UNS-Nr-MZd">
+                                            <rect key="frame" x="16" y="38" width="317" height="21"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="749" text="From" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dii-mg-XT8">
+                                                    <rect key="frame" x="0.0" y="0.0" width="35.5" height="21"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
+                                                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i7f-by-8dl">
+                                                    <rect key="frame" x="39.5" y="0.0" width="65" height="21"/>
+                                                    <subviews>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sender" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0W3-S7-1hd">
+                                                            <rect key="frame" x="8" y="2" width="49" height="17"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
+                                                            <color key="textColor" red="0.1019607843" green="0.73725490199999999" blue="0.61176470589999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <color key="backgroundColor" red="0.100070335" green="0.73665314910000002" blue="0.61070448160000002" alpha="0.19646786971830985" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <constraints>
+                                                        <constraint firstItem="0W3-S7-1hd" firstAttribute="leading" secondItem="i7f-by-8dl" secondAttribute="leading" constant="8" id="8e3-kQ-tYZ"/>
+                                                        <constraint firstAttribute="trailing" secondItem="0W3-S7-1hd" secondAttribute="trailing" constant="8" id="PVO-ch-YlO"/>
+                                                        <constraint firstItem="0W3-S7-1hd" firstAttribute="top" secondItem="i7f-by-8dl" secondAttribute="top" constant="2" id="iyw-yV-b2o"/>
+                                                        <constraint firstAttribute="bottom" secondItem="0W3-S7-1hd" secondAttribute="bottom" constant="2" id="yHX-Kk-lTB"/>
+                                                    </constraints>
+                                                    <userDefinedRuntimeAttributes>
+                                                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                            <integer key="value" value="10"/>
+                                                        </userDefinedRuntimeAttribute>
+                                                    </userDefinedRuntimeAttributes>
+                                                </view>
+                                            </subviews>
+                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            <constraints>
+                                                <constraint firstItem="dii-mg-XT8" firstAttribute="centerY" secondItem="UNS-Nr-MZd" secondAttribute="centerY" id="0aG-oF-8oa"/>
+                                                <constraint firstItem="i7f-by-8dl" firstAttribute="top" secondItem="UNS-Nr-MZd" secondAttribute="top" id="Agm-Ga-ibM"/>
+                                                <constraint firstAttribute="bottom" secondItem="dii-mg-XT8" secondAttribute="bottom" id="HTx-hn-F1o"/>
+                                                <constraint firstItem="dii-mg-XT8" firstAttribute="leading" secondItem="UNS-Nr-MZd" secondAttribute="leading" id="N4p-be-2Cs"/>
+                                                <constraint firstItem="i7f-by-8dl" firstAttribute="centerY" secondItem="UNS-Nr-MZd" secondAttribute="centerY" id="Pj4-49-8ac"/>
+                                                <constraint firstAttribute="bottom" secondItem="i7f-by-8dl" secondAttribute="bottom" id="bF0-9n-K8i"/>
+                                                <constraint firstItem="dii-mg-XT8" firstAttribute="top" secondItem="UNS-Nr-MZd" secondAttribute="top" id="c4U-H4-hKf"/>
+                                                <constraint firstItem="i7f-by-8dl" firstAttribute="leading" secondItem="dii-mg-XT8" secondAttribute="trailing" constant="4" id="lJB-oS-bBA"/>
+                                            </constraints>
+                                        </view>
                                     </subviews>
                                     <constraints>
-                                        <constraint firstItem="dii-mg-XT8" firstAttribute="leading" secondItem="xuq-fW-2lp" secondAttribute="leading" id="ALo-J2-7w3"/>
-                                        <constraint firstItem="xuq-fW-2lp" firstAttribute="trailing" relation="lessThanOrEqual" secondItem="ZbS-Im-hKS" secondAttribute="trailingMargin" id="CnM-wy-USk"/>
+                                        <constraint firstItem="UNS-Nr-MZd" firstAttribute="bottom" secondItem="ZbS-Im-hKS" secondAttribute="bottomMargin" id="4jA-rB-Z7s"/>
+                                        <constraint firstItem="UNS-Nr-MZd" firstAttribute="leading" secondItem="ZbS-Im-hKS" secondAttribute="leadingMargin" id="7Hl-2C-bYT"/>
+                                        <constraint firstItem="xuq-fW-2lp" firstAttribute="trailing" secondItem="ZbS-Im-hKS" secondAttribute="trailingMargin" id="CnM-wy-USk"/>
                                         <constraint firstItem="nl9-SD-wDU" firstAttribute="top" secondItem="ZbS-Im-hKS" secondAttribute="topMargin" id="DzT-cl-yKi"/>
-                                        <constraint firstItem="nl9-SD-wDU" firstAttribute="trailing" relation="lessThanOrEqual" secondItem="ZbS-Im-hKS" secondAttribute="trailingMargin" id="Nf2-4z-Fgc"/>
-                                        <constraint firstItem="0W3-S7-1hd" firstAttribute="trailing" relation="lessThanOrEqual" secondItem="ZbS-Im-hKS" secondAttribute="trailingMargin" id="PBq-dY-dz2"/>
-                                        <constraint firstItem="dii-mg-XT8" firstAttribute="top" secondItem="nl9-SD-wDU" secondAttribute="bottom" constant="8" symbolic="YES" id="Ugj-29-rzV"/>
-                                        <constraint firstItem="0W3-S7-1hd" firstAttribute="leading" secondItem="dii-mg-XT8" secondAttribute="trailing" constant="8" symbolic="YES" id="VSO-mR-iBE"/>
-                                        <constraint firstItem="dii-mg-XT8" firstAttribute="baseline" secondItem="0W3-S7-1hd" secondAttribute="baseline" id="c6v-xc-Pqy"/>
-                                        <constraint firstItem="xuq-fW-2lp" firstAttribute="bottom" secondItem="ZbS-Im-hKS" secondAttribute="bottomMargin" id="cv9-Lc-eSm"/>
-                                        <constraint firstItem="xuq-fW-2lp" firstAttribute="top" secondItem="dii-mg-XT8" secondAttribute="bottom" constant="8" symbolic="YES" id="pgf-FL-EH5"/>
-                                        <constraint firstItem="nl9-SD-wDU" firstAttribute="leading" secondItem="dii-mg-XT8" secondAttribute="leading" id="wgv-ue-mfM"/>
+                                        <constraint firstItem="xuq-fW-2lp" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="nl9-SD-wDU" secondAttribute="trailing" id="Uuv-3k-HmE"/>
+                                        <constraint firstItem="xuq-fW-2lp" firstAttribute="top" secondItem="ZbS-Im-hKS" secondAttribute="topMargin" constant="4" id="i7h-QQ-5Dz"/>
+                                        <constraint firstItem="UNS-Nr-MZd" firstAttribute="top" secondItem="nl9-SD-wDU" secondAttribute="bottom" constant="4" id="nrL-eb-J97"/>
+                                        <constraint firstAttribute="trailingMargin" secondItem="UNS-Nr-MZd" secondAttribute="trailing" id="tgt-Mm-gWc"/>
                                         <constraint firstItem="nl9-SD-wDU" firstAttribute="leading" secondItem="ZbS-Im-hKS" secondAttribute="leadingMargin" id="zjf-Zf-9GN"/>
                                     </constraints>
                                 </tableViewCellContentView>
@@ -650,7 +680,7 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Ryq-Li-5s5" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="3297" y="322"/>
+            <point key="canvasLocation" x="3296.8000000000002" y="321.58920539730138"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="RKp-KQ-c2Y">
@@ -1227,27 +1257,27 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="course" rowHeight="72" id="Tbz-fg-EQX" customClass="CourseTableViewCell" customModule="break" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="28" width="375" height="72"/>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="course" rowHeight="64" id="Tbz-fg-EQX" customClass="CourseTableViewCell" customModule="break" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="28" width="375" height="64"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Tbz-fg-EQX" id="FZ5-FO-zqD">
-                                    <rect key="frame" x="0.0" y="0.0" width="341" height="71.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="341" height="63.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RM1-xl-LoU">
-                                            <rect key="frame" x="16" y="20" width="12" height="31.5"/>
+                                            <rect key="frame" x="16" y="16" width="12" height="31.5"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="Score" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xgc-Ii-2Sv">
-                                            <rect key="frame" x="293" y="43" width="40" height="18"/>
+                                            <rect key="frame" x="293" y="35" width="40" height="18"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fyn-Xv-YtK">
-                                            <rect key="frame" x="0.0" y="0.0" width="4" height="71.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="4" height="63.5"/>
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="4" id="Gdc-wc-ZAZ"/>
@@ -1260,7 +1290,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Teacher" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1gd-ZT-aQI">
-                                            <rect key="frame" x="36" y="43" width="55" height="18"/>
+                                            <rect key="frame" x="36" y="35" width="55" height="18"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
@@ -1281,7 +1311,7 @@
                                         <constraint firstItem="RM1-xl-LoU" firstAttribute="centerY" secondItem="FZ5-FO-zqD" secondAttribute="centerY" id="KWH-fm-HNY"/>
                                         <constraint firstItem="ALK-TB-WI3" firstAttribute="top" relation="greaterThanOrEqual" secondItem="FZ5-FO-zqD" secondAttribute="topMargin" id="Kf6-YZ-kQP"/>
                                         <constraint firstItem="Fyn-Xv-YtK" firstAttribute="leading" secondItem="FZ5-FO-zqD" secondAttribute="leading" id="LYF-s3-vfL"/>
-                                        <constraint firstItem="1gd-ZT-aQI" firstAttribute="top" secondItem="ALK-TB-WI3" secondAttribute="bottom" constant="8" symbolic="YES" id="TJU-yh-Czu"/>
+                                        <constraint firstItem="1gd-ZT-aQI" firstAttribute="top" secondItem="ALK-TB-WI3" secondAttribute="bottom" id="TJU-yh-Czu"/>
                                         <constraint firstItem="xgc-Ii-2Sv" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="1gd-ZT-aQI" secondAttribute="trailing" constant="8" symbolic="YES" id="Y1h-Xh-uMW"/>
                                         <constraint firstItem="1gd-ZT-aQI" firstAttribute="firstBaseline" secondItem="xgc-Ii-2Sv" secondAttribute="firstBaseline" id="gae-1u-9mI"/>
                                         <constraint firstAttribute="bottom" secondItem="Fyn-Xv-YtK" secondAttribute="bottom" id="k5Q-qQ-BP3"/>