commit 3d43da975863e1a48c839612a2f864e24c0c8ce1 parent 348e9ebd625797d9c4f30e9ea48ce24d4542867e Author: Naomi Welner <naomi@Naomis-MacBook-Air.local> Date: Tue, 12 Mar 2019 23:46:21 -0700 Adding existing files Diffstat:
24 files changed, 108 insertions(+), 107 deletions(-)
diff --git a/.DS_Store b/.DS_Store Binary files differ. diff --git a/Pods/.DS_Store b/Pods/.DS_Store Binary files differ. diff --git a/Teachers' Assistant/.DS_Store b/Teachers' Assistant/.DS_Store Binary files differ. diff --git a/Teachers' Assistant/Images/Brandeis_Web_HiRes_DarkBlue.png b/Teachers' Assistant/Images/Brandeis_Web_HiRes_DarkBlue.png Binary files differ. diff --git a/Teachers' Assistant/Images/Brandeis_Web_HiRes_DarkBlue_Inv.png b/Teachers' Assistant/Images/Brandeis_Web_HiRes_DarkBlue_Inv.png Binary files differ. diff --git a/Teachers' Assistant/Images/Brandeis_Web_HiRes_Gray.png b/Teachers' Assistant/Images/Brandeis_Web_HiRes_Gray.png Binary files differ. diff --git a/Teachers' Assistant/Images/Brandeis_Web_HiRes_Gray_Inv.png b/Teachers' Assistant/Images/Brandeis_Web_HiRes_Gray_Inv.png Binary files differ. diff --git a/Teachers' Assistant/Images/Brandeis_Web_HiRes_Green.png b/Teachers' Assistant/Images/Brandeis_Web_HiRes_Green.png Binary files differ. diff --git a/Teachers' Assistant/Images/Brandeis_Web_HiRes_Green_Inv.png b/Teachers' Assistant/Images/Brandeis_Web_HiRes_Green_Inv.png Binary files differ. diff --git a/Teachers' Assistant/Images/Brandeis_Web_HiRes_LightBlue.png b/Teachers' Assistant/Images/Brandeis_Web_HiRes_LightBlue.png Binary files differ. diff --git a/Teachers' Assistant/Images/Brandeis_Web_HiRes_LightBlue_Inv.png b/Teachers' Assistant/Images/Brandeis_Web_HiRes_LightBlue_Inv.png Binary files differ. diff --git a/Teachers' Assistant/Images/Brandeis_Web_HiRes_Orange_Inv.png b/Teachers' Assistant/Images/Brandeis_Web_HiRes_Orange_Inv.png Binary files differ. diff --git a/Teachers' Assistant/Images/Brandeis_Web_HiRes_Pink.png b/Teachers' Assistant/Images/Brandeis_Web_HiRes_Pink.png Binary files differ. diff --git a/Teachers' Assistant/Images/Brandeis_Web_HiRes_Pink_Inv.png b/Teachers' Assistant/Images/Brandeis_Web_HiRes_Pink_Inv.png Binary files differ. diff --git a/Teachers' Assistant/Images/DarkBlue-Logo.PNG b/Teachers' Assistant/Images/DarkBlue-Logo.PNG Binary files differ. diff --git a/Teachers' Assistant/Images/Gray-Logo.png b/Teachers' Assistant/Images/Gray-Logo.png Binary files differ. diff --git a/Teachers' Assistant/Images/Green-Logo.PNG b/Teachers' Assistant/Images/Green-Logo.PNG Binary files differ. diff --git a/Teachers' Assistant/Images/LightBlue-Logo.PNG b/Teachers' Assistant/Images/LightBlue-Logo.PNG Binary files differ. diff --git a/Teachers' Assistant/Images/Pink-Logo.PNG b/Teachers' Assistant/Images/Pink-Logo.PNG Binary files differ. diff --git a/Teachers' Assistant/ViewController.swift b/Teachers' Assistant/ViewController.swift @@ -15,11 +15,11 @@ class ViewController: UIViewController { //Creating a global variable to manage color theme struct globalVariables { //All of the possible color themes - static let colorThemes = ["Orange", "Dark Blue", "Light Blue", "Gray", "Green", "Pink"] + static let colorThemes = ["Orange", "Dark Blue", "Light Blue", "Gray", "Green", "Pink", "Inverted Orange", "Inverted Dark Blue", "Inverted Light Blue", "Inverted Gray", "Inverted Green", "Inverted Pink"] //Color theme of all buttons static var activeColorTheme = "Orange" - //Dark mode - //static var darkMode: Bool = false + //Global status + static var globalOut: Bool = true } /* PRELIMINARY GLOBAL COLOR THEME END*/ diff --git a/Teachers' Assistant/ViewControllerHome.swift b/Teachers' Assistant/ViewControllerHome.swift @@ -20,74 +20,49 @@ class ViewControllerHome: UIViewController { /* SIGN IN-OUT BUTTON START */ - //Naming signInOut button so I can modify it on press, and giving in/out state functionality + //Naming signInOut button so I can modify it on press @IBOutlet weak var signInOut: UIButton! var signedOut: Bool = true //Making a function to decide button color when signInOut button pressed - func inOutButtonSet (color: String, state: Bool) -> String{ + func inOutButtonSet (color: String, state: Bool) -> UIImage { if (color=="Dark Blue" && state){ - return "DBSI" + return #imageLiteral(resourceName: "Sign-In (Dark Blue).png") } else if (color=="Dark Blue" && !state){ - return "DBSO" + return #imageLiteral(resourceName: "Sign-Out (Dark Blue).png") } else if (color=="Green" && state){ - return "GESI" + return #imageLiteral(resourceName: "Sign-In (Green).png") } else if (color=="Green" && !state){ - return "GESO" + return #imageLiteral(resourceName: "Sign-Out (Green).png") } else if (color=="Gray" && state){ - return "GRSI" + return #imageLiteral(resourceName: "Sign-In (Gray).png") } else if (color=="Gray" && !state){ - return "GRSO" + return #imageLiteral(resourceName: "Sign-Out (Gray).png") } else if (color=="Light Blue" && state){ - return "LBSI" + return #imageLiteral(resourceName: "Sign-In (Light Blue).png") } else if (color=="Light Blue" && !state){ - return "LBSO" + return #imageLiteral(resourceName: "Sign-Out (Light Blue).png") } else if (color=="Orange" && state){ - return "OSI" + return #imageLiteral(resourceName: "Sign-In (Orange).png") } else if (color=="Orange" && !state){ - return "OSO" + return #imageLiteral(resourceName: "Sign-Out (Orange).png") } else if (color=="Pink" && state){ - return "PSI" + return #imageLiteral(resourceName: "Sign-In (Pink).png") } else if (color=="Pink" && !state){ - return "PSO" + return #imageLiteral(resourceName: "Sign-Out (Pink).png") } else { - return "OSI" + return #imageLiteral(resourceName: "Sign-In (Orange).png") } } //Defining a variable to use on button press to determine color/state - var properButton: String = "" + var properButton: UIImage = #imageLiteral(resourceName: "Sign-In (Orange).png") //signInOut button functionality @IBAction func signInOutPress(_ sender: Any) { //Invert button graphic signedOut = !signedOut properButton = inOutButtonSet(color: ViewController.globalVariables.activeColorTheme, state: signedOut) - if properButton=="DBSI" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Dark Blue).png"), for: .normal) - } else if properButton=="DBSO" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-Out (Dark Blue).png"), for: .normal) - } else if properButton=="GESI" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Green).png"), for: .normal) - } else if properButton=="GESO" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-Out (Green).png"), for: .normal) - } else if properButton=="GRSI" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Gray).png"), for: .normal) - } else if properButton=="GRSO" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-Out (Gray).png"), for: .normal) - } else if properButton=="LBSI" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Light Blue).png"), for: .normal) - } else if properButton=="LBSO" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-Out (Light Blue).png"), for: .normal) - } else if properButton=="OSI" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Orange).png"), for: .normal) - } else if properButton=="OSO" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-Out (Orange).png"), for: .normal) - } else if properButton=="PSI" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Pink).png"), for: .normal) - } else if properButton=="PSO" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-Out (Pink).png"), for: .normal) - } else { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Orange).png"), for: .normal) - } - + signInOut.setImage(properButton, for: .normal) + ViewController.globalVariables.globalOut = signedOut + //Google functionality } /* SIGN IN-OUT BUTTON END */ @@ -104,59 +79,64 @@ class ViewControllerHome: UIViewController { if ViewController.globalVariables.activeColorTheme=="Dark Blue"{ liveList.setImage(#imageLiteral(resourceName: "LiveList (Dark Blue).png"), for: .normal) - homeLogo.image = UIImage(named: "DarkBlue-Logo.PNG") + homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_DarkBlue.png") + self.view.backgroundColor = UIColor(displayP3Red: 255/255, green: 255/255, blue: 255/255, alpha: 1) } else if ViewController.globalVariables.activeColorTheme=="Green"{ liveList.setImage(#imageLiteral(resourceName: "LiveList (Green).png"), for: .normal) - homeLogo.image = UIImage(named: "Green-Logo.PNG") + homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_Green.png") + self.view.backgroundColor = UIColor(displayP3Red: 255/255, green: 255/255, blue: 255/255, alpha: 1) } else if ViewController.globalVariables.activeColorTheme=="Gray"{ liveList.setImage(#imageLiteral(resourceName: "LiveList (Gray).png"), for: .normal) - homeLogo.image = UIImage(named: "Gray-Logo.png") + homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_Gray.png") + self.view.backgroundColor = UIColor(displayP3Red: 255/255, green: 255/255, blue: 255/255, alpha: 1) } else if ViewController.globalVariables.activeColorTheme=="Light Blue"{ liveList.setImage(#imageLiteral(resourceName: "LiveList (Light Blue).png"), for: .normal) - homeLogo.image = UIImage(named: "LightBlue-Logo.PNG") + homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_LightBlue.png") + self.view.backgroundColor = UIColor(displayP3Red: 255/255, green: 255/255, blue: 255/255, alpha: 1) } else if ViewController.globalVariables.activeColorTheme=="Orange"{ liveList.setImage(#imageLiteral(resourceName: "LiveList (Orange).png"), for: .normal) homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_Orange.png") + self.view.backgroundColor = UIColor(displayP3Red: 255/255, green: 255/255, blue: 255/255, alpha: 1) } else if ViewController.globalVariables.activeColorTheme=="Pink"{ liveList.setImage(#imageLiteral(resourceName: "LiveList (Pink).png"), for: .normal) - homeLogo.image = UIImage(named: "Pink-Logo.PNG") - } else { + homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_Pink") + self.view.backgroundColor = UIColor(displayP3Red: 255/255, green: 255/255, blue: 255/255, alpha: 1) + } else if ViewController.globalVariables.activeColorTheme=="Inverted Orange"{ + //liveList here + homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_Orange_Inv.png") + self.view.backgroundColor = UIColor(displayP3Red: 252/255, green: 88/255, blue: 43/255, alpha: 1) + } else if ViewController.globalVariables.activeColorTheme=="Inverted Dark Blue"{ + //liveList here + homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_DarkBlue_Inv.png") + self.view.backgroundColor = UIColor(displayP3Red: 33/255, green: 94/255, blue: 172/255, alpha: 1) + } else if ViewController.globalVariables.activeColorTheme=="Inverted Light Blue"{ + //liveList here + homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_LightBlue_Inv.png") + self.view.backgroundColor = UIColor(displayP3Red: 36/255, green: 171/255, blue: 226/255, alpha: 1) + } else if ViewController.globalVariables.activeColorTheme=="Inverted Gray"{ + //liveList here + homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_Gray_Inv.png") + self.view.backgroundColor = UIColor(displayP3Red: 102/255, green: 102/255, blue: 102/255, alpha: 1) + } else if ViewController.globalVariables.activeColorTheme=="Inverted Green"{ + //liveList here + homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_Green_Inv.png") + self.view.backgroundColor = UIColor(displayP3Red: 141/255, green: 198/255, blue: 64/255, alpha: 1) + } else if ViewController.globalVariables.activeColorTheme=="Inverted Pink"{ + //liveList here + homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_Pink_Inv.png") + self.view.backgroundColor = UIColor(displayP3Red: 234/255, green: 43/255, blue: 123/255, alpha: 1) + } + /*else { liveList.setImage(#imageLiteral(resourceName: "LiveList (Orange).png"), for: .normal) homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_Orange.png") - } + } */ /* REGULAR BUTTON COLOR THEME END */ /* SIGN IN BUTTON LOAD THEME START */ - properButton = inOutButtonSet(color: ViewController.globalVariables.activeColorTheme, state: signedOut) - if properButton=="DBSI" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Dark Blue).png"), for: .normal) - } else if properButton=="DBSO" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-Out (Dark Blue).png"), for: .normal) - } else if properButton=="GESI" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Green).png"), for: .normal) - } else if properButton=="GESO" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-Out (Green).png"), for: .normal) - } else if properButton=="GRSI" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Gray).png"), for: .normal) - } else if properButton=="GRSO" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-Out (Gray).png"), for: .normal) - } else if properButton=="LBSI" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Light Blue).png"), for: .normal) - } else if properButton=="LBSO" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-Out (Light Blue).png"), for: .normal) - } else if properButton=="OSI" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Orange).png"), for: .normal) - } else if properButton=="OSO" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-Out (Orange).png"), for: .normal) - } else if properButton=="PSI" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Pink).png"), for: .normal) - } else if properButton=="PSO" { - signInOut.setImage(#imageLiteral(resourceName: "Sign-Out (Pink).png"), for: .normal) - } else { - signInOut.setImage(#imageLiteral(resourceName: "Sign-In (Orange).png"), for: .normal) - } + properButton = inOutButtonSet(color: ViewController.globalVariables.activeColorTheme, state: ViewController.globalVariables.globalOut) + signInOut.setImage(properButton, for: .normal) /* SIGN IN BUTTON LOAD THEME END */ diff --git a/Teachers' Assistant/ViewControllerSettings.swift b/Teachers' Assistant/ViewControllerSettings.swift @@ -10,6 +10,7 @@ import UIKit class ViewControllerSettings: UIViewController, UIPickerViewDataSource, UIPickerViewDelegate { + var signOutState: Bool = true /* COLOR THEME PICKER VIEW START */ //Connecting the picker view @@ -32,9 +33,6 @@ class ViewControllerSettings: UIViewController, UIPickerViewDataSource, UIPicker /* COLOR THEME PICKER VIEW END */ - /* DARK MODE START */ - /* DARK MODE END */ - //Connecting settingsToHome segue to back button @IBAction func settingsToHome(_ sender: Any) { performSegue(withIdentifier: "settingsToHome", sender: self) @@ -42,7 +40,6 @@ class ViewControllerSettings: UIViewController, UIPickerViewDataSource, UIPicker override func viewDidLoad() { super.viewDidLoad() - // Do any additional setup after loading the view. } diff --git a/TeachersAssistant.xcodeproj/project.pbxproj b/TeachersAssistant.xcodeproj/project.pbxproj @@ -9,6 +9,17 @@ /* Begin PBXBuildFile section */ B30366162221E45A00BB9DC6 /* Brandeis_Web_HiRes_Orange.png in Resources */ = {isa = PBXBuildFile; fileRef = B30366152221E45900BB9DC6 /* Brandeis_Web_HiRes_Orange.png */; }; B30366182221E60C00BB9DC6 /* ViewControllerSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B30366172221E60C00BB9DC6 /* ViewControllerSettings.swift */; }; + B32BA0A92238D6DF0000E747 /* Brandeis_Web_HiRes_Orange_Inv.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA09E2238D6D80000E747 /* Brandeis_Web_HiRes_Orange_Inv.png */; }; + B32BA0AA2238D6DF0000E747 /* Brandeis_Web_HiRes_Green.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA09F2238D6DA0000E747 /* Brandeis_Web_HiRes_Green.png */; }; + B32BA0AB2238D6DF0000E747 /* Brandeis_Web_HiRes_Pink.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA0A02238D6DA0000E747 /* Brandeis_Web_HiRes_Pink.png */; }; + B32BA0AC2238D6DF0000E747 /* Brandeis_Web_HiRes_DarkBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA0A12238D6DB0000E747 /* Brandeis_Web_HiRes_DarkBlue.png */; }; + B32BA0AD2238D6DF0000E747 /* Brandeis_Web_HiRes_DarkBlue_Inv.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA0A22238D6DB0000E747 /* Brandeis_Web_HiRes_DarkBlue_Inv.png */; }; + B32BA0AE2238D6DF0000E747 /* Brandeis_Web_HiRes_Gray.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA0A32238D6DC0000E747 /* Brandeis_Web_HiRes_Gray.png */; }; + B32BA0AF2238D6DF0000E747 /* Brandeis_Web_HiRes_LightBlue_Inv.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA0A42238D6DC0000E747 /* Brandeis_Web_HiRes_LightBlue_Inv.png */; }; + B32BA0B02238D6DF0000E747 /* Brandeis_Web_HiRes_Green_Inv.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA0A52238D6DC0000E747 /* Brandeis_Web_HiRes_Green_Inv.png */; }; + B32BA0B12238D6DF0000E747 /* Brandeis_Web_HiRes_Gray_Inv.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA0A62238D6DD0000E747 /* Brandeis_Web_HiRes_Gray_Inv.png */; }; + B32BA0B22238D6DF0000E747 /* Brandeis_Web_HiRes_Pink_Inv.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA0A72238D6DE0000E747 /* Brandeis_Web_HiRes_Pink_Inv.png */; }; + B32BA0B32238D6DF0000E747 /* Brandeis_Web_HiRes_LightBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA0A82238D6DE0000E747 /* Brandeis_Web_HiRes_LightBlue.png */; }; B34CDB9F221650410031C28B /* Sign-Out (Dark Blue).png in Resources */ = {isa = PBXBuildFile; fileRef = B34CDB8C221650360031C28B /* Sign-Out (Dark Blue).png */; }; B34CDBA0221650410031C28B /* Sign-In (Light Blue).png in Resources */ = {isa = PBXBuildFile; fileRef = B34CDB8D221650360031C28B /* Sign-In (Light Blue).png */; }; B34CDBA1221650410031C28B /* LiveList (Gray).png in Resources */ = {isa = PBXBuildFile; fileRef = B34CDB8E221650370031C28B /* LiveList (Gray).png */; }; @@ -28,11 +39,6 @@ B34CDBAF221650410031C28B /* Sign-In (Dark Blue).png in Resources */ = {isa = PBXBuildFile; fileRef = B34CDB9C2216503F0031C28B /* Sign-In (Dark Blue).png */; }; B34CDBB0221650410031C28B /* Sign-Out (Gray).png in Resources */ = {isa = PBXBuildFile; fileRef = B34CDB9D2216503F0031C28B /* Sign-Out (Gray).png */; }; B34CDBB1221650410031C28B /* LiveList (Green).png in Resources */ = {isa = PBXBuildFile; fileRef = B34CDB9E221650400031C28B /* LiveList (Green).png */; }; - B38529CE223599870063E0F7 /* Gray-Logo.png in Resources */ = {isa = PBXBuildFile; fileRef = B38529C9223599850063E0F7 /* Gray-Logo.png */; }; - B38529CF223599870063E0F7 /* DarkBlue-Logo.PNG in Resources */ = {isa = PBXBuildFile; fileRef = B38529CA223599860063E0F7 /* DarkBlue-Logo.PNG */; }; - B38529D0223599870063E0F7 /* LightBlue-Logo.PNG in Resources */ = {isa = PBXBuildFile; fileRef = B38529CB223599860063E0F7 /* LightBlue-Logo.PNG */; }; - B38529D1223599870063E0F7 /* Green-Logo.PNG in Resources */ = {isa = PBXBuildFile; fileRef = B38529CC223599860063E0F7 /* Green-Logo.PNG */; }; - B38529D2223599870063E0F7 /* Pink-Logo.PNG in Resources */ = {isa = PBXBuildFile; fileRef = B38529CD223599870063E0F7 /* Pink-Logo.PNG */; }; B3D8E1D5220F7847007CAD3A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D8E1D4220F7847007CAD3A /* AppDelegate.swift */; }; B3D8E1D7220F7847007CAD3A /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D8E1D6220F7847007CAD3A /* ViewController.swift */; }; B3D8E1DA220F7847007CAD3A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B3D8E1D8220F7847007CAD3A /* Main.storyboard */; }; @@ -62,6 +68,17 @@ 910BFE7031BA5BA4545B32C7 /* Pods-TeachersAssistant.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TeachersAssistant.release.xcconfig"; path = "Target Support Files/Pods-TeachersAssistant/Pods-TeachersAssistant.release.xcconfig"; sourceTree = "<group>"; }; B30366152221E45900BB9DC6 /* Brandeis_Web_HiRes_Orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_Orange.png; sourceTree = "<group>"; }; B30366172221E60C00BB9DC6 /* ViewControllerSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewControllerSettings.swift; sourceTree = "<group>"; }; + B32BA09E2238D6D80000E747 /* Brandeis_Web_HiRes_Orange_Inv.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_Orange_Inv.png; sourceTree = "<group>"; }; + B32BA09F2238D6DA0000E747 /* Brandeis_Web_HiRes_Green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_Green.png; sourceTree = "<group>"; }; + B32BA0A02238D6DA0000E747 /* Brandeis_Web_HiRes_Pink.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_Pink.png; sourceTree = "<group>"; }; + B32BA0A12238D6DB0000E747 /* Brandeis_Web_HiRes_DarkBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_DarkBlue.png; sourceTree = "<group>"; }; + B32BA0A22238D6DB0000E747 /* Brandeis_Web_HiRes_DarkBlue_Inv.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_DarkBlue_Inv.png; sourceTree = "<group>"; }; + B32BA0A32238D6DC0000E747 /* Brandeis_Web_HiRes_Gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_Gray.png; sourceTree = "<group>"; }; + B32BA0A42238D6DC0000E747 /* Brandeis_Web_HiRes_LightBlue_Inv.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_LightBlue_Inv.png; sourceTree = "<group>"; }; + B32BA0A52238D6DC0000E747 /* Brandeis_Web_HiRes_Green_Inv.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_Green_Inv.png; sourceTree = "<group>"; }; + B32BA0A62238D6DD0000E747 /* Brandeis_Web_HiRes_Gray_Inv.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_Gray_Inv.png; sourceTree = "<group>"; }; + B32BA0A72238D6DE0000E747 /* Brandeis_Web_HiRes_Pink_Inv.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_Pink_Inv.png; sourceTree = "<group>"; }; + B32BA0A82238D6DE0000E747 /* Brandeis_Web_HiRes_LightBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_LightBlue.png; sourceTree = "<group>"; }; B34CDB8C221650360031C28B /* Sign-Out (Dark Blue).png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Sign-Out (Dark Blue).png"; sourceTree = "<group>"; }; B34CDB8D221650360031C28B /* Sign-In (Light Blue).png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Sign-In (Light Blue).png"; sourceTree = "<group>"; }; B34CDB8E221650370031C28B /* LiveList (Gray).png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "LiveList (Gray).png"; sourceTree = "<group>"; }; @@ -81,11 +98,6 @@ B34CDB9C2216503F0031C28B /* Sign-In (Dark Blue).png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Sign-In (Dark Blue).png"; sourceTree = "<group>"; }; B34CDB9D2216503F0031C28B /* Sign-Out (Gray).png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Sign-Out (Gray).png"; sourceTree = "<group>"; }; B34CDB9E221650400031C28B /* LiveList (Green).png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "LiveList (Green).png"; sourceTree = "<group>"; }; - B38529C9223599850063E0F7 /* Gray-Logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Gray-Logo.png"; sourceTree = "<group>"; }; - B38529CA223599860063E0F7 /* DarkBlue-Logo.PNG */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DarkBlue-Logo.PNG"; sourceTree = "<group>"; }; - B38529CB223599860063E0F7 /* LightBlue-Logo.PNG */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "LightBlue-Logo.PNG"; sourceTree = "<group>"; }; - B38529CC223599860063E0F7 /* Green-Logo.PNG */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Green-Logo.PNG"; sourceTree = "<group>"; }; - B38529CD223599870063E0F7 /* Pink-Logo.PNG */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Pink-Logo.PNG"; sourceTree = "<group>"; }; B3D8E1D1220F7847007CAD3A /* TeachersAssistant.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TeachersAssistant.app; sourceTree = BUILT_PRODUCTS_DIR; }; B3D8E1D4220F7847007CAD3A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; B3D8E1D6220F7847007CAD3A /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; }; @@ -132,6 +144,18 @@ B34CDBB2221650480031C28B /* Images */ = { isa = PBXGroup; children = ( + B32BA0A22238D6DB0000E747 /* Brandeis_Web_HiRes_DarkBlue_Inv.png */, + B32BA0A12238D6DB0000E747 /* Brandeis_Web_HiRes_DarkBlue.png */, + B32BA0A62238D6DD0000E747 /* Brandeis_Web_HiRes_Gray_Inv.png */, + B32BA0A32238D6DC0000E747 /* Brandeis_Web_HiRes_Gray.png */, + B32BA0A52238D6DC0000E747 /* Brandeis_Web_HiRes_Green_Inv.png */, + B32BA09F2238D6DA0000E747 /* Brandeis_Web_HiRes_Green.png */, + B32BA0A42238D6DC0000E747 /* Brandeis_Web_HiRes_LightBlue_Inv.png */, + B32BA0A82238D6DE0000E747 /* Brandeis_Web_HiRes_LightBlue.png */, + B32BA09E2238D6D80000E747 /* Brandeis_Web_HiRes_Orange_Inv.png */, + B32BA0A72238D6DE0000E747 /* Brandeis_Web_HiRes_Pink_Inv.png */, + B32BA0A02238D6DA0000E747 /* Brandeis_Web_HiRes_Pink.png */, + B30366152221E45900BB9DC6 /* Brandeis_Web_HiRes_Orange.png */, B34CDB91221650380031C28B /* LiveList (Dark Blue).png */, B34CDB8E221650370031C28B /* LiveList (Gray).png */, B34CDB9E221650400031C28B /* LiveList (Green).png */, @@ -140,17 +164,11 @@ B34CDB9A2216503E0031C28B /* LiveList (Pink).png */, B34CDB93221650390031C28B /* Settings Button.png */, B34CDB9C2216503F0031C28B /* Sign-In (Dark Blue).png */, - B30366152221E45900BB9DC6 /* Brandeis_Web_HiRes_Orange.png */, B34CDB992216503D0031C28B /* Sign-In (Gray).png */, B34CDB962216503B0031C28B /* Sign-In (Green).png */, B34CDB8D221650360031C28B /* Sign-In (Light Blue).png */, B34CDB942216503A0031C28B /* Sign-In (Orange).png */, B34CDB952216503A0031C28B /* Sign-In (Pink).png */, - B38529C9223599850063E0F7 /* Gray-Logo.png */, - B38529CB223599860063E0F7 /* LightBlue-Logo.PNG */, - B38529CA223599860063E0F7 /* DarkBlue-Logo.PNG */, - B38529CC223599860063E0F7 /* Green-Logo.PNG */, - B38529CD223599870063E0F7 /* Pink-Logo.PNG */, B34CDB8C221650360031C28B /* Sign-Out (Dark Blue).png */, B34CDB9D2216503F0031C28B /* Sign-Out (Gray).png */, B34CDB90221650370031C28B /* Sign-Out (Green).png */, @@ -302,30 +320,36 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + B32BA0AB2238D6DF0000E747 /* Brandeis_Web_HiRes_Pink.png in Resources */, + B32BA0B32238D6DF0000E747 /* Brandeis_Web_HiRes_LightBlue.png in Resources */, B34CDBB0221650410031C28B /* Sign-Out (Gray).png in Resources */, - B38529CE223599870063E0F7 /* Gray-Logo.png in Resources */, B3D8E1DF220F7847007CAD3A /* LaunchScreen.storyboard in Resources */, B34CDBA2221650410031C28B /* LiveList (Orange).png in Resources */, + B32BA0AD2238D6DF0000E747 /* Brandeis_Web_HiRes_DarkBlue_Inv.png in Resources */, + B32BA0B22238D6DF0000E747 /* Brandeis_Web_HiRes_Pink_Inv.png in Resources */, B34CDBA7221650410031C28B /* Sign-In (Orange).png in Resources */, B34CDBAA221650410031C28B /* Sign-Out (Light Blue).png in Resources */, + B32BA0AF2238D6DF0000E747 /* Brandeis_Web_HiRes_LightBlue_Inv.png in Resources */, B34CDBA4221650410031C28B /* LiveList (Dark Blue).png in Resources */, - B38529D0223599870063E0F7 /* LightBlue-Logo.PNG in Resources */, B34CDBAB221650410031C28B /* Sign-Out (Orange).png in Resources */, B34CDBAC221650410031C28B /* Sign-In (Gray).png in Resources */, - B38529D1223599870063E0F7 /* Green-Logo.PNG in Resources */, B34CDBB1221650410031C28B /* LiveList (Green).png in Resources */, B30366162221E45A00BB9DC6 /* Brandeis_Web_HiRes_Orange.png in Resources */, B34CDBA6221650410031C28B /* Settings Button.png in Resources */, B34CDBA8221650410031C28B /* Sign-In (Pink).png in Resources */, B34CDB9F221650410031C28B /* Sign-Out (Dark Blue).png in Resources */, + B32BA0B12238D6DF0000E747 /* Brandeis_Web_HiRes_Gray_Inv.png in Resources */, B3D8E1DC220F7847007CAD3A /* Assets.xcassets in Resources */, B34CDBA5221650410031C28B /* Sign-Out (Pink).png in Resources */, B34CDBA0221650410031C28B /* Sign-In (Light Blue).png in Resources */, - B38529D2223599870063E0F7 /* Pink-Logo.PNG in Resources */, B34CDBAE221650410031C28B /* LiveList (Light Blue).png in Resources */, - B38529CF223599870063E0F7 /* DarkBlue-Logo.PNG in Resources */, + B32BA0A92238D6DF0000E747 /* Brandeis_Web_HiRes_Orange_Inv.png in Resources */, B34CDBA9221650410031C28B /* Sign-In (Green).png in Resources */, + B32BA0AA2238D6DF0000E747 /* Brandeis_Web_HiRes_Green.png in Resources */, + B32BA0B02238D6DF0000E747 /* Brandeis_Web_HiRes_Green_Inv.png in Resources */, + B32BA0AC2238D6DF0000E747 /* Brandeis_Web_HiRes_DarkBlue.png in Resources */, B34CDBA1221650410031C28B /* LiveList (Gray).png in Resources */, + B32BA0AE2238D6DF0000E747 /* Brandeis_Web_HiRes_Gray.png in Resources */, B34CDBA3221650410031C28B /* Sign-Out (Green).png in Resources */, B3D8E1DA220F7847007CAD3A /* Main.storyboard in Resources */, B34CDBAF221650410031C28B /* Sign-In (Dark Blue).png in Resources */, diff --git a/TeachersAssistant.xcworkspace/xcuserdata/naomi.xcuserdatad/UserInterfaceState.xcuserstate b/TeachersAssistant.xcworkspace/xcuserdata/naomi.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ.
