Skip to content

Commit b7fad88

Browse files
committed
Fullscreen login flow, tableview stretches to end
1 parent 70e5c9a commit b7fad88

3 files changed

Lines changed: 13 additions & 8 deletions

File tree

BrickHack-Mobile/Base.lproj/Main.storyboard

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="D1f-v2-RH4">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
33
<device id="retina5_9" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
@@ -21,10 +21,10 @@
2121
<rect key="frame" x="0.0" y="0.0" width="375" height="598"/>
2222
<subviews>
2323
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="brickHack6Logo" translatesAutoresizingMaskIntoConstraints="NO" id="1am-Hz-qrF">
24-
<rect key="frame" x="36" y="159.66666666666663" width="296" height="279"/>
24+
<rect key="frame" x="36" y="229.33333333333337" width="148" height="139.66666666666663"/>
2525
</imageView>
2626
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="loginShapes" translatesAutoresizingMaskIntoConstraints="NO" id="QYc-0X-ayY">
27-
<rect key="frame" x="-47" y="-50" width="422" height="698"/>
27+
<rect key="frame" x="164" y="124.66666666666669" width="211" height="349"/>
2828
</imageView>
2929
</subviews>
3030
<color key="backgroundColor" name="primaryColor"/>
@@ -86,6 +86,9 @@
8686
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
8787
</view>
8888
<nil key="simulatedTopBarMetrics"/>
89+
<connections>
90+
<segue destination="D1f-v2-RH4" kind="show" identifier="authSuccessSegue" id="Jps-WT-Nwl"/>
91+
</connections>
8992
</viewController>
9093
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
9194
</objects>
@@ -105,7 +108,7 @@
105108
</navigationController>
106109
<placeholder placeholderIdentifier="IBFirstResponder" id="60l-ds-psv" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
107110
</objects>
108-
<point key="canvasLocation" x="1932" y="132"/>
111+
<point key="canvasLocation" x="1938" y="548"/>
109112
</scene>
110113
<!--Events-->
111114
<scene sceneID="Udu-fV-S7q">
@@ -125,7 +128,7 @@
125128
</connections>
126129
</containerView>
127130
<containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r4I-Sq-rhl">
128-
<rect key="frame" x="0.0" y="244" width="375" height="534"/>
131+
<rect key="frame" x="0.0" y="244" width="375" height="568"/>
129132
<connections>
130133
<segue destination="S2k-45-cUt" kind="embed" id="zvN-Lw-JtR"/>
131134
</connections>
@@ -140,7 +143,7 @@
140143
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
141144
<accessibility key="accessibilityConfiguration" hint="checked-out"/>
142145
<constraints>
143-
<constraint firstItem="DgF-Zc-fiO" firstAttribute="bottom" secondItem="r4I-Sq-rhl" secondAttribute="bottom" id="BN2-m4-c1v"/>
146+
<constraint firstAttribute="bottom" secondItem="r4I-Sq-rhl" secondAttribute="bottom" id="BN2-m4-c1v"/>
144147
<constraint firstItem="EIp-cK-tIz" firstAttribute="leading" secondItem="DgF-Zc-fiO" secondAttribute="leading" constant="37" id="Sbf-iJ-jhh"/>
145148
<constraint firstItem="r4I-Sq-rhl" firstAttribute="leading" secondItem="DgF-Zc-fiO" secondAttribute="leading" id="W7l-yf-cpg"/>
146149
<constraint firstItem="8Zp-wc-XHQ" firstAttribute="top" secondItem="DgF-Zc-fiO" secondAttribute="top" constant="30" id="akc-RA-5my"/>

BrickHack-Mobile/Controllers/EventsViewController.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ class EventsViewController: UIViewController { //UserDataHandler {
1414

1515

1616
// MARK: UI
17-
18-
1917

2018
// General properties
2119
// @FIXME When login works

BrickHack-Mobile/Controllers/LoginViewController.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,11 @@ class LoginViewController: UIViewController {
120120
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
121121
if (segue.identifier == "authSuccessSegue") {
122122

123+
// Make the destination be fullscreen
124+
segue.destination.modalPresentationStyle = .fullScreen
125+
123126
// Check for MainTabBarController (skip through nav controller)
127+
// Note: not used!
124128
if let tabVC = segue.destination.children.first as? MainTabBarController {
125129

126130
// Check if valid user (on error, user will reauth)

0 commit comments

Comments
 (0)