Skip to content

Commit 8d821f6

Browse files
mafellowsmafellows
committed
Fixed infinited stack on profile & kluster NOW
1 parent ac61d36 commit 8d821f6

5 files changed

Lines changed: 52 additions & 22 deletions

File tree

‎Cluster.xcworkspace/xcuserdata/mafellows.xcuserdatad/UserInterfaceState.xcuserstate‎

-7.14 KB
Binary file not shown.

‎Cluster.xcworkspace/xcuserdata/mafellows.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,37 @@
5151
landmarkType = "3">
5252
</BreakpointContent>
5353
</BreakpointProxy>
54+
<BreakpointProxy
55+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
56+
<BreakpointContent
57+
shouldBeEnabled = "Yes"
58+
ignoreCount = "0"
59+
continueAfterRunningActions = "No"
60+
filePath = "Cluster/ProfileViewController.swift"
61+
timestampString = "467851801.79886"
62+
startingColumnNumber = "9223372036854775807"
63+
endingColumnNumber = "9223372036854775807"
64+
startingLineNumber = "32"
65+
endingLineNumber = "32"
66+
landmarkName = "viewDidLoad()"
67+
landmarkType = "5">
68+
</BreakpointContent>
69+
</BreakpointProxy>
70+
<BreakpointProxy
71+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
72+
<BreakpointContent
73+
shouldBeEnabled = "Yes"
74+
ignoreCount = "0"
75+
continueAfterRunningActions = "No"
76+
filePath = "Cluster/ProfileViewController.swift"
77+
timestampString = "467852387.975558"
78+
startingColumnNumber = "9223372036854775807"
79+
endingColumnNumber = "9223372036854775807"
80+
startingLineNumber = "61"
81+
endingLineNumber = "61"
82+
landmarkName = "addPhotoClicked(_:)"
83+
landmarkType = "5">
84+
</BreakpointContent>
85+
</BreakpointProxy>
5486
</Breakpoints>
5587
</Bucket>

