updated to Firebase 3

peterneely · Jun 14, 2016 · fe8eb04 · fe8eb04
1 parent 876206a
commit fe8eb04
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 653 deletions.
diff --git a/Flash Chat.xcodeproj/project.pbxproj b/Flash Chat.xcodeproj/project.pbxproj
@@ -7,13 +7,11 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		63102A961B94F839005C01A2 /* SDevFlatColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63102A951B94F839005C01A2 /* SDevFlatColors.swift */; };
 		6321A9C31B94EBA10053D2E7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6321A9C21B94EBA10053D2E7 /* Images.xcassets */; };
 		6321A9D21B94EBA10053D2E7 /* Flash_ChatTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6321A9D11B94EBA10053D2E7 /* Flash_ChatTests.swift */; };
 		6321A9E21B94EBE70053D2E7 /* CustomMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6321A9DB1B94EBE70053D2E7 /* CustomMessageCell.swift */; };
 		6321A9E51B94EBE70053D2E7 /* MessageCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6321A9DE1B94EBE70053D2E7 /* MessageCell.xib */; };
 		63E28B251B9A335300FBF6E0 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63E28B241B9A335300FBF6E0 /* Message.swift */; };
-		63E28B271B9A336000FBF6E0 /* SwiftNotice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63E28B261B9A336000FBF6E0 /* SwiftNotice.swift */; };
 		63E28B291B9A336600FBF6E0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63E28B281B9A336600FBF6E0 /* Main.storyboard */; };
 		63E28B2F1B9A337600FBF6E0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63E28B2A1B9A337600FBF6E0 /* AppDelegate.swift */; };
 		63E28B301B9A337600FBF6E0 /* ChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63E28B2B1B9A337600FBF6E0 /* ChatViewController.swift */; };
@@ -33,7 +31,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		63102A951B94F839005C01A2 /* SDevFlatColors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SDevFlatColors.swift; sourceTree = "<group>"; };
 		6321A9B61B94EBA10053D2E7 /* Flash Chat.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Flash Chat.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6321A9BA1B94EBA10053D2E7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6321A9C21B94EBA10053D2E7 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
@@ -43,7 +40,6 @@
 		6321A9DB1B94EBE70053D2E7 /* CustomMessageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomMessageCell.swift; sourceTree = "<group>"; };
 		6321A9DE1B94EBE70053D2E7 /* MessageCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MessageCell.xib; sourceTree = "<group>"; };
 		63E28B241B9A335300FBF6E0 /* Message.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Message.swift; sourceTree = "<group>"; };
-		63E28B261B9A336000FBF6E0 /* SwiftNotice.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftNotice.swift; sourceTree = "<group>"; };
 		63E28B281B9A336600FBF6E0 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		63E28B2A1B9A337600FBF6E0 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		63E28B2B1B9A337600FBF6E0 /* ChatViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatViewController.swift; sourceTree = "<group>"; };
@@ -73,7 +69,6 @@
 		6321A9AD1B94EBA10053D2E7 = {
 			isa = PBXGroup;
 			children = (
-				6321AA081B94F0B70053D2E7 /* Frameworks */,
 				6321A9B81B94EBA10053D2E7 /* Flash Chat */,
 				6321A9CE1B94EBA10053D2E7 /* Flash ChatTests */,
 				6321A9B71B94EBA10053D2E7 /* Products */,
@@ -104,8 +99,6 @@
 		6321A9B91B94EBA10053D2E7 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				63102A951B94F839005C01A2 /* SDevFlatColors.swift */,
-				63E28B261B9A336000FBF6E0 /* SwiftNotice.swift */,
 				6321A9BA1B94EBA10053D2E7 /* Info.plist */,
 			);
 			name = "Supporting Files";
@@ -166,13 +159,6 @@
 			name = Model;
 			sourceTree = "<group>";
 		};
-		6321AA081B94F0B70053D2E7 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -278,12 +264,10 @@
 				63E28B331B9A337600FBF6E0 /* WelcomeViewController.swift in Sources */,
 				63E28B251B9A335300FBF6E0 /* Message.swift in Sources */,
 				6321A9E21B94EBE70053D2E7 /* CustomMessageCell.swift in Sources */,
-				63102A961B94F839005C01A2 /* SDevFlatColors.swift in Sources */,
 				63E28B321B9A337600FBF6E0 /* RegisterViewController.swift in Sources */,
 				63E28B311B9A337600FBF6E0 /* LogInViewController.swift in Sources */,
 				63E28B2F1B9A337600FBF6E0 /* AppDelegate.swift in Sources */,
 				63E28B301B9A337600FBF6E0 /* ChatViewController.swift in Sources */,
