Skip to content

Commit

Permalink
updated to jive with master
Browse files Browse the repository at this point in the history
  • Loading branch information
milescrabill committed Dec 9, 2014
2 parents b171ec1 + b70ab09 commit 7d9130e
Show file tree
Hide file tree
Showing 6 changed files with 187 additions and 41 deletions.
12 changes: 10 additions & 2 deletions socialCalendar.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

/* Begin PBXBuildFile section */
025122511A3782CB00F3900A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 025122501A3782CB00F3900A /* Main.storyboard */; };
024A45BB1A33AB0900757D93 /* CalendarTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 024A45BA1A33AB0900757D93 /* CalendarTableViewController.swift */; };
024A45BD1A33AB1C00757D93 /* CalendarTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 024A45BC1A33AB1C00757D93 /* CalendarTabBarViewController.swift */; };
02C91E741A2E08E100B3977B /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02C91E731A2E08E100B3977B /* Accounts.framework */; };
02C91E761A2E08E500B3977B /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02C91E751A2E08E500B3977B /* AudioToolbox.framework */; };
02C91E781A2E08ED00B3977B /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02C91E771A2E08EC00B3977B /* CFNetwork.framework */; };
Expand All @@ -26,9 +28,9 @@
02C91E921A2E094F00B3977B /* ParseUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02C91E8E1A2E094F00B3977B /* ParseUI.framework */; };
02C91E981A2E288700B3977B /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C91E971A2E288700B3977B /* LoginViewController.swift */; };
02F911991A2E604C00B15744 /* Miles.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 02F911971A2E604C00B15744 /* Miles.storyboard */; };
1053D7D41A320C99006CB437 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1053D7D31A320C99006CB437 /* CoreData.framework */; };
02F9119C1A2E61EE00B15744 /* Kevin.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 02F9119A1A2E61EE00B15744 /* Kevin.storyboard */; };
103679601A2E3124001D63D2 /* friends.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 1036795E1A2E3124001D63D2 /* friends.xcdatamodeld */; };
1053D7D41A320C99006CB437 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1053D7D31A320C99006CB437 /* CoreData.framework */; };
1079FEF41A2D4AD900654080 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1079FEF31A2D4AD900654080 /* AppDelegate.swift */; };
1079FEF61A2D4AD900654080 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1079FEF51A2D4AD900654080 /* ViewController.swift */; };
1079FEFB1A2D4AD900654080 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1079FEFA1A2D4AD900654080 /* Images.xcassets */; };
Expand All @@ -54,6 +56,8 @@

