Skip to content

Commit 1633d11

Browse files
peterkospeterkos
committed
In prog design
1 parent 06a88c1 commit 1633d11

5 files changed

Lines changed: 61 additions & 38 deletions

File tree

‎BrickHack-Mobile/Assets.xcassets/loginShapes.imageset/BG Shapes.png‎

6.44 KB
Loading

‎BrickHack-Mobile/Assets.xcassets/loginShapes.imageset/BG Shapes@2x.png‎

14 KB
Loading

‎BrickHack-Mobile/Assets.xcassets/loginShapes.imageset/BG Shapes@3x.png‎

21.3 KB
Loading

‎BrickHack-Mobile/Assets.xcassets/loginShapes.imageset/Contents.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "BG Shapes.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "BG Shapes@2x.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "BG Shapes@3x.png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

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

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
3-
<device id="retina6_1" orientation="portrait" appearance="light"/>
3+
<device id="retina5_9" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
66
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
@@ -14,14 +14,33 @@
1414
<objects>
1515
<viewController storyboardIdentifier="LoginViewController" title="Authentication" modalTransitionStyle="flipHorizontal" id="BYZ-38-t0r" customClass="LoginViewController" customModule="BrickHack_Mobile" customModuleProvider="target" sceneMemberID="viewController">
1616
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
17-
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
17+
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
1818
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1919
<subviews>
20+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gwU-Z6-hc2">
21+
<rect key="frame" x="0.0" y="0.0" width="375" height="598"/>
22+
<subviews>
23+
<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"/>
25+
</imageView>
26+
<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"/>
28+
</imageView>
29+
</subviews>
30+
<color key="backgroundColor" name="primaryColor"/>
31+
<constraints>
32+
<constraint firstItem="1am-Hz-qrF" firstAttribute="leading" secondItem="gwU-Z6-hc2" secondAttribute="leading" constant="36" id="6fr-IN-KrB"/>
33+
<constraint firstItem="1am-Hz-qrF" firstAttribute="centerY" secondItem="gwU-Z6-hc2" secondAttribute="centerY" id="7yC-19-z7v"/>
34+
<constraint firstAttribute="trailing" secondItem="QYc-0X-ayY" secondAttribute="trailing" id="TYI-bU-g2b"/>
35+
<constraint firstAttribute="trailing" secondItem="QYc-0X-ayY" secondAttribute="trailing" id="n7k-0h-OAw"/>
36+
<constraint firstItem="QYc-0X-ayY" firstAttribute="centerY" secondItem="gwU-Z6-hc2" secondAttribute="centerY" id="sgu-SW-zdl"/>
37+
</constraints>
38+
</view>
2039
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tmd-U4-Zfm">
21-
<rect key="frame" x="107" y="718" width="199" height="47"/>
40+
<rect key="frame" x="96" y="654" width="184" height="57"/>
2241
<color key="backgroundColor" name="primaryColor"/>
2342
<constraints>
24-
<constraint firstAttribute="height" constant="47" id="wm9-TG-OS8"/>
43+
<constraint firstAttribute="height" constant="57" id="VGD-Yf-HOP"/>
2544
</constraints>
2645
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
2746
<state key="normal" title="Login">
@@ -39,38 +58,17 @@
3958
<action selector="initializeOAuth:" destination="BYZ-38-t0r" eventType="touchUpInside" id="8oy-dY-rua"/>
4059
</connections>
4160
</button>
42-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="G2B-ds-glJ">
43-
<rect key="frame" x="107" y="785" width="199" height="47"/>
44-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
45-
<constraints>
46-
<constraint firstAttribute="height" constant="47" id="SCL-X0-MtG"/>
47-
</constraints>
48-
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
49-
<state key="normal" title="Register">
50-
<color key="titleColor" name="secondaryColor"/>
51-
<color key="titleShadowColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
52-
</state>
53-
<userDefinedRuntimeAttributes>
54-
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
55-
<integer key="value" value="5"/>
56-
</userDefinedRuntimeAttribute>
57-
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.matchToBounds" value="YES"/>
58-
<userDefinedRuntimeAttribute type="boolean" keyPath="titleLabel.adjustsFontSizeToFitWidth" value="YES"/>
59-
</userDefinedRuntimeAttributes>
60-
<connections>
61-
<action selector="initializeOAuth:" destination="BYZ-38-t0r" eventType="touchUpInside" id="At6-rs-kiK"/>
62-
</connections>
63-
</button>
6461
</subviews>
6562
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
6663
<color key="tintColor" name="secondaryColor"/>
6764
<constraints>
68-
<constraint firstItem="G2B-ds-glJ" firstAttribute="top" secondItem="tmd-U4-Zfm" secondAttribute="bottom" constant="20" id="66F-To-N5d"/>
69-
<constraint firstItem="G2B-ds-glJ" firstAttribute="trailing" secondItem="tmd-U4-Zfm" secondAttribute="trailing" id="G4s-xK-VY1"/>
70-
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="tmd-U4-Zfm" secondAttribute="trailing" constant="108" id="jmX-F4-I5m"/>
71-
<constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="tmd-U4-Zfm" secondAttribute="bottom" constant="97" id="k7C-p7-n4r"/>
72-
<constraint firstItem="G2B-ds-glJ" firstAttribute="leading" secondItem="tmd-U4-Zfm" secondAttribute="leading" id="pRK-uf-q8n"/>
73-
<constraint firstItem="tmd-U4-Zfm" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="107" id="wua-Ui-igR"/>
65+
<constraint firstItem="6Tk-OE-BBY" firstAttribute="top" secondItem="gwU-Z6-hc2" secondAttribute="top" constant="44" id="8tN-dg-yiy"/>
66+
<constraint firstItem="tmd-U4-Zfm" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="96" id="BRi-f9-Rbr"/>
67+
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="gwU-Z6-hc2" secondAttribute="trailing" id="Rsb-7j-Hcw"/>
68+
<constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="gwU-Z6-hc2" secondAttribute="bottom" constant="180" id="Tgv-nx-aJ8"/>
69+
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="tmd-U4-Zfm" secondAttribute="trailing" constant="95" id="VFV-4X-7hj"/>
70+
<constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="tmd-U4-Zfm" secondAttribute="bottom" constant="67" id="XMh-4b-wKa"/>
71+
<constraint firstItem="gwU-Z6-hc2" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="bCn-Jy-1vt"/>
7472
</constraints>
7573
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
7674
</view>
@@ -82,14 +80,14 @@
8280
</viewController>
8381
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
8482
</objects>
85-
<point key="canvasLocation" x="947.82608695652186" y="132.58928571428572"/>
83+
<point key="canvasLocation" x="946.39999999999998" y="131.78410794602701"/>
8684
</scene>
8785
<!--Events-->
8886
<scene sceneID="Udu-fV-S7q">
8987
<objects>
9088
<viewController modalTransitionStyle="flipHorizontal" id="D1f-v2-RH4" customClass="EventsViewController" customModule="BrickHack_Mobile" customModuleProvider="target" sceneMemberID="viewController">
9189
<view key="view" contentMode="scaleToFill" id="GJ3-nO-zVH">
92-
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
90+
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
9391
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
9492
<subviews>
9593
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Events" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sia-xs-aJx">
@@ -149,11 +147,11 @@
149147
<objects>
150148
<viewController id="I7b-88-FfT" customClass="ResourcesViewController" customModule="BrickHack_Mobile" customModuleProvider="target" sceneMemberID="viewController">
151149
<view key="view" contentMode="scaleToFill" id="wpm-T2-2od">
152-
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
150+
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
153151
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
154152
<subviews>
155153
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Resources" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UcL-VA-8Jk">
156-
<rect key="frame" x="157" y="437.5" width="100" height="26"/>
154+
<rect key="frame" x="137.66666666666666" y="395.66666666666669" width="100" height="26"/>
157155
<fontDescription key="fontDescription" type="system" pointSize="22"/>
158156
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
159157
<nil key="highlightedColor"/>
@@ -180,7 +178,7 @@
180178
<toolbarItems/>
181179
<simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
182180
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="LyZ-IA-fUs">
183-
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
181+
<rect key="frame" x="0.0" y="44" width="375" height="44"/>
184182
<autoresizingMask key="autoresizingMask"/>
185183
<color key="barTintColor" name="tintColor"/>
186184
</navigationBar>
@@ -200,7 +198,7 @@
200198
<tabBarItem key="tabBarItem" systemItem="more" id="PCX-wm-a3L"/>
201199
<toolbarItems/>
202200
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="flq-Ll-GFR">
203-
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
201+
<rect key="frame" x="0.0" y="44" width="375" height="44"/>
204202
<autoresizingMask key="autoresizingMask"/>
205203
<color key="barTintColor" name="tintColor"/>
206204
</navigationBar>
@@ -215,6 +213,8 @@
215213
</scene>
216214
</scenes>
217215
<resources>
216+
<image name="brickHack6Logo" width="148" height="139.66667175292969"/>
217+
<image name="loginShapes" width="211" height="349"/>
218218
<namedColor name="backgroundColor">
219219
<color red="0.21600000560283661" green="0.27799999713897705" blue="0.3449999988079071" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
220220
</namedColor>

0 commit comments

Comments
 (0)