Skip to content

Commit a7ae429

Browse files
Seonghun23Seonghun23
authored
Merge pull request #7 from yapp-project/sigh_up
로그인 스토리보드 생성, 메인에서 로그인 스토리보드로 세그 연결
2 parents bbf9619 + 3128f07 commit a7ae429

File tree

3 files changed

+81
-6
lines changed

3 files changed

+81
-6
lines changed

‎XX.xcodeproj/project.pbxproj

+14-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
9670A0EC99584EE7051E25061AD9BF0A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1804DD43026500CA6D81A05C9BDDF4CD /* Assets.xcassets */; };
1717
AE7B818C46677813242EABBA413566FF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4BC5246FCB604F6A3BB58BA5B780127 /* AppDelegate.swift */; };
1818
DBE3F7E5F89E44148715F6A61D7A9969 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 449397A9CFD6B7F12E9CCB48B424B12F /* Main.storyboard */; };
19+
F1E5F6CAB6D058053F8732087D7CE694 /* SighIn.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA8370A6AEEA84FD796C974EF559F071 /* SighIn.storyboard */; };
1920
/* End PBXBuildFile section */
2021

2122
/* Begin PBXContainerItemProxy section */
@@ -874,6 +875,7 @@
874875
AA60F9A6330C7E7E75418CBEC1E70AED /* UITextField+Rx.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Rx.swift"; sourceTree = "<group>"; };
875876
AA7CB32010DBE3F3CA6079AE4B0EC853 /* MockDisposable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockDisposable.swift; sourceTree = "<group>"; };
876877
AA836FCA43723ECD2657F22FEB4345DB /* Deferred.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Deferred.swift; sourceTree = "<group>"; };
878+
AA8370A6AEEA84FD796C974EF559F071 /* SighIn.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SighIn.storyboard; sourceTree = "<group>"; };
877879
AB6EDA0C13F5A373D7545C22740172BA /* AsSingle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsSingle.swift; sourceTree = "<group>"; };
878880
ABA42CE0503F8B130CBF4E443476FFB5 /* RxExample.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = RxExample.xcodeproj; sourceTree = "<group>"; };
879881
AC3CC9F1C85780E3663A36DDF2FF798F /* SimpleTableViewExample.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SimpleTableViewExample.storyboard; sourceTree = "<group>"; };
@@ -1359,6 +1361,14 @@
13591361
path = RxSwift;
13601362
sourceTree = "<group>";
13611363
};
1364+
D35BBEF956158CFBB9FB8016C66FDEB2 /* SignIn */ = {
1365+
isa = PBXGroup;
1366+
children = (
1367+
AA8370A6AEEA84FD796C974EF559F071 /* SighIn.storyboard */,
1368+
);
1369+
path = SignIn;
1370+
sourceTree = "<group>";
1371+
};
13621372
15B32872EA8A9D1DB9524426DF33A1B0 /* Tests */ = {
13631373
isa = PBXGroup;
13641374
children = (
@@ -2883,6 +2893,7 @@
28832893
D47A22E91452765DDFD3690BE996AB31 /* XX */ = {
28842894
isa = PBXGroup;
28852895
children = (
2896+
D35BBEF956158CFBB9FB8016C66FDEB2 /* SignIn */,
28862897
B4BC5246FCB604F6A3BB58BA5B780127 /* AppDelegate.swift */,
28872898
1804DD43026500CA6D81A05C9BDDF4CD /* Assets.xcassets */,
28882899
B77587401D77975FA2FD7C1F98CC1FD8 /* Info.plist */,
@@ -3456,6 +3467,7 @@
34563467
9670A0EC99584EE7051E25061AD9BF0A /* Assets.xcassets in Resources */,
34573468
223ED72A730C213DD645FA2B9F5A799D /* LaunchScreen.storyboard in Resources */,
34583469
DBE3F7E5F89E44148715F6A61D7A9969 /* Main.storyboard in Resources */,
3470+
F1E5F6CAB6D058053F8732087D7CE694 /* SighIn.storyboard in Resources */,
34593471
);
34603472
runOnlyForDeploymentPostprocessing = 0;
34613473
};
@@ -3529,7 +3541,7 @@
35293541
"$(inherited)",
35303542
"@executable_path/Frameworks",
35313543
);
3532-
PRODUCT_BUNDLE_IDENTIFIER = com.yapp.XX;
3544+
PRODUCT_BUNDLE_IDENTIFIER = com.yapp.XX11;
35333545
PRODUCT_NAME = "$(TARGET_NAME)";
35343546
SWIFT_OBJC_BRIDGING_HEADER = "XX/XX-Bridging-Header.h";
35353547
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3666,7 +3678,7 @@
36663678
"$(inherited)",
36673679
"@executable_path/Frameworks",
36683680
);
3669-
PRODUCT_BUNDLE_IDENTIFIER = com.yapp.XX;
3681+
PRODUCT_BUNDLE_IDENTIFIER = com.yapp.XX11;
36703682
PRODUCT_NAME = "$(TARGET_NAME)";
36713683
SWIFT_OBJC_BRIDGING_HEADER = "XX/XX-Bridging-Header.h";
36723684
SWIFT_VERSION = 5.0;