/* Begin PBXFileReference section */
025122501A3782CB00F3900A /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = ../Main.storyboard; sourceTree = "<group>"; };
024A45BA1A33AB0900757D93 /* CalendarTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CalendarTableViewController.swift; sourceTree = "<group>"; };
024A45BC1A33AB1C00757D93 /* CalendarTabBarViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CalendarTabBarViewController.swift; sourceTree = "<group>"; };
02C91E731A2E08E100B3977B /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; };
02C91E751A2E08E500B3977B /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
02C91E771A2E08EC00B3977B /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
Expand All @@ -70,11 +74,11 @@
02C91E8C1A2E094F00B3977B /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = "<group>"; };
02C91E8D1A2E094F00B3977B /* ParseFacebookUtils.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ParseFacebookUtils.framework; sourceTree = "<group>"; };
02C91E8E1A2E094F00B3977B /* ParseUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ParseUI.framework; sourceTree = "<group>"; };
1053D7D31A320C99006CB437 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
02C91E971A2E288700B3977B /* LoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
02F911981A2E604C00B15744 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Miles.storyboard; sourceTree = "<group>"; };
02F9119B1A2E61EE00B15744 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Kevin.storyboard; sourceTree = "<group>"; };
1036795F1A2E3124001D63D2 /* friends.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = friends.xcdatamodel; sourceTree = "<group>"; };
1053D7D31A320C99006CB437 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
1079FEEE1A2D4AD900654080 /* socialCalendar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = socialCalendar.app; sourceTree = BUILT_PRODUCTS_DIR; };
1079FEF21A2D4AD900654080 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1079FEF31A2D4AD900654080 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -177,6 +181,8 @@
1036795E1A2E3124001D63D2 /* friends.xcdatamodeld */,
02F9119A1A2E61EE00B15744 /* Kevin.storyboard */,
02F911971A2E604C00B15744 /* Miles.storyboard */,
024A45BA1A33AB0900757D93 /* CalendarTableViewController.swift */,
024A45BC1A33AB1C00757D93 /* CalendarTabBarViewController.swift */,
1079FEF31A2D4AD900654080 /* AppDelegate.swift */,
1079FEF51A2D4AD900654080 /* ViewController.swift */,
02C91E971A2E288700B3977B /* LoginViewController.swift */,
Expand Down Expand Up @@ -334,10 +340,12 @@
1079FEF41A2D4AD900654080 /* AppDelegate.swift in Sources */,
103679601A2E3124001D63D2 /* friends.xcdatamodeld in Sources */,
10F2D1361A2E2AB000DDD58D /* Friend.swift in Sources */,
024A45BD1A33AB1C00757D93 /* CalendarTabBarViewController.swift in Sources */,
10F2D1341A2E2A9600DDD58D /* FriendsTableViewController.swift in Sources */,
10F2D1321A2E29C300DDD58D /* EditFriendsTableViewController.swift in Sources */,
10F2D13C1A2E2AFA00DDD58D /* FriendDetailsTableViewController.swift in Sources */,
10F2D13E1A2E2B3400DDD58D /* FriendTableViewCell.swift in Sources */,
024A45BB1A33AB0900757D93 /* CalendarTableViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
41 changes: 21 additions & 20 deletions socialCalendar/Base.lproj/Miles.storyboard
Original file line number Diff line number Diff line change
@@ -1,25 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="pc6-gb-B16">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="DXw-xu-xwD">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
</dependencies>
<scenes>
<!--Navigation Controller-->
<scene sceneID="dUO-4b-oJ9">
<objects>
<navigationController id="pc6-gb-B16" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="gz0-jn-rDb">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
<segue destination="UIF-fb-4UN" kind="relationship" relationship="rootViewController" id="Ofj-n1-x2J"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="6qY-Ju-qP1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-889" y="246"/>
</scene>
<!--Login View Controller-->
<scene sceneID="ko0-AN-gzo">
<objects>
Expand Down Expand Up @@ -55,6 +39,7 @@
</state>
<connections>
<action selector="loginVerifyButton:" destination="UIF-fb-4UN" eventType="touchUpInside" id="Ia9-Gh-3T4"/>
<segue destination="MCh-g3-iwS" kind="show" identifier="login" id="IvH-4g-PeE"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Welcome to Soshall" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n3P-5w-G5k">
Expand Down Expand Up @@ -85,7 +70,23 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="RCZ-2X-eRD" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-324" y="212"/>
<point key="canvasLocation" x="-339" y="212"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="qpL-mQ-spx">
<objects>
<navigationController id="DXw-xu-xwD" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="ttI-Hr-egW">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
<segue destination="UIF-fb-4UN" kind="relationship" relationship="rootViewController" id="C0l-IL-uzc"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iih-TD-3Mi" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-864" y="212"/>
</scene>
<!--Calendar-->
<scene sceneID="E7U-dA-Ldn">
Expand Down Expand Up @@ -323,10 +324,10 @@
</objects>
<point key="canvasLocation" x="976" y="412"/>
</scene>
<!--Tab Bar Controller-->
<!--Calendar Tab Bar View Controller-->
<scene sceneID="Pu0-IV-BbQ">
<objects>
<tabBarController storyboardIdentifier="TabBarController" id="MCh-g3-iwS" sceneMemberID="viewController">
<tabBarController storyboardIdentifier="TabBarController" id="MCh-g3-iwS" customClass="CalendarTabBarViewController" customModule="socialCalendar" customModuleProvider="target" sceneMemberID="viewController">
<nil key="simulatedBottomBarMetrics"/>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
<tabBar key="tabBar" contentMode="scaleToFill" id="cc8-0h-wJx">
Expand Down
35 changes: 35 additions & 0 deletions socialCalendar/CalendarTabBarViewController.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
//
// CalendarTabBarViewController.swift
// socialCalendar
//
// Created by Miles Crabill on 12/6/14.
// Copyright (c) 2014 AIT. All rights reserved.
//

import UIKit

class CalendarTabBarViewController: UITabBarController {

override func viewDidLoad() {
super.viewDidLoad()

// Do any additional setup after loading the view.
}

override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}


/*
// MARK: - Navigation

// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
// Get the new view controller using segue.destinationViewController.
// Pass the selected object to the new view controller.
}
*/

}
97 changes: 97 additions & 0 deletions socialCalendar/CalendarTableViewController.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
//
// CalendarTableViewController.swift
// socialCalendar
//
// Created by Miles Crabill on 12/6/14.
// Copyright (c) 2014 AIT. All rights reserved.
//

import UIKit

class CalendarTableViewController: UITableViewController {

override func viewDidLoad() {
super.viewDidLoad()

// Uncomment the following line to preserve selection between presentations
// self.clearsSelectionOnViewWillAppear = false

// Uncomment the following line to display an Edit button in the navigation bar for this view controller.
// self.navigationItem.rightBarButtonItem = self.editButtonItem()
}

override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}

// MARK: - Table view data source

override func numberOfSectionsInTableView(tableView: UITableView) -> Int {
// #warning Potentially incomplete method implementation.
// Return the number of sections.
return 0
}

override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
// #warning Incomplete method implementation.
// Return the number of rows in the section.
return 0
}

/*
override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCellWithIdentifier("reuseIdentifier", forIndexPath: indexPath) as UITableViewCell

// Configure the cell...

return cell
}
*/

/*
// Override to support conditional editing of the table view.
override func tableView(tableView: UITableView, canEditRowAtIndexPath indexPath: NSIndexPath) -> Bool {
// Return NO if you do not want the specified item to be editable.
return true
}
*/

/*
// Override to support editing the table view.
override func tableView(tableView: UITableView, commitEditingStyle editingStyle: UITableViewCellEditingStyle, forRowAtIndexPath indexPath: NSIndexPath) {
if editingStyle == .Delete {
// Delete the row from the data source
tableView.deleteRowsAtIndexPaths([indexPath], withRowAnimation: .Fade)
} else if editingStyle == .Insert {
// Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
}
}
*/

/*
// Override to support rearranging the table view.
override func tableView(tableView: UITableView, moveRowAtIndexPath fromIndexPath: NSIndexPath, toIndexPath: NSIndexPath) {

}
*/

/*
// Override to support conditional rearranging of the table view.
override func tableView(tableView: UITableView, canMoveRowAtIndexPath indexPath: NSIndexPath) -> Bool {
// Return NO if you do not want the item to be re-orderable.
return true
}
*/

/*
// MARK: - Navigation

// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/

}
2 changes: 1 addition & 1 deletion socialCalendar/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<string>Miles</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
Expand Down
Loading

0 comments on commit 7d9130e

Please sign in to comment.