Skip to content

Commit

Permalink
merge #6
Browse files Browse the repository at this point in the history
1주차 기본,도전,심화과제 PR
  • Loading branch information
meenyweeny authored Apr 12, 2022
2 parents ae0e4f5 + 51749bf commit 9cf34a5
Show file tree
Hide file tree
Showing 17 changed files with 686 additions and 7 deletions.
80 changes: 74 additions & 6 deletions assignment/assignment.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,27 @@
objects = {

/* Begin PBXBuildFile section */
980D11D327FD56770009F772 /* Login.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 980D11D227FD56770009F772 /* Login.storyboard */; };
980D11D527FD567D0009F772 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 980D11D427FD567D0009F772 /* LoginViewController.swift */; };
980D11D827FD56910009F772 /* Join.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 980D11D727FD56910009F772 /* Join.storyboard */; };
980D11DD27FD57D30009F772 /* Complete.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 980D11DC27FD57D30009F772 /* Complete.storyboard */; };
980D11DF27FD57DA0009F772 /* CompleteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 980D11DE27FD57DA0009F772 /* CompleteViewController.swift */; };
985946A527FA7E5C00F7610D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 985946A427FA7E5C00F7610D /* AppDelegate.swift */; };
985946A727FA7E5C00F7610D /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 985946A627FA7E5C00F7610D /* SceneDelegate.swift */; };
985946A927FA7E5C00F7610D /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 985946A827FA7E5C00F7610D /* ViewController.swift */; };
985946AC27FA7E5C00F7610D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 985946AA27FA7E5C00F7610D /* Main.storyboard */; };
985946AE27FA7E5C00F7610D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 985946AD27FA7E5C00F7610D /* Assets.xcassets */; };
985946B127FA7E5C00F7610D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 985946AF27FA7E5C00F7610D /* LaunchScreen.storyboard */; };
98967EF927FD5EB60031138C /* JoinNameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98967EF827FD5EB60031138C /* JoinNameViewController.swift */; };
98967EFB27FD5ECE0031138C /* JoinPasswordViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98967EFA27FD5ECE0031138C /* JoinPasswordViewController.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
980D11D227FD56770009F772 /* Login.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Login.storyboard; sourceTree = "<group>"; };
980D11D427FD567D0009F772 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
980D11D727FD56910009F772 /* Join.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Join.storyboard; sourceTree = "<group>"; };
980D11DC27FD57D30009F772 /* Complete.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Complete.storyboard; sourceTree = "<group>"; };
980D11DE27FD57DA0009F772 /* CompleteViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompleteViewController.swift; sourceTree = "<group>"; };
985946A127FA7E5C00F7610D /* assignment.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = assignment.app; sourceTree = BUILT_PRODUCTS_DIR; };
985946A427FA7E5C00F7610D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
985946A627FA7E5C00F7610D /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -24,6 +36,8 @@
985946AD27FA7E5C00F7610D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
985946B027FA7E5C00F7610D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
985946B227FA7E5C00F7610D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
98967EF827FD5EB60031138C /* JoinNameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinNameViewController.swift; sourceTree = "<group>"; };
98967EFA27FD5ECE0031138C /* JoinPasswordViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinPasswordViewController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -37,6 +51,57 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
980D11CA27FD55130009F772 /* Supports */ = {
isa = PBXGroup;
children = (
985946AF27FA7E5C00F7610D /* LaunchScreen.storyboard */,
985946AD27FA7E5C00F7610D /* Assets.xcassets */,
985946A427FA7E5C00F7610D /* AppDelegate.swift */,
985946A627FA7E5C00F7610D /* SceneDelegate.swift */,
);
path = Supports;
sourceTree = "<group>";
};
980D11CB27FD55380009F772 /* Scene */ = {
isa = PBXGroup;
children = (
980D11D127FD56700009F772 /* Login */,
980D11D627FD56890009F772 /* Join */,
980D11DB27FD57C90009F772 /* Complete */,
985946A827FA7E5C00F7610D /* ViewController.swift */,
985946AA27FA7E5C00F7610D /* Main.storyboard */,
);
path = Scene;
sourceTree = "<group>";
};
980D11D127FD56700009F772 /* Login */ = {
isa = PBXGroup;
children = (
980D11D227FD56770009F772 /* Login.storyboard */,
980D11D427FD567D0009F772 /* LoginViewController.swift */,
);
path = Login;
sourceTree = "<group>";
};
980D11D627FD56890009F772 /* Join */ = {
isa = PBXGroup;
children = (
980D11D727FD56910009F772 /* Join.storyboard */,
98967EF827FD5EB60031138C /* JoinNameViewController.swift */,
98967EFA27FD5ECE0031138C /* JoinPasswordViewController.swift */,
);
path = Join;
sourceTree = "<group>";
};
980D11DB27FD57C90009F772 /* Complete */ = {
isa = PBXGroup;
children = (
980D11DC27FD57D30009F772 /* Complete.storyboard */,
980D11DE27FD57DA0009F772 /* CompleteViewController.swift */,
);
path = Complete;
sourceTree = "<group>";
};
9859469827FA7E5C00F7610D = {
isa = PBXGroup;
children = (
Expand All @@ -56,12 +121,8 @@
985946A327FA7E5C00F7610D /* assignment */ = {
isa = PBXGroup;
children = (
985946A427FA7E5C00F7610D /* AppDelegate.swift */,
985946A627FA7E5C00F7610D /* SceneDelegate.swift */,
985946A827FA7E5C00F7610D /* ViewController.swift */,
985946AA27FA7E5C00F7610D /* Main.storyboard */,
985946AD27FA7E5C00F7610D /* Assets.xcassets */,
985946AF27FA7E5C00F7610D /* LaunchScreen.storyboard */,
980D11CA27FD55130009F772 /* Supports */,
980D11CB27FD55380009F772 /* Scene */,
985946B227FA7E5C00F7610D /* Info.plist */,
);
path = assignment;
Expand Down Expand Up @@ -125,9 +186,12 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
980D11D327FD56770009F772 /* Login.storyboard in Resources */,
980D11DD27FD57D30009F772 /* Complete.storyboard in Resources */,
985946B127FA7E5C00F7610D /* LaunchScreen.storyboard in Resources */,
985946AE27FA7E5C00F7610D /* Assets.xcassets in Resources */,
985946AC27FA7E5C00F7610D /* Main.storyboard in Resources */,
980D11D827FD56910009F772 /* Join.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -138,9 +202,13 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
980D11D527FD567D0009F772 /* LoginViewController.swift in Sources */,
98967EFB27FD5ECE0031138C /* JoinPasswordViewController.swift in Sources */,
985946A927FA7E5C00F7610D /* ViewController.swift in Sources */,
985946A527FA7E5C00F7610D /* AppDelegate.swift in Sources */,
985946A727FA7E5C00F7610D /* SceneDelegate.swift in Sources */,
980D11DF27FD57DA0009F772 /* CompleteViewController.swift in Sources */,
98967EF927FD5EB60031138C /* JoinNameViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion assignment/assignment/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
<key>UISceneStoryboardFile</key>
<string>Main</string>
<string>Login</string>
</dict>
</array>
</dict>
Expand Down
63 changes: 63 additions & 0 deletions assignment/assignment/Scene/Complete/Complete.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Complete View Controller-->
<scene sceneID="s0d-6b-0kx">
<objects>
<viewController storyboardIdentifier="CompleteViewController" id="Y6W-OH-hqX" customClass="CompleteViewController" customModule="assignment" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="OOO님 Instagram에 오신 것을 환영합니다" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ThS-tI-SpQ">
<rect key="frame" x="10" y="196" width="394" height="119"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="40"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="언제든지 연락처 정보와 사용자 이름을 변경할 수 있습니다." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eh7-SJ-abH">
<rect key="frame" x="13" y="323" width="388" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="S5C-Jf-pAF">
<rect key="frame" x="20" y="392" width="374" height="52"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.35794719829999999" green="0.56799568970000003" blue="0.84779094830000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="tintColor" systemColor="tintColor"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="filled" title="완료하기"/>
<connections>
<action selector="completeButtonDidTap:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="esx-nK-uGJ"/>
</connections>
</button>
</subviews>
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
<connections>
<outlet property="completeButton" destination="S5C-Jf-pAF" id="weF-AU-PUf"/>
<outlet property="welcomeLabel" destination="ThS-tI-SpQ" id="z48-q3-U1I"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-17.39130434782609" y="81.696428571428569"/>
</scene>
</scenes>
<resources>
<systemColor name="tintColor">
<color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>
48 changes: 48 additions & 0 deletions assignment/assignment/Scene/Complete/CompleteViewController.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
//
// CompleteViewController.swift
// assignment
//
// Created by 이경민 on 2022/04/06.
//

import UIKit

final class CompleteViewController: UIViewController {

// MARK: - Property

var userName: String = ""

// MARK: - IBOutlet

@IBOutlet weak var welcomeLabel: UILabel!
@IBOutlet weak var completeButton: UIButton!

// MARK: - LifeCycle

override func viewDidLoad() {
super.viewDidLoad()
setUI()
setUserName()
}

// MARK: - Function

private func setUI() {
setButtonUI()
}

private func setButtonUI() {
completeButton.layer.cornerRadius = 15
}

private func setUserName() {
welcomeLabel.text = "\(userName)님 Instagram에 오신 것을 환영합니다"
}

// MARK: - IBAction

@IBAction func completeButtonDidTap(_ sender: Any) {
self.dismiss(animated: true)
}
}
Loading

0 comments on commit 9cf34a5

Please sign in to comment.