-
Notifications
You must be signed in to change notification settings - Fork 5
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
[FEAT] #111 - [FEAT] 온보딩 레이아웃 및 화면전환 구현 #115
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
ac5961b
[FEAT] #111 - [FEAT] 온보딩 레이아웃 및 화면전환 구현
hyun99999 fc51e5c
[FEAT] #111 - [FEAT] 온보딩 레이아웃 및 화면전환 구현
hyun99999 27c1652
[FEAT] #111 - [FEAT] 온보딩 레이아웃 및 화면전환 구현
hyun99999 52159f9
Merge branch 'develop' of https://github.com/TeamNADA/NADA-iOS-ForRel…
hyun99999 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
23 changes: 23 additions & 0 deletions
23
NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/buttonStartImg.imageset/Contents.json
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,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "buttonStartImg.png", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"filename" : "buttonStartImg@2x.png", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"filename" : "buttonStartImg@3x.png", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} |
Binary file added
BIN
+782 Bytes
...ease/Resouces/Assets/Assets.xcassets/buttonStartImg.imageset/buttonStartImg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.4 KB
...e/Resouces/Assets/Assets.xcassets/buttonStartImg.imageset/buttonStartImg@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.93 KB
...e/Resouces/Assets/Assets.xcassets/buttonStartImg.imageset/buttonStartImg@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/onboarding01.imageset/Contents.json
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,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"scale" : "1x", | ||
"idiom" : "universal", | ||
"filename" : "onboarding01.png" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"filename" : "onboarding01@2x.png", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"filename" : "onboarding01@3x.png", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} |
Binary file added
BIN
+5.8 KB
...rRelease/Resouces/Assets/Assets.xcassets/onboarding01.imageset/onboarding01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+11.6 KB
...lease/Resouces/Assets/Assets.xcassets/onboarding01.imageset/onboarding01@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+17.2 KB
...lease/Resouces/Assets/Assets.xcassets/onboarding01.imageset/onboarding01@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/onboarding02.imageset/Contents.json
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,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"idiom" : "universal", | ||
"filename" : "onboarding02.png", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "onboarding02@2x.png", | ||
"scale" : "2x", | ||
"idiom" : "universal" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "3x", | ||
"filename" : "onboarding02@3x.png" | ||
} | ||
], | ||
"info" : { | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} |
Binary file added
BIN
+4.01 KB
...rRelease/Resouces/Assets/Assets.xcassets/onboarding02.imageset/onboarding02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+7.59 KB
...lease/Resouces/Assets/Assets.xcassets/onboarding02.imageset/onboarding02@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+11.6 KB
...lease/Resouces/Assets/Assets.xcassets/onboarding02.imageset/onboarding02@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/onboarding03.imageset/Contents.json
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,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "onboarding03.png", | ||
"scale" : "1x", | ||
"idiom" : "universal" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"filename" : "onboarding03@2x.png", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"filename" : "onboarding03@3x.png", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} |
Binary file added
BIN
+5.99 KB
...rRelease/Resouces/Assets/Assets.xcassets/onboarding03.imageset/onboarding03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+12.2 KB
...lease/Resouces/Assets/Assets.xcassets/onboarding03.imageset/onboarding03@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+18.1 KB
...lease/Resouces/Assets/Assets.xcassets/onboarding03.imageset/onboarding03@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/onboarding04.imageset/Contents.json
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,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "onboarding04.png", | ||
"scale" : "1x", | ||
"idiom" : "universal" | ||
}, | ||
{ | ||
"filename" : "onboarding04@2x.png", | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"filename" : "onboarding04@3x.png", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} |
Binary file added
BIN
+2.7 KB
...rRelease/Resouces/Assets/Assets.xcassets/onboarding04.imageset/onboarding04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+5.1 KB
...lease/Resouces/Assets/Assets.xcassets/onboarding04.imageset/onboarding04@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+7.19 KB
...lease/Resouces/Assets/Assets.xcassets/onboarding04.imageset/onboarding04@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
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
65 changes: 65 additions & 0 deletions
65
NADA-iOS-forRelease/Resouces/Storyboards/Onboarding/Onboarding.storyboard
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,65 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> | ||
<device id="retina6_1" orientation="portrait" appearance="light"/> | ||
<dependencies> | ||
<deployment identifier="iOS"/> | ||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/> | ||
<capability name="Safe area layout guides" minToolsVersion="9.0"/> | ||
<capability name="System colors in document resources" minToolsVersion="11.0"/> | ||
<capability name="collection view cell content view" minToolsVersion="11.0"/> | ||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | ||
</dependencies> | ||
<scenes> | ||
<!--Onboarding View Controller--> | ||
<scene sceneID="s0d-6b-0kx"> | ||
<objects> | ||
<viewController storyboardIdentifier="OnboardingViewController" id="Y6W-OH-hqX" customClass="OnboardingViewController" customModule="NADA_iOS_forRelease" 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> | ||
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="KQU-Sa-nlF"> | ||
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/> | ||
<color key="backgroundColor" systemColor="systemBackgroundColor"/> | ||
<collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="JMA-de-8hr"> | ||
<size key="itemSize" width="128" height="128"/> | ||
<size key="headerReferenceSize" width="0.0" height="0.0"/> | ||
<size key="footerReferenceSize" width="0.0" height="0.0"/> | ||
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> | ||
</collectionViewFlowLayout> | ||
<cells> | ||
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="e4W-8i-s98"> | ||
<rect key="frame" x="0.0" y="0.0" width="128" height="128"/> | ||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | ||
<collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="NP5-bc-Icz"> | ||
<rect key="frame" x="0.0" y="0.0" width="128" height="128"/> | ||
<autoresizingMask key="autoresizingMask"/> | ||
</collectionViewCellContentView> | ||
</collectionViewCell> | ||
</cells> | ||
</collectionView> | ||
</subviews> | ||
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/> | ||
<color key="backgroundColor" systemColor="systemBackgroundColor"/> | ||
<constraints> | ||
<constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="KQU-Sa-nlF" secondAttribute="trailing" id="Kca-cl-bJT"/> | ||
<constraint firstItem="KQU-Sa-nlF" firstAttribute="top" secondItem="5EZ-qb-Rvc" secondAttribute="top" id="Rnl-RF-juO"/> | ||
<constraint firstAttribute="bottom" secondItem="KQU-Sa-nlF" secondAttribute="bottom" id="U5G-AQ-qQW"/> | ||
<constraint firstItem="KQU-Sa-nlF" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" id="lig-BQ-Gl3"/> | ||
</constraints> | ||
</view> | ||
<connections> | ||
<outlet property="onboardingCollectionView" destination="KQU-Sa-nlF" id="92L-qk-Trf"/> | ||
</connections> | ||
</viewController> | ||
<placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/> | ||
</objects> | ||
<point key="canvasLocation" x="1" y="53"/> | ||
</scene> | ||
</scenes> | ||
<resources> | ||
<systemColor name="systemBackgroundColor"> | ||
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> | ||
</systemColor> | ||
</resources> | ||
</document> |
61 changes: 61 additions & 0 deletions
61
NADA-iOS-forRelease/Sources/Cells/Onboarding/OnboardingCollectionViewCell.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,61 @@ | ||
// | ||
// OnboardingCollectionViewCell.swift | ||
// NADA-iOS-forRelease | ||
// | ||
// Created by kimhyungyu on 2021/12/05. | ||
// | ||
|
||
import UIKit | ||
|
||
class OnboardingCollectionViewCell: UICollectionViewCell { | ||
|
||
// MARK: - Properties | ||
|
||
var presentToLoginViewController: (() -> Void)? | ||
|
||
// MARK: - @IBOutlet Properties | ||
|
||
@IBOutlet weak var imageView: UIImageView! | ||
@IBOutlet weak var startButton: UIButton! | ||
|
||
// MARK: - View Life Cycle | ||
|
||
override func awakeFromNib() { | ||
super.awakeFromNib() | ||
|
||
setUI() | ||
} | ||
|
||
static func nib() -> UINib { | ||
return UINib(nibName: Const.Xib.onboardingCollectionViewCell, bundle: nil) | ||
} | ||
|
||
// MARK: - @IBAction Properties | ||
|
||
@IBAction func touchStartButton(_ sender: Any) { | ||
presentToLoginViewController?() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 그러게요 요런 모양 처음 만나는 친구네요??? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 셀안의 버튼을 누르면 뷰컨트롤러에서 화면전환하는 목적으로 구성했는데요! 셀에다가 클로저 옵셔널 변수를 만들고 셀을 뷰컨트롤러에서 만들어줄 때 delegate 에서 셀의 클로저 옵셔널 변수에 화면전환 코드를 넣는 로직입니당! |
||
} | ||
} | ||
|
||
// MARK: - Methods | ||
|
||
extension OnboardingCollectionViewCell { | ||
private func setUI() { | ||
layer.masksToBounds = false | ||
layer.shadowColor = UIColor.black.cgColor | ||
layer.shadowOpacity = 0.1 | ||
layer.shadowOffset = CGSize(width: 0, height: 0) | ||
layer.shadowRadius = 10 | ||
|
||
contentView.layer.cornerRadius = 20 | ||
contentView.layer.masksToBounds = false | ||
|
||
imageView.contentMode = .scaleAspectFill | ||
} | ||
func initCell(image: String, isLast: Bool) { | ||
if let image = UIImage(named: image) { | ||
imageView.image = image | ||
} | ||
startButton.isHidden = !isLast | ||
} | ||
} |
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.
우와
(() -> Void)?
이건 무슨 타입인가요?!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.
클로저입니다! () -> () 이렇게로도 표현이 가능하지만 style share 코드 컨밴션을 따라서 위와 같이 표기했어요!!
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.