‎Cluster/Base.lproj/Main.storyboard‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@
2121
<viewControllerLayoutGuide type="bottom" id="3Jn-2p-n5G"/>
2222
</layoutGuides>
2323
<view key="view" contentMode="scaleToFill" id="uMh-yH-Non">
24-
<rect key="frame" x="0.0" y="0.0" width="600" height="1200"/>
24+
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
2525
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2626
<subviews>
2727
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="1" translatesAutoresizingMaskIntoConstraints="NO" id="Gj7-j4-4EP">
28-
<rect key="frame" x="0.0" y="0.0" width="600" height="1200"/>
28+
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
2929
</imageView>
3030
<visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RVA-Pr-XMM">
31-
<rect key="frame" x="0.0" y="0.0" width="600" height="1200"/>
31+
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
3232
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="hCX-O3-tyk">
33-
<rect key="frame" x="0.0" y="0.0" width="600" height="1200"/>
33+
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
3434
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
3535
<subviews>
3636
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="1j1-AO-gLe">
37-
<rect key="frame" x="0.0" y="74" width="600" height="1052"/>
37+
<rect key="frame" x="0.0" y="74" width="600" height="452"/>
3838
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
3939
<collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="20" minimumInteritemSpacing="10" id="klC-rV-xdo">
4040
<size key="itemSize" width="280" height="380"/>
@@ -44,7 +44,7 @@
4444
</collectionViewFlowLayout>
4545
<cells>
4646
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="Kluster Cell" id="FYY-Rf-drC" customClass="KlusterCollectionViewCell" customModule="Cluster" customModuleProvider="target">
47-
<rect key="frame" x="20" y="0.0" width="280" height="380"/>
47+
<rect key="frame" x="20" y="36" width="280" height="380"/>
4848
<autoresizingMask key="autoresizingMask"/>
4949
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
5050
<rect key="frame" x="0.0" y="0.0" width="280" height="380"/>
@@ -203,7 +203,7 @@
203203
</state>
204204
</button>
205205
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YCb-a6-ltN">
206-
<rect key="frame" x="8" y="1162" width="135" height="22"/>
206+
<rect key="frame" x="8" y="562" width="135" height="22"/>
207207
<inset key="imageEdgeInsets" minX="-5" minY="0.0" maxX="0.0" maxY="0.0"/>
208208
<state key="normal" title="Create Kluster" image="Add">
209209
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -214,7 +214,7 @@
214214
</connections>
215215
</button>
216216
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zKP-tJ-SBJ">
217-
<rect key="frame" x="496" y="1153" width="79" height="37"/>
217+
<rect key="frame" x="496" y="553" width="79" height="37"/>
218218
<fontDescription key="fontDescription" name="AvenirNext-Regular" family="Avenir Next" pointSize="18"/>
219219
<state key="normal" title="Lawrence">
220220
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -225,7 +225,7 @@
225225
</connections>
226226
</button>
227227
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="profile1" translatesAutoresizingMaskIntoConstraints="NO" id="wY6-33-rQn">
228-
<rect key="frame" x="463" y="1159" width="25" height="25"/>
228+
<rect key="frame" x="463" y="559" width="25" height="25"/>
229229
<constraints>
230230
<constraint firstAttribute="width" constant="25" id="CDR-80-lQq"/>
231231
<constraint firstAttribute="height" constant="25" id="W8Z-OV-AhX"/>
@@ -332,7 +332,7 @@
332332
<rect key="frame" x="0.0" y="0.0" width="600" height="65"/>
333333
<autoresizingMask key="autoresizingMask"/>
334334
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yN6-Ff-gh7" id="bRc-EY-61o">
335-
<rect key="frame" x="0.0" y="0.0" width="600" height="64.5"/>
335+
<rect key="frame" x="0.0" y="0.0" width="600" height="65"/>
336336
<autoresizingMask key="autoresizingMask"/>
337337
<subviews>
338338
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Kluster" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TlE-70-H5u">
@@ -349,7 +349,7 @@
349349
<rect key="frame" x="0.0" y="65" width="600" height="44"/>
350350
<autoresizingMask key="autoresizingMask"/>
351351
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="70g-NB-70m" id="cJv-rY-GF9">
352-
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
352+
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
353353
<autoresizingMask key="autoresizingMask"/>
354354
<subviews>
355355
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Edit Profile" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5DN-ZC-61M">
@@ -369,7 +369,7 @@
369369
<rect key="frame" x="0.0" y="109" width="600" height="44"/>
370370
<autoresizingMask key="autoresizingMask"/>
371371
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VZ4-tn-k1v" id="pQl-nR-8Q5">
372-
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
372+
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
373373
<autoresizingMask key="autoresizingMask"/>
374374
<subviews>
375375
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Klusters" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="83p-HB-o6D">
@@ -386,7 +386,7 @@
386386
<rect key="frame" x="0.0" y="153" width="600" height="44"/>
387387
<autoresizingMask key="autoresizingMask"/>
388388
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="h24-RC-DXu" id="sus-WD-Ycb">
389-
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
389+
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
390390
<autoresizingMask key="autoresizingMask"/>
391391
<subviews>
392392
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Invite Facebook Friends" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MYU-vx-7ci">
@@ -403,7 +403,7 @@
403403
<rect key="frame" x="0.0" y="197" width="600" height="44"/>
404404
<autoresizingMask key="autoresizingMask"/>
405405
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JNx-qj-GT2" id="Uw4-gO-mdT">
406-
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
406+
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
407407
<autoresizingMask key="autoresizingMask"/>
408408
<subviews>
409409
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Settings" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fcJ-iD-GYG">
@@ -918,7 +918,7 @@
918918
</mask>
919919
</variation>
920920
<connections>
921-
<segue destination="zcG-qR-lUM" kind="show" id="kzp-Kz-BJX"/>
921+
<action selector="klusterNowButtonPressed:" destination="az7-7U-rec" eventType="touchUpInside" id="Fe9-t9-Bcg"/>
922922
</connections>
923923
</button>
924924
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pa7-mr-bI0">
@@ -1539,7 +1539,7 @@
15391539
<rect key="frame" x="0.0" y="28" width="600" height="68"/>
15401540
<autoresizingMask key="autoresizingMask"/>
15411541
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2Ho-pC-DBL" id="Ueo-H1-dwC">
1542-
<rect key="frame" x="0.0" y="0.0" width="600" height="67.5"/>
1542+
<rect key="frame" x="0.0" y="0.0" width="600" height="68"/>
15431543
<autoresizingMask key="autoresizingMask"/>
15441544
<subviews>
15451545
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="profile1" translatesAutoresizingMaskIntoConstraints="NO" id="uIc-BZ-8gG">
@@ -1614,7 +1614,7 @@
16141614
<rect key="frame" x="0.0" y="28" width="600" height="68"/>
16151615
<autoresizingMask key="autoresizingMask"/>
16161616
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rJM-42-UCX" id="jo5-Be-AM4">
1617-
<rect key="frame" x="0.0" y="0.0" width="600" height="67.5"/>
1617+
<rect key="frame" x="0.0" y="0.0" width="600" height="68"/>
16181618
<autoresizingMask key="autoresizingMask"/>
16191619
<subviews>
16201620
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="profile1" translatesAutoresizingMaskIntoConstraints="NO" id="l5k-c1-Sqs">

‎Cluster/LoginViewController.swift‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import UIKit
1010

1111
class LoginViewController: UIViewController {
1212

13-
1413
@IBAction func loginWithFacebookPressed(sender: AnyObject) {
1514

1615
let permissions = ["email", "public_profile", "user_friends"]
@@ -61,10 +60,6 @@ class LoginViewController: UIViewController {
6160
}
6261
}
6362
})
64-
65-
66-
67-
6863
} else {
6964
// Successful login
7065
self.dismissViewControllerAnimated(true, completion: nil)

‎Cluster/ProfileViewController.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ class ProfileViewController: UIViewController {
5353
self.scroller.contentSize.width = 0
5454
}
5555

56+
@IBAction func klusterNowButtonPressed(sender: AnyObject) {
57+
self.dismissViewControllerAnimated(true, completion: nil)
58+
}
5659

5760
@IBAction func addPhotoClicked(sender: DesignableButton) {
5861
let authorization = PHPhotoLibrary.authorizationStatus()

0 commit comments

Comments
 (0)