Skip to content

Commit 9c03b9f

Browse files
peterkospeterkos
committed
Update proj User refernece, fix logout button
1 parent eb8d4a0 commit 9c03b9f

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

‎BrickHack-Mobile.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
31C5F541219B29CD00E3E1AF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C5F540219B29CD00E3E1AF /* AppDelegate.swift */; };
1515
31C5F546219B29CD00E3E1AF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 31C5F544219B29CD00E3E1AF /* Main.storyboard */; };
1616
31C5F548219B29CF00E3E1AF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 31C5F547219B29CF00E3E1AF /* Assets.xcassets */; };
17+
D706937323E8F86B004FA788 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = D706937223E8F86B004FA788 /* User.swift */; };
1718
D750E81823DF67360075C639 /* FavoriteButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D750E81723DF67360075C639 /* FavoriteButton.swift */; };
1819
D772876C23DFF92800C2D541 /* ScheduleParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = D772876B23DFF92800C2D541 /* ScheduleParser.swift */; };
1920
D789978223D652ED0058060A /* ScheduleTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D789978123D652ED0058060A /* ScheduleTableViewController.swift */; };
@@ -51,6 +52,7 @@
5152
31C5F54C219B29CF00E3E1AF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
5253
31E39209219F765E00F7A3BE /* BrickHack-Mobile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "BrickHack-Mobile.entitlements"; sourceTree = "<group>"; };
5354
C029FC28202ED2177D811FF7 /* Pods-BrickHack-Mobile.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BrickHack-Mobile.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BrickHack-Mobile/Pods-BrickHack-Mobile.debug.xcconfig"; sourceTree = "<group>"; };
55+
D706937223E8F86B004FA788 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
5456
D750E81723DF67360075C639 /* FavoriteButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = FavoriteButton.swift; path = "BrickHack-Mobile/Views/FavoriteButton.swift"; sourceTree = SOURCE_ROOT; };
5557
D772876B23DFF92800C2D541 /* ScheduleParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleParser.swift; sourceTree = "<group>"; };
5658
D789978123D652ED0058060A /* ScheduleTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleTableViewController.swift; sourceTree = "<group>"; };
@@ -141,6 +143,7 @@
141143
children = (
142144
D79AA2B723425DFA009C469D /* APIRoutes.swift */,
143145
D772876B23DFF92800C2D541 /* ScheduleParser.swift */,
146+
D706937223E8F86B004FA788 /* User.swift */,
144147
);
145148
path = Models;
146149
sourceTree = "<group>";
@@ -296,6 +299,7 @@
296299
D7D4B037234813A70001DFC5 /* AlertMessage.swift in Sources */,
297300
D7C41E27236383300091C480 /* ResourcesViewController.swift in Sources */,
298301
D789978523D6A4DC0058060A /* ProfileTableViewController.swift in Sources */,
302+
D706937323E8F86B004FA788 /* User.swift in Sources */,
299303
31C5F541219B29CD00E3E1AF /* AppDelegate.swift in Sources */,
300304
D79AA2B823425DFA009C469D /* APIRoutes.swift in Sources */,
301305
31602385220A116000F73F58 /* EventsViewController.swift in Sources */,

‎BrickHack-Mobile/Base.lproj/Main.storyboard‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,14 @@
133133
<segue destination="S2k-45-cUt" kind="embed" id="zvN-Lw-JtR"/>
134134
</connections>
135135
</containerView>
136-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Schedule" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EIp-cK-tIz">
136+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Schedule" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EIp-cK-tIz">
137137
<rect key="frame" x="15" y="184" width="149" height="41"/>
138138
<fontDescription key="fontDescription" type="boldSystem" pointSize="34"/>
139139
<color key="textColor" name="primaryColor"/>
140140
<nil key="highlightedColor"/>
141141
</label>
142-
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IRw-ic-oiK">
143-
<rect key="frame" x="260" y="184" width="48" height="30"/>
142+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IRw-ic-oiK">
143+
<rect key="frame" x="259" y="189.66666666666666" width="48" height="30"/>
144144
<state key="normal" title="Logout">
145145
<color key="titleColor" name="primaryColor"/>
146146
</state>
@@ -153,10 +153,9 @@
153153
<accessibility key="accessibilityConfiguration" hint="checked-out"/>
154154
<constraints>
155155
<constraint firstAttribute="bottom" secondItem="r4I-Sq-rhl" secondAttribute="bottom" id="BN2-m4-c1v"/>
156-
<constraint firstItem="IRw-ic-oiK" firstAttribute="leading" secondItem="EIp-cK-tIz" secondAttribute="trailing" constant="97" id="JjK-JR-g0L"/>
156+
<constraint firstItem="IRw-ic-oiK" firstAttribute="centerY" secondItem="EIp-cK-tIz" secondAttribute="centerY" id="NaG-Ow-K8y"/>
157157
<constraint firstItem="EIp-cK-tIz" firstAttribute="leading" secondItem="DgF-Zc-fiO" secondAttribute="leading" constant="15" id="Sbf-iJ-jhh"/>
158158
<constraint firstItem="r4I-Sq-rhl" firstAttribute="leading" secondItem="DgF-Zc-fiO" secondAttribute="leading" id="W7l-yf-cpg"/>
159-
<constraint firstItem="IRw-ic-oiK" firstAttribute="top" secondItem="EIp-cK-tIz" secondAttribute="top" id="Ykj-6C-89D"/>
160159
<constraint firstItem="8Zp-wc-XHQ" firstAttribute="top" secondItem="DgF-Zc-fiO" secondAttribute="top" constant="30" id="akc-RA-5my"/>
161160
<constraint firstItem="DgF-Zc-fiO" firstAttribute="trailing" secondItem="IRw-ic-oiK" secondAttribute="trailing" constant="68" id="gCO-DS-Sn1"/>
162161
<constraint firstItem="DgF-Zc-fiO" firstAttribute="trailing" secondItem="r4I-Sq-rhl" secondAttribute="trailing" id="hEf-sD-53f"/>
@@ -197,11 +196,11 @@
197196
<sections>
198197
<tableViewSection id="feo-F1-UGk">
199198
<cells>
200-
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="85" id="tz9-qS-mNz">
199+
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="85" id="tz9-qS-mNz">
201200
<rect key="frame" x="0.0" y="28" width="375" height="85"/>
202201
<autoresizingMask key="autoresizingMask"/>
203202
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="tz9-qS-mNz" id="AW9-B6-GKe">
204-
<rect key="frame" x="0.0" y="0.0" width="348" height="85"/>
203+
<rect key="frame" x="0.0" y="0.0" width="375" height="85"/>
205204
<autoresizingMask key="autoresizingMask"/>
206205
<subviews>
207206
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hsb-w8-ZIH">
@@ -242,7 +241,7 @@
242241
</tableViewController>
243242
<placeholder placeholderIdentifier="IBFirstResponder" id="yNf-Aa-cwx" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
244243
</objects>
245-
<point key="canvasLocation" x="4442" y="-101"/>
244+
<point key="canvasLocation" x="3689" y="-85"/>
246245
</scene>
247246
<!--Schedule Table View Controller-->
248247
<scene sceneID="up2-D5-I0e">

0 commit comments

Comments
 (0)