generated from 30th-THE-SOPT-iOS-Part/KimTaeHyeon
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
1주차 기본,도전,심화과제 PR #6
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c379c2b
[#2] 1주차 기본과제 구현 완료
meenyweeny 577604b
[#2] 1주차 기본과제 TextField option 수정
meenyweeny cf15c9c
Merge branch 'main' into feature/#2
meenyweeny bbe4221
[#2] 1주차 도전과제1 - clear button
meenyweeny 90cad61
[#2] 1주차 도전과제2 - Button 활성화 logic
meenyweeny cc98109
[#2] 1주차 화면전환시 TextField option 초기화
meenyweeny c0f7d57
[#2] 1주차 심화과제 - 비밀번호 보이기/안보이기
meenyweeny 51749bf
[#2] (+ 버튼 초기값 변경)
meenyweeny File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
48
assignment/assignment/Scene/Complete/CompleteViewController.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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) | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MARK 주석은 따로 적는건가요?
한 번도 안 해봤는데 코드 보기에 좋네요!! 저도 해야겠어요~~~~~!!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MARK 주석 썼을때 효과 .. 별 거 아니지만 오늘 퇴근하구.. 노션에 꼭 적어 올려드릴게요~!