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

fixed navigation problems after adding new login system, started working on connectivity, for some reason session is not properly being deinitialized

Browse Source
This commit is contained in:
Okechi 2016-02-16 06:25:00 -05:00
parent aef55a5c80
commit 77de598da1
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GetHip/FriendsListViewController.swift
View File

@ -18,7 +18,7 @@ class FriendsListViewController: UIViewController, UITableViewDelegate, UITableV
@IBAction func dismissFriendView(sender: UIBarButtonItem) { @IBAction func dismissFriendView(sender: UIBarButtonItem) {
self.parentViewController?.navigationController?.popViewControllerAnimated(true) self.dismissViewControllerAnimated(true, completion: nil)
self.navigationController?.navigationBarHidden = false self.navigationController?.navigationBarHidden = false
} }

25
GetHip/Main.storyboard
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="CzG-yI-Fm4"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="j0X-k4-h6H">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
</dependencies> </dependencies>
@ -74,8 +74,8 @@
<outlet property="signIn" destination="ALE-x0-k9I" id="mOR-kB-ZID"/> <outlet property="signIn" destination="ALE-x0-k9I" id="mOR-kB-ZID"/>
<outlet property="signUpButton" destination="lST-pS-LgB" id="Foa-6z-LBJ"/> <outlet property="signUpButton" destination="lST-pS-LgB" id="Foa-6z-LBJ"/>
<outlet property="userEmailField" destination="gFr-9c-756" id="xPA-UK-gem"/> <outlet property="userEmailField" destination="gFr-9c-756" id="xPA-UK-gem"/>
<segue destination="i3K-xv-zw1" kind="show" identifier="LoginToHomeSegue" id="5pn-ck-WiI"/> <segue destination="i3K-xv-zw1" kind="presentation" identifier="LoginToHomeSegue" id="5pn-ck-WiI"/>
<segue destination="dsv-bM-qgc" kind="show" identifier="signUpSegue" id="gK7-EH-zMe"/> <segue destination="CzG-yI-Fm4" kind="show" identifier="signUpSegue" id="5eZ-Bl-cuD"/>
</connections> </connections>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="6qe-4m-7Cy" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="6qe-4m-7Cy" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -145,7 +145,11 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view> </view>
<navigationItem key="navigationItem" title="Account Creation" id="wal-Nl-HBB"> <navigationItem key="navigationItem" title="Account Creation" id="wal-Nl-HBB">
<barButtonItem key="backBarButtonItem" title="Cancel" id="K3n-PS-AzS"/> <barButtonItem key="leftBarButtonItem" title="Cancel" id="bK9-iV-F0i">
<connections>
<action selector="cancelSignUp" destination="dsv-bM-qgc" id="vNK-AW-hKE"/>
</connections>
</barButtonItem>
</navigationItem> </navigationItem>
<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/> <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/> <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
@ -157,7 +161,7 @@
<outlet property="profilePic" destination="sAc-4h-398" id="rlt-kj-GBV"/> <outlet property="profilePic" destination="sAc-4h-398" id="rlt-kj-GBV"/>
<outlet property="saveBtn" destination="8lW-PH-WAb" id="7lt-lh-9gs"/> <outlet property="saveBtn" destination="8lW-PH-WAb" id="7lt-lh-9gs"/>
<outlet property="userField" destination="wbB-YU-CFd" id="rQn-dc-zWM"/> <outlet property="userField" destination="wbB-YU-CFd" id="rQn-dc-zWM"/>
<segue destination="i3K-xv-zw1" kind="show" identifier="SignedUpSegue" id="4Cw-Wg-nXy"/> <segue destination="i3K-xv-zw1" kind="modal" identifier="SignedUpSegue" id="4Cw-Wg-nXy"/>
</connections> </connections>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="L2S-Q5-7iA" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="L2S-Q5-7iA" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -339,12 +343,12 @@
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</navigationBar> </navigationBar>
<connections> <connections>
<segue destination="j0X-k4-h6H" kind="relationship" relationship="rootViewController" id="Xce-i2-SEV"/> <segue destination="dsv-bM-qgc" kind="relationship" relationship="rootViewController" id="NSw-6O-EkM"/>
</connections> </connections>
</navigationController> </navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="mbC-CF-JRB" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="mbC-CF-JRB" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="-743" y="1027"/> <point key="canvasLocation" x="205" y="1027"/>
</scene> </scene>
<!--Friends List View Controller--> <!--Friends List View Controller-->
<scene sceneID="f64-9e-nxp"> <scene sceneID="f64-9e-nxp">
@ -417,6 +421,10 @@
</connections> </connections>
</tableViewCell> </tableViewCell>
</prototypes> </prototypes>
<connections>
<outlet property="dataSource" destination="Wv2-hP-rqT" id="2kw-Pm-2Dx"/>
<outlet property="delegate" destination="Wv2-hP-rqT" id="JDZ-lQ-eQZ"/>
</connections>
</tableView> </tableView>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@ -1449,7 +1457,6 @@
<image name="Turntable@3x.png" width="434" height="434"/> <image name="Turntable@3x.png" width="434" height="434"/>
</resources> </resources>
<inferredMetricsTieBreakers> <inferredMetricsTieBreakers>
<segue reference="5pn-ck-WiI"/> <segue reference="4Cw-Wg-nXy"/>
<segue reference="5Ml-AJ-rNB"/>
</inferredMetricsTieBreakers> </inferredMetricsTieBreakers>
</document> </document>

2
GetHip/SettingsTableViewController.swift
View File

@ -18,7 +18,7 @@ class SettingsTableViewController: UIViewController, UITableViewDataSource, UITa
@IBAction func dismissSettingsView(sender: UIBarButtonItem) { @IBAction func dismissSettingsView(sender: UIBarButtonItem) {
self.parentViewController?.navigationController?.popViewControllerAnimated(true) self.dismissViewControllerAnimated(true, completion: nil)
} }

4
GetHip/SignInController.swift
View File

@ -41,6 +41,10 @@ class SignInController: UIViewController, UINavigationControllerDelegate, UIImag
}) })
} }
@IBAction func cancelSignUp(){
self.parentViewController?.dismissViewControllerAnimated(true, completion: nil)
}
@IBAction func chngePhoto(sender: UIButton){ @IBAction func chngePhoto(sender: UIButton){
let captureMenu = UIAlertController(title: nil, message:nil, preferredStyle: .ActionSheet) let captureMenu = UIAlertController(title: nil, message:nil, preferredStyle: .ActionSheet)