commit 7801053774f0c2887148056985cc4487792b8fc1 parent 3eda07f9a834ec10cf18f3e38f08c7ffa14c6d66 Author: Naomi Welner <naomi@Naomis-MacBook-Air.local> Date: Wed, 13 Mar 2019 10:02:08 -0700 Adding existing files Diffstat:
7 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/.DS_Store b/.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/Settings Button Inv.png b/Teachers' Assistant/Images/Settings Button Inv.png Binary files differ. diff --git a/Teachers' Assistant/Images/Settings Button.png b/Teachers' Assistant/Images/Settings Button.png Binary files differ. diff --git a/Teachers' Assistant/ViewControllerHome.swift b/Teachers' Assistant/ViewControllerHome.swift @@ -105,54 +105,67 @@ class ViewControllerHome: UIViewController { if ViewController.globalVariables.activeColorTheme=="Dark Blue"{ liveList.setImage(#imageLiteral(resourceName: "LiveList (Dark Blue).png"), for: .normal) homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_DarkBlue.png") + settingsCog.setImage(#imageLiteral(resourceName: "Settings Button.png"), for: .normal) 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: "Brandeis_Web_HiRes_Green.png") + settingsCog.setImage(#imageLiteral(resourceName: "Settings Button.png"), for: .normal) 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: "Brandeis_Web_HiRes_Gray.png") + settingsCog.setImage(#imageLiteral(resourceName: "Settings Button.png"), for: .normal) 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: "Brandeis_Web_HiRes_LightBlue.png") + settingsCog.setImage(#imageLiteral(resourceName: "Settings Button.png"), for: .normal) 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") + settingsCog.setImage(#imageLiteral(resourceName: "Settings Button.png"), for: .normal) 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: "Brandeis_Web_HiRes_Pink") + settingsCog.setImage(#imageLiteral(resourceName: "Settings Button.png"), for: .normal) self.view.backgroundColor = UIColor(displayP3Red: 255/255, green: 255/255, blue: 255/255, alpha: 1) } else if ViewController.globalVariables.activeColorTheme=="Inverted Orange"{ liveList.setImage(#imageLiteral(resourceName: "LiveList (Orange Inv).png"), for: .normal) homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_Orange_Inv.png") + settingsCog.setImage(#imageLiteral(resourceName: "Settings Button Inv.png"), for: .normal) self.view.backgroundColor = UIColor(displayP3Red: 252/255, green: 88/255, blue: 43/255, alpha: 1) } else if ViewController.globalVariables.activeColorTheme=="Inverted Dark Blue"{ liveList.setImage(#imageLiteral(resourceName: "LiveList (Dark Blue Inv).png"), for: .normal) homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_DarkBlue_Inv.png") + settingsCog.setImage(#imageLiteral(resourceName: "Settings Button Inv.png"), for: .normal) self.view.backgroundColor = UIColor(displayP3Red: 33/255, green: 94/255, blue: 172/255, alpha: 1) } else if ViewController.globalVariables.activeColorTheme=="Inverted Light Blue"{ liveList.setImage(#imageLiteral(resourceName: "LiveList (Light Blue Inv).png"), for: .normal) homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_LightBlue_Inv.png") + settingsCog.setImage(#imageLiteral(resourceName: "Settings Button Inv.png"), for: .normal) self.view.backgroundColor = UIColor(displayP3Red: 36/255, green: 171/255, blue: 226/255, alpha: 1) } else if ViewController.globalVariables.activeColorTheme=="Inverted Gray"{ liveList.setImage(#imageLiteral(resourceName: "LiveList (Gray Inv).png"), for: .normal) homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_Gray_Inv.png") + settingsCog.setImage(#imageLiteral(resourceName: "Settings Button Inv.png"), for: .normal) self.view.backgroundColor = UIColor(displayP3Red: 102/255, green: 102/255, blue: 102/255, alpha: 1) } else if ViewController.globalVariables.activeColorTheme=="Inverted Green"{ liveList.setImage(#imageLiteral(resourceName: "LiveList (Green Inv).png"), for: .normal) homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_Green_Inv.png") + settingsCog.setImage(#imageLiteral(resourceName: "Settings Button Inv.png"), for: .normal) self.view.backgroundColor = UIColor(displayP3Red: 141/255, green: 198/255, blue: 64/255, alpha: 1) } else if ViewController.globalVariables.activeColorTheme=="Inverted Pink"{ liveList.setImage(#imageLiteral(resourceName: "LiveList (Pink Inv).png"), for: .normal) homeLogo.image = UIImage(named: "Brandeis_Web_HiRes_Pink_Inv.png") + settingsCog.setImage(#imageLiteral(resourceName: "Settings Button Inv.png"), for: .normal) 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") + settingsCog.setImage(#imageLiteral(resourceName: "Settings Button.png"), for: .normal) self.view.backgroundColor = UIColor(displayP3Red: 255/255, green: 255/255, blue: 255/255, alpha: 1) } diff --git a/TeachersAssistant.xcodeproj/project.pbxproj b/TeachersAssistant.xcodeproj/project.pbxproj @@ -45,7 +45,6 @@ B34CDBA3221650410031C28B /* Sign-Out (Green).png in Resources */ = {isa = PBXBuildFile; fileRef = B34CDB90221650370031C28B /* Sign-Out (Green).png */; }; B34CDBA4221650410031C28B /* LiveList (Dark Blue).png in Resources */ = {isa = PBXBuildFile; fileRef = B34CDB91221650380031C28B /* LiveList (Dark Blue).png */; }; B34CDBA5221650410031C28B /* Sign-Out (Pink).png in Resources */ = {isa = PBXBuildFile; fileRef = B34CDB92221650390031C28B /* Sign-Out (Pink).png */; }; - B34CDBA6221650410031C28B /* Settings Button.png in Resources */ = {isa = PBXBuildFile; fileRef = B34CDB93221650390031C28B /* Settings Button.png */; }; B34CDBA7221650410031C28B /* Sign-In (Orange).png in Resources */ = {isa = PBXBuildFile; fileRef = B34CDB942216503A0031C28B /* Sign-In (Orange).png */; }; B34CDBA8221650410031C28B /* Sign-In (Pink).png in Resources */ = {isa = PBXBuildFile; fileRef = B34CDB952216503A0031C28B /* Sign-In (Pink).png */; }; B34CDBA9221650410031C28B /* Sign-In (Green).png in Resources */ = {isa = PBXBuildFile; fileRef = B34CDB962216503B0031C28B /* Sign-In (Green).png */; }; @@ -57,6 +56,8 @@ 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 */; }; + B3509FC322396C8C007B3024 /* Settings Button Inv.png in Resources */ = {isa = PBXBuildFile; fileRef = B3509FC122396C8B007B3024 /* Settings Button Inv.png */; }; + B3509FC422396C8C007B3024 /* Settings Button.png in Resources */ = {isa = PBXBuildFile; fileRef = B3509FC222396C8B007B3024 /* Settings Button.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 */; }; @@ -122,7 +123,6 @@ B34CDB90221650370031C28B /* Sign-Out (Green).png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Sign-Out (Green).png"; sourceTree = "<group>"; }; B34CDB91221650380031C28B /* LiveList (Dark Blue).png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "LiveList (Dark Blue).png"; sourceTree = "<group>"; }; B34CDB92221650390031C28B /* Sign-Out (Pink).png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Sign-Out (Pink).png"; sourceTree = "<group>"; }; - B34CDB93221650390031C28B /* Settings Button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Settings Button.png"; sourceTree = "<group>"; }; B34CDB942216503A0031C28B /* Sign-In (Orange).png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Sign-In (Orange).png"; sourceTree = "<group>"; }; B34CDB952216503A0031C28B /* Sign-In (Pink).png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Sign-In (Pink).png"; sourceTree = "<group>"; }; B34CDB962216503B0031C28B /* Sign-In (Green).png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Sign-In (Green).png"; sourceTree = "<group>"; }; @@ -134,6 +134,8 @@ 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>"; }; + B3509FC122396C8B007B3024 /* Settings Button Inv.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Settings Button Inv.png"; sourceTree = "<group>"; }; + B3509FC222396C8B007B3024 /* Settings Button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Settings Button.png"; path = "../../../../Downloads/settingsDrop/Settings Button.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>"; }; @@ -198,7 +200,6 @@ B34CDB9B2216503E0031C28B /* LiveList (Light Blue).png */, B34CDB8F221650370031C28B /* LiveList (Orange).png */, B34CDB9A2216503E0031C28B /* LiveList (Pink).png */, - B34CDB93221650390031C28B /* Settings Button.png */, B34CDB9C2216503F0031C28B /* Sign-In (Dark Blue).png */, B34CDB992216503D0031C28B /* Sign-In (Gray).png */, B34CDB962216503B0031C28B /* Sign-In (Green).png */, @@ -229,6 +230,8 @@ B34CDB972216503C0031C28B /* Sign-Out (Light Blue).png */, B34CDB982216503C0031C28B /* Sign-Out (Orange).png */, B34CDB92221650390031C28B /* Sign-Out (Pink).png */, + B3509FC122396C8B007B3024 /* Settings Button Inv.png */, + B3509FC222396C8B007B3024 /* Settings Button.png */, ); path = Images; sourceTree = "<group>"; @@ -393,7 +396,6 @@ B34CDBB1221650410031C28B /* LiveList (Green).png in Resources */, B30366162221E45A00BB9DC6 /* Brandeis_Web_HiRes_Orange.png in Resources */, B33C58B622395CE600E0E75F /* Sign-Out (Pink Inv).png in Resources */, - B34CDBA6221650410031C28B /* Settings Button.png in Resources */, B33C58C022395CE600E0E75F /* Sign-In (Dark Blue Inv).png in Resources */, B33C58BB22395CE600E0E75F /* Sign-In (Light Blue Inv).png in Resources */, B33C58BC22395CE600E0E75F /* LiveList (Orange Inv).png in Resources */, @@ -419,11 +421,13 @@ B34CDBA1221650410031C28B /* LiveList (Gray).png in Resources */, B32BA0AE2238D6DF0000E747 /* Brandeis_Web_HiRes_Gray.png in Resources */, B33C58B722395CE600E0E75F /* Sign-Out (Gray Inv).png in Resources */, + B3509FC422396C8C007B3024 /* Settings Button.png in Resources */, B33C58BE22395CE600E0E75F /* LiveList (Light Blue Inv).png in Resources */, B34CDBA3221650410031C28B /* Sign-Out (Green).png in Resources */, B3D8E1DA220F7847007CAD3A /* Main.storyboard in Resources */, B33C58BF22395CE600E0E75F /* LiveList (Dark Blue Inv).png in Resources */, B34CDBAF221650410031C28B /* Sign-In (Dark Blue).png in Resources */, + B3509FC322396C8C007B3024 /* Settings Button Inv.png in Resources */, B33C58B822395CE600E0E75F /* Sign-Out (Green Inv).png in Resources */, B34CDBAD221650410031C28B /* LiveList (Pink).png in Resources */, ); diff --git a/TeachersAssistant.xcworkspace/xcuserdata/naomi.xcuserdatad/UserInterfaceState.xcuserstate b/TeachersAssistant.xcworkspace/xcuserdata/naomi.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ.