‎XX/Base.lproj/Main.storyboard

+19-4
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,39 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
3+
<device id="retina6_1" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
59
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
610
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
711
</dependencies>
812
<scenes>
913
<!--View Controller-->
1014
<scene sceneID="tne-QT-ifu">
1115
<objects>
12-
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
16+
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="XX" customModuleProvider="target" sceneMemberID="viewController">
1317
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
14-
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
18+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
1519
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1620
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
1721
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
1822
</view>
23+
<connections>
24+
<segue destination="8zn-59-nLD" kind="presentation" id="qA7-xJ-mte"/>
25+
</connections>
1926
</viewController>
2027
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
2128
</objects>
2229
</scene>
30+
<!--SighIn-->
31+
<scene sceneID="3Fc-Fo-XIq">
32+
<objects>
33+
<viewControllerPlaceholder storyboardName="SighIn" id="8zn-59-nLD" sceneMemberID="viewController"/>
34+
<placeholder placeholderIdentifier="IBFirstResponder" id="4V7-Bh-qg2" userLabel="First Responder" sceneMemberID="firstResponder"/>
35+
</objects>
36+
<point key="canvasLocation" x="666" y="126"/>
37+
</scene>
2338
</scenes>
2439
</document>

‎XX/SignIn/SighIn.storyboard

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="uUp-kr-vV1">
3+
<device id="retina6_1" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
6+
<dependencies>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
9+
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
10+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
11+
</dependencies>
12+
<scenes>
13+
<!--View Controller-->
14+
<scene sceneID="FHD-h0-hTI">
15+
<objects>
16+
<viewController id="VDK-sX-mK1" sceneMemberID="viewController">
17+
<view key="view" contentMode="scaleToFill" id="bZ1-WN-aL2">
18+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
19+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
20+
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
21+
<viewLayoutGuide key="safeArea" id="iP5-PZ-qvW"/>
22+
</view>
23+
<navigationItem key="navigationItem" id="REj-nn-juf"/>
24+
</viewController>
25+
<placeholder placeholderIdentifier="IBFirstResponder" id="mVD-wc-9NS" userLabel="First Responder" sceneMemberID="firstResponder"/>
26+
</objects>
27+
<point key="canvasLocation" x="668.11594202898561" y="49.553571428571423"/>
28+
</scene>
29+
<!--Navigation Controller-->
30+
<scene sceneID="x3B-QZ-QjK">
31+
<objects>
32+
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="uUp-kr-vV1" sceneMemberID="viewController">
33+
<toolbarItems/>
34+
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="xJU-nF-kcQ">
35+
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
36+
<autoresizingMask key="autoresizingMask"/>
37+
</navigationBar>
38+
<nil name="viewControllers"/>
39+
<connections>
40+
<segue destination="VDK-sX-mK1" kind="relationship" relationship="rootViewController" id="9yA-32-8Kl"/>
41+
</connections>
42+
</navigationController>
43+
<placeholder placeholderIdentifier="IBFirstResponder" id="ypt-gn-Koc" userLabel="First Responder" sceneMemberID="firstResponder"/>
44+
</objects>
45+
<point key="canvasLocation" x="-242.0289855072464" y="49.553571428571423"/>
46+
</scene>
47+
</scenes>
48+
</document>

0 commit comments

Comments
 (0)