-				63E28B271B9A336000FBF6E0 /* SwiftNotice.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -397,7 +381,7 @@
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = "Flash Chat/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.londonappbrewery.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -414,7 +398,7 @@
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = "Flash Chat/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.londonappbrewery.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/Flash Chat.xcodeproj/project.xcworkspace/xcshareddata/Flash Chat.xcscmblueprint b/Flash Chat.xcodeproj/project.xcworkspace/xcshareddata/Flash Chat.xcscmblueprint
@@ -1,30 +1,30 @@
 {
-  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "E7CA31C7EE91A5CFE9A6C214ECC04443516A7C12",
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "7DAB0FC089792D65815005FA0FB0E291EA32748D",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
 
   },
   "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
-    "E7CA31C7EE91A5CFE9A6C214ECC04443516A7C12" : 0,
+    "7DAB0FC089792D65815005FA0FB0E291EA32748D" : 0,
     "CC7D4C83F89543DC5D7313A87002A3A288282EF1" : 0
   },
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "6090F00C-470E-4A1D-9F98-CEFBE5178440",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
-    "E7CA31C7EE91A5CFE9A6C214ECC04443516A7C12" : "Flash%20Chat\/",
+    "7DAB0FC089792D65815005FA0FB0E291EA32748D" : "Flash%20Chat\/",
     "CC7D4C83F89543DC5D7313A87002A3A288282EF1" : ".."
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "Flash Chat",
   "DVTSourceControlWorkspaceBlueprintVersion" : 204,
   "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Flash Chat.xcodeproj",
   "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
     {
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/londonappbrewery\/Vixion.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/londonappbrewery\/Flash-Chat.git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "CC7D4C83F89543DC5D7313A87002A3A288282EF1"
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "7DAB0FC089792D65815005FA0FB0E291EA32748D"
     },
     {
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/londonappbrewery\/Flash-Chat.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/londonappbrewery\/Vixion.git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "E7CA31C7EE91A5CFE9A6C214ECC04443516A7C12"
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "CC7D4C83F89543DC5D7313A87002A3A288282EF1"
     }
   ]
 }
diff --git a/...at.xcodeproj/project.xcworkspace/xcuserdata/a1.xcuserdatad/UserInterfaceState.xcuserstate b/...at.xcodeproj/project.xcworkspace/xcuserdata/a1.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Flash Chat/AppDelegate.swift b/Flash Chat/AppDelegate.swift
@@ -14,26 +14,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    //TODO: Set your Application and Client Keys
 
-
-    // Register your application with Parse in this method:
     func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
 
-        //TODO: Initialise Parse with your keys
-
-
-
-        //TODO: Uncomment this block to test your Parse integration
-        /*
-
-            let object = PFObject(className: "Ingredients")
-            object.addObject("Barley", forKey: "favouriteGrain")
-            object.addObject("Hops", forKey: "favouritePlant")
-            object.addObject("Yeast", forKey: "favouriteMicroorganism")
-            object.saveInBackground()
+        //TODO: Initialise and Configure your Firebase
 
-        */
 
         return true
     }

diff --git a/Flash Chat/ChatViewController.swift b/Flash Chat/ChatViewController.swift
@@ -45,20 +45,8 @@ class ChatViewController: UIViewController {
 
         ///////////////////////////////////
     }
-
-    //TODO: Make a viewWillAppear method here
-
-
-    //////////////////////////////////////
-
-
-
-    //TODO" Make a viewDidDisappear method here
-
-
-
-    //////////////////////////////////////
-
+
+
 
     //TODO: Put your Table View Datasource pragma mark here
 
@@ -105,10 +93,7 @@ class ChatViewController: UIViewController {
     @IBAction func sendPressed(sender: AnyObject) {
 
 
-        //Create a new Parse object and set its fields
-
-
-        //Send the message to Parse and save it in our database
+        //TODO: Send the message to Firebase and save it in our database
 
 
     }
@@ -129,26 +114,5 @@ class ChatViewController: UIViewController {
     }
 
 
-    override func viewDidAppear(animated: Bool) {
-        super.viewDidAppear(true)
-
-        //TODO: Schedule the timer here
-
-
-        ///////////////////////////////
-    }
-
-    override func viewWillDisappear(animated: Bool) {
-        super.viewWillDisappear(animated)
-
-        //TODO: Invalidate the timer here
-
-
-        ////////////////////////////////
-    }
-
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-    }
 
 }
diff --git a/Flash Chat/CustomMessageCell.swift b/Flash Chat/CustomMessageCell.swift
@@ -18,7 +18,10 @@ class CustomMessageCell: UITableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
-        // Initialization code
+        // Initialization code goes here
+
+
+
     }
 
 

diff --git a/Flash Chat/LogInViewController.swift b/Flash Chat/LogInViewController.swift
@@ -25,16 +25,11 @@ class LogInViewController: UIViewController {
 
 
     @IBAction func logInPressed(sender: AnyObject) {
-
-        //TODO: Check if the textfields all contain text
-
+
 
         //TODO: Log in the user
 
 
-        //If successful, send them to the ChatViewController
-
-
     }
 
 

diff --git a/Flash Chat/Main.storyboard b/Flash Chat/Main.storyboard
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="8Ny-HH-lhf">
     <dependencies>
-        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
     </dependencies>
     <scenes>

diff --git a/Flash Chat/RegisterViewController.swift b/Flash Chat/RegisterViewController.swift
@@ -29,25 +29,12 @@ class RegisterViewController: UIViewController {
 
     @IBAction func registerPressed(sender: AnyObject) {
 
+
 
-        //TODO: Check all the text fields contain text
-
-
-
-        //TODO: Inside the IF statement: Set up a new user on our Parse database
-
-
-        //1. Send this user's information to Parse in the background
-
-
-        //2. When it's done, tell me if it succeeded, if not tell me the error
-
-
-        //3. if there was an error, tell the user about it
-
+        //TODO: Set up a new user on our Firbase database
 
-        //4. otherwise just take them straight to the ChatViewController
 
+
 
 
     }