Merge pull request #9 from codeRIT/peter-mainpage

Schedule, Phase 1: UI, and some Login changes

Author: cbaudouinjr

BrickHack-Mobile.xcodeproj/project.pbxproj

@@ -14,6 +14,9 @@
 		31C5F541219B29CD00E3E1AF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C5F540219B29CD00E3E1AF /* AppDelegate.swift */; };
 		31C5F546219B29CD00E3E1AF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 31C5F544219B29CD00E3E1AF /* Main.storyboard */; };
 		31C5F548219B29CF00E3E1AF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 31C5F547219B29CF00E3E1AF /* Assets.xcassets */; };
+		D750E81823DF67360075C639 /* FavoriteButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D750E81723DF67360075C639 /* FavoriteButton.swift */; };
+		D789978223D652ED0058060A /* ScheduleTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D789978123D652ED0058060A /* ScheduleTableViewController.swift */; };
+		D789978523D6A4DC0058060A /* ProfileTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D789978423D6A4DC0058060A /* ProfileTableViewController.swift */; };
 		D79AA2B823425DFA009C469D /* APIRoutes.swift in Sources */ = {isa = PBXBuildFile; fileRef = D79AA2B723425DFA009C469D /* APIRoutes.swift */; };
 		D7C07885233EDBA300089193 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7C07884233EDBA300089193 /* LoginViewController.swift */; };
 		D7C41E2523637D650091C480 /* MainTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7C41E2423637D650091C480 /* MainTabBarController.swift */; };
@@ -47,6 +50,9 @@
 		31C5F54C219B29CF00E3E1AF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		31E39209219F765E00F7A3BE /* BrickHack-Mobile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "BrickHack-Mobile.entitlements"; sourceTree = "<group>"; };
 		C029FC28202ED2177D811FF7 /* Pods-BrickHack-Mobile.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BrickHack-Mobile.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BrickHack-Mobile/Pods-BrickHack-Mobile.debug.xcconfig"; sourceTree = "<group>"; };
+		D750E81723DF67360075C639 /* FavoriteButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = FavoriteButton.swift; path = "BrickHack-Mobile/Views/FavoriteButton.swift"; sourceTree = SOURCE_ROOT; };
+		D789978123D652ED0058060A /* ScheduleTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleTableViewController.swift; sourceTree = "<group>"; };
+		D789978423D6A4DC0058060A /* ProfileTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ProfileTableViewController.swift; path = "/Users/peterkos/Code/Github/brickhack-mobile-ios/BrickHack-Mobile/Controllers/ProfileTableViewController.swift"; sourceTree = "<absolute>"; };
 		D79AA2B723425DFA009C469D /* APIRoutes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIRoutes.swift; sourceTree = "<group>"; };
 		D7C07884233EDBA300089193 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
 		D7C41E2423637D650091C480 /* MainTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarController.swift; sourceTree = "<group>"; };
@@ -121,6 +127,8 @@
 				D7C07884233EDBA300089193 /* LoginViewController.swift */,
 				D7C41E2423637D650091C480 /* MainTabBarController.swift */,
 				31602384220A116000F73F58 /* EventsViewController.swift */,
+				D789978123D652ED0058060A /* ScheduleTableViewController.swift */,
+				D789978423D6A4DC0058060A /* ProfileTableViewController.swift */,
 				D7C41E26236383300091C480 /* ResourcesViewController.swift */,
 			);
 			path = Controllers;
@@ -137,6 +145,7 @@
 		D79AA2BB234268D2009C469D /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				D750E81723DF67360075C639 /* FavoriteButton.swift */,
 				D7D4B036234813A70001DFC5 /* AlertMessage.swift */,
 			);
 			path = Views;
@@ -276,10 +285,13 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D789978223D652ED0058060A /* ScheduleTableViewController.swift in Sources */,
 				D7C07885233EDBA300089193 /* LoginViewController.swift in Sources */,
 				D7C41E2523637D650091C480 /* MainTabBarController.swift in Sources */,
+				D750E81823DF67360075C639 /* FavoriteButton.swift in Sources */,
 				D7D4B037234813A70001DFC5 /* AlertMessage.swift in Sources */,
 				D7C41E27236383300091C480 /* ResourcesViewController.swift in Sources */,
+				D789978523D6A4DC0058060A /* ProfileTableViewController.swift in Sources */,
 				31C5F541219B29CD00E3E1AF /* AppDelegate.swift in Sources */,
 				D79AA2B823425DFA009C469D /* APIRoutes.swift in Sources */,
 				31602385220A116000F73F58 /* EventsViewController.swift in Sources */,

BrickHack-Mobile.xcworkspace/contents.xcworkspacedata

@@ -88,6 +88,12 @@ class MessageHandler {
         showAlertMessage(withTitle: "Parsing Error",
                          body: "Error parsing user info from server.",
                          type: .error)
+    }
 
+    static func showInvalidFavoriteButtonError() {
+        print("ERROR: Attempted to favorite a non-favorite-button cell.")
+        showAlertMessage(withTitle: "Unable to favorite",
+                         body: "Please try again later.",
+                         type: .error)
     }
 }

BrickHack-Mobile/AlertMessage.swift

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Star 3.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Star 3@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Star 3@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BrickHack-Mobile/Assets.xcassets/emptyStar.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Star 2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Star 2@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Star 2@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}