oonyeje/Get-Hip
1
0
Fork 0
mirror of https://github.com/oonyeje/Get-Hip.git synced 2025-12-25 11:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Working on back to home back to home screen segue and view modification, need to move where I generate the user data

Browse Source
This commit is contained in:
Okechi 2016-02-17 08:41:54 -05:00
parent 0c4ae5b177
commit 2458a66327
5 changed files with 69 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GetHip.xcodeproj/project.pbxproj
View File

@ -14,6 +14,8 @@
3E101F0A1C52F14A00C895CA /* InviteFriendsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E101F091C52F14A00C895CA /* InviteFriendsView.swift */; };
3E18D4931C51F6230012F7DF /* UserParseData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E18D4921C51F6230012F7DF /* UserParseData.swift */; };
3E18D4951C51FAC60012F7DF /* UserParseDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E18D4941C51FAC60012F7DF /* UserParseDataSource.swift */; };
3E191D7B1C742EA5008D5763 /* Lower@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E191D791C742EA5008D5763 /* Lower@2x.png */; };
3E191D7C1C742EA5008D5763 /* Raise@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E191D7A1C742EA5008D5763 /* Raise@2x.png */; };
3E1AAD141C3BD92600809367 /* FriendsListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1AAD131C3BD92600809367 /* FriendsListViewController.swift */; };
3E1B5E451C5274E700D1AB62 /* SettingsDetailViewWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1B5E441C5274E700D1AB62 /* SettingsDetailViewWrapper.swift */; };
3E1BDA521C37111D00EE3B84 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E1BDA511C37111D00EE3B84 /* AppDelegate.swift */; };
@ -143,6 +145,8 @@
3E101F091C52F14A00C895CA /* InviteFriendsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteFriendsView.swift; sourceTree = "<group>"; };
3E18D4921C51F6230012F7DF /* UserParseData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserParseData.swift; sourceTree = "<group>"; };
3E18D4941C51FAC60012F7DF /* UserParseDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserParseDataSource.swift; sourceTree = "<group>"; };
3E191D791C742EA5008D5763 /* Lower@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Lower@2x.png"; path = "../../../Dropbox/Gethip/For final/i5 Volume/Lower@2x.png"; sourceTree = "<group>"; };
3E191D7A1C742EA5008D5763 /* Raise@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Raise@2x.png"; path = "../../../Dropbox/Gethip/For final/i5 Volume/Raise@2x.png"; sourceTree = "<group>"; };
3E1AAD131C3BD92600809367 /* FriendsListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FriendsListViewController.swift; sourceTree = "<group>"; };
3E1B5E441C5274E700D1AB62 /* SettingsDetailViewWrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsDetailViewWrapper.swift; sourceTree = "<group>"; };
3E1BDA4C1C37111D00EE3B84 /* GetHip.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GetHip.app; sourceTree = BUILT_PRODUCTS_DIR; };
@ -467,6 +471,8 @@
3E438AE01C57387B0055C97A /* iPhone5 */ = {
isa = PBXGroup;
children = (
3E191D791C742EA5008D5763 /* Lower@2x.png */,
3E191D7A1C742EA5008D5763 /* Raise@2x.png */,
3E0B78B71C6E3756001DF21E /* Pause-52.png */,
3E0B78B81C6E3756001DF21E /* Play-52.png */,
3EB8845B1C6C647700CCDCCE /* Add More@2x.png */,
@ -794,6 +800,7 @@
3E438AE91C5738EF0055C97A /* Star@2x.png in Resources */,
3E5BD3151C6C45CE00266B16 /* Home Copy@2x.png in Resources */,
3E5952831C39DDA800C88C71 /* Settings@3x.png in Resources */,
3E191D7B1C742EA5008D5763 /* Lower@2x.png in Resources */,
3E7BB8E21C5B4A350005B834 /* Change Song@2x.png in Resources */,
3E59526B1C39DBC900C88C71 /* Star@3x.png in Resources */,
3E59527B1C39DDA800C88C71 /* Create.png in Resources */,
@ -803,6 +810,7 @@
3EBE976A1C53E4290079B54A /* Blue Check.png in Resources */,
3E438AE71C5738EF0055C97A /* Friends@2x.png in Resources */,
3E59528A1C39EB6100C88C71 /* Turntable@2x.png in Resources */,
3E191D7C1C742EA5008D5763 /* Raise@2x.png in Resources */,
3E0B78BA1C6E3756001DF21E /* Play-52.png in Resources */,
3E438ADE1C572DFD0055C97A /* Main.storyboard in Resources */,
3E438AE81C5738EF0055C97A /* Settings@2x.png in Resources */,

16
GetHip/CurrentlyPlayingViewController.swift
View File

@ -29,7 +29,11 @@ class CurrentlyPlayingViewController: UIViewController {
//Regular buttons
@IBAction func partyView(sender: UIButton){
self.performSegueWithIdentifier("InPartySegue", sender: nil)
self.performSegueWithIdentifier("InPartySegue", sender: self)
}
@IBAction func backToHome(sender: UIButton){
self.performSegueWithIdentifier("BackToHomeScreenSegue", sender: self)
}
@ -66,9 +70,17 @@ class CurrentlyPlayingViewController: UIViewController {
// Pass the selected object to the new view controller.
if(segue.identifier == "InPartySegue"){
let vc: InPartyViewController = (segue.destinationViewController as? InPartyViewController)!
let nav: UINavigationController = (segue.destinationViewController as? UINavigationController)!
let vc: InPartyViewController = (nav.viewControllers[0] as? InPartyViewController)!
vc.setData(self.party)
}
if segue.identifier == "BackToHomeScreenSegue" {
let vc: HomeScreenViewController = (segue.destinationViewController as? HomeScreenViewController)!
vc.comingFromParty = true
vc.partyData = self.party
}
}

3
GetHip/HomeScreenViewController.swift
View File

@ -14,7 +14,8 @@ class HomeScreenViewController: UIViewController {
var friendData: [FriendData] = []
var requestData: [FriendData] = []
var userData: [UserParseData] = []
let partyData = PartyServiceManager()
var partyData = PartyServiceManager()
var comingFromParty: Bool!
@IBOutlet weak var CreateAPartyBtn: UIButton!

24
GetHip/LoginController.swift
View File

@ -8,7 +8,7 @@
import UIKit
class LoginController: UIViewController, PFLogInViewControllerDelegate {
class LoginController: UIViewController, PFLogInViewControllerDelegate, UITextFieldDelegate {
@IBOutlet var userEmailField: UITextField!
@IBOutlet var password: UITextField!
@IBOutlet var signIn: UIButton!
@ -48,7 +48,8 @@ class LoginController: UIViewController, PFLogInViewControllerDelegate {
presentLoggedInAlert()
}
self.userEmailField.delegate = self
self.password.delegate = self
self.signIn.layer.borderWidth = 1
self.signIn.layer.cornerRadius = 5
self.signIn.layer.borderColor = UIColor.whiteColor().CGColor
@ -64,17 +65,24 @@ class LoginController: UIViewController, PFLogInViewControllerDelegate {
}
func presentLoggedInAlert() {
var story = UIStoryboard(name: "Main", bundle: nil)
var homeVC: HomeScreenViewController = story.instantiateViewControllerWithIdentifier("HomeVC") as! HomeScreenViewController!
self.performSegueWithIdentifier("LoginToHomeSegue", sender: self)
} /*
}
// 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.
if segue.identifier == "LoginToHomeSegue" {
let vc: HomeScreenViewController = (segue.destinationViewController as? HomeScreenViewController)!
vc.comingFromParty = false
}
}
func textFieldShouldReturn(textField: UITextField) -> Bool {
self.view.endEditing(true)
return false
}
*/
}

33
GetHip/Main.storyboard
View File

@ -67,6 +67,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<navigationItem key="navigationItem" id="JtB-YG-RXM"/>
<nil key="simulatedTopBarMetrics"/>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
<connections>
<outlet property="forgotPassBtn" destination="BFX-Ad-idn" id="neV-au-ZVa"/>
@ -1037,7 +1038,24 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="YYE-fc-I8V" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="4341" y="-630"/>
<point key="canvasLocation" x="4753" y="-630"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="O41-dS-y1y">
<objects>
<navigationController id="enX-CI-fki" sceneMemberID="viewController">
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="7KM-K7-LWL">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
<segue destination="TaI-jj-ubR" kind="relationship" relationship="rootViewController" id="Zpz-yM-jtA"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="AUg-No-oN9" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="4301" y="-630"/>
</scene>
<!--Currently Playing View Controller-->
<scene sceneID="GJX-js-Rhq">
@ -1060,7 +1078,7 @@
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<segue destination="TaI-jj-ubR" kind="show" identifier="InPartySegue" id="Nob-LL-SKW"/>
<action selector="partyView:" destination="5Fd-vs-lX1" eventType="touchUpInside" id="Npy-DJ-Lfa"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ubi-iW-9FF">
@ -1068,6 +1086,10 @@
<state key="normal" image="Home Copy.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="backToHome:" destination="5Fd-vs-lX1" eventType="touchUpInside" id="fuE-mc-aza"/>
<segue destination="i3K-xv-zw1" kind="presentation" identifier="BackToHomeScreenSegue" id="Ank-g9-HFe"/>
</connections>
</button>
<progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wy0-d1-PlB">
<rect key="frame" x="0.0" y="383" width="320" height="2"/>
@ -1118,7 +1140,7 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<slider opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="AA9-Xx-q9o">
<slider opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" minimumValueImage="Lower.png" maximumValueImage="Raise.png" translatesAutoresizingMaskIntoConstraints="NO" id="AA9-Xx-q9o">
<rect key="frame" x="26" y="465" width="268" height="31"/>
</slider>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sFb-YR-QlX">
@ -1144,6 +1166,7 @@
<outlet property="songImg" destination="HKj-kH-yf5" id="UAh-IG-J3y"/>
<outlet property="titleLabel" destination="tHQ-qY-ZrL" id="RE7-2e-ghS"/>
<outlet property="volCtrl" destination="AA9-Xx-q9o" id="3yD-gc-O6r"/>
<segue destination="enX-CI-fki" kind="show" identifier="InPartySegue" id="fAI-IV-wRT"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="qk5-ei-kCM" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -1446,9 +1469,11 @@
<image name="Create@3x.png" width="471" height="93"/>
<image name="Friends@3x.png" width="219" height="126"/>
<image name="Home Copy.png" width="34" height="34"/>
<image name="Lower.png" width="7" height="10"/>
<image name="No Friend Requests i5.png" width="320" height="568"/>
<image name="Party.png" width="81" height="41"/>
<image name="Pause-52.png" width="52" height="52"/>
<image name="Raise.png" width="14" height="13"/>
<image name="Send Invites Button.png" width="375" height="46"/>
<image name="Send.png" width="152" height="24"/>
<image name="Settings@3x.png" width="116" height="113"/>
@ -1457,6 +1482,6 @@
<image name="Turntable@3x.png" width="434" height="434"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="dYP-IJ-p2K"/>
<segue reference="Ank-g9-HFe"/>
</inferredMetricsTieBreakers>
</document>