-
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
[#8] chipViewController 생성 #15
Open
jysuhr
wants to merge
9
commits into
main
Choose a base branch
from
feature/#8
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+474
−10
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
7fd0bc3
Chip
jysuhr 4cf3dd1
Chip
jysuhr f805f7b
Merge branch 'feature/#8' of https://github.com/yourssu/Handy-iOS int…
jysuhr a9740af
[#8] chipViewController 생성
jysuhr 64ca213
[#8] ViewDidLoad 삭제
jysuhr 71e9458
[#8] SnapKit으로 정리, icon추가
jysuhr 857fb6c
[#8] icon추가, 주석 정리
jysuhr 63c53a8
[#8] icon 색상 지정
jysuhr 0de1526
ChipViewController SnapKit 문법 수정
jysuhr 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
23 changes: 23 additions & 0 deletions
23
Handy/Handy-Storybook/Assets.xcassets/icClose.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" : "icClose.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "filename" : "[email protected]", | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "filename" : "[email protected]", | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
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
+563 Bytes
Handy/Handy-Storybook/Assets.xcassets/icClose.imageset/[email protected]
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
+645 Bytes
Handy/Handy-Storybook/Assets.xcassets/icClose.imageset/[email protected]
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
Handy/Handy-Storybook/Assets.xcassets/icInfoCircle.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" : "[email protected]", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "filename" : "icInfoCircle.png", | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "filename" : "[email protected]", | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+867 Bytes
Handy/Handy-Storybook/Assets.xcassets/icInfoCircle.imageset/icInfoCircle.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
+463 Bytes
Handy/Handy-Storybook/Assets.xcassets/icInfoCircle.imageset/[email protected]
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.23 KB
Handy/Handy-Storybook/Assets.xcassets/icInfoCircle.imageset/[email protected]
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| // | ||
| // ChipViewController.swift | ||
| // Handy-Storybook | ||
| // | ||
| // Created by 서준영 on 7/29/24. | ||
| // | ||
|
|
||
| import UIKit | ||
| import Handy | ||
| import SnapKit | ||
|
|
||
| class ChipViewController: BaseViewController { | ||
|
|
||
| //MARK: 프로퍼티 선언 | ||
| let unTappedLargeChip: HandyChip = { | ||
| let chip = HandyChip() | ||
| chip.chipState = HandyChip.ChipState(type: .enabled) | ||
| chip.size = HandyChip.ChipSize(type: .large) | ||
| chip.isSelected = false | ||
| chip.text = "Label" | ||
| chip.leftIcon = UIImage(named: "icInfoCircle") | ||
| chip.rightIcon = UIImage(named: "icClose") | ||
| chip.addTarget(self, action: #selector(firstChip), for: .touchUpInside) | ||
| chip.translatesAutoresizingMaskIntoConstraints = false | ||
| return chip | ||
| }() | ||
|
|
||
| let unTappedSmallChip: HandyChip = { | ||
| let chip = HandyChip() | ||
| chip.chipState = HandyChip.ChipState(type: .enabled) | ||
| chip.size = HandyChip.ChipSize(type: .small) | ||
| chip.isSelected = false | ||
| chip.text = "Label" | ||
| chip.leftIcon = UIImage(named: "icInfoCircle") | ||
| chip.rightIcon = UIImage(named: "icClose") | ||
| chip.addTarget(self, action: #selector(secondChip), for: .touchUpInside) | ||
| chip.translatesAutoresizingMaskIntoConstraints = false | ||
| return chip | ||
| }() | ||
|
|
||
| let tappedLargeChip: HandyChip = { | ||
| let chip = HandyChip() | ||
| chip.chipState = HandyChip.ChipState(type: .enabled) | ||
| chip.size = HandyChip.ChipSize(type: .large) | ||
| chip.isSelected = true | ||
| chip.text = "Label" | ||
| chip.leftIcon = UIImage(named: "icInfoCircle") | ||
| chip.rightIcon = UIImage(named: "icClose") | ||
| chip.addTarget(self, action: #selector(thirdChip), for: .touchUpInside) | ||
| chip.translatesAutoresizingMaskIntoConstraints = false | ||
| return chip | ||
| }() | ||
|
|
||
| let tappedSmallChip: HandyChip = { | ||
| let chip = HandyChip() | ||
| chip.chipState = HandyChip.ChipState(type: .enabled) | ||
| chip.size = HandyChip.ChipSize(type: .small) | ||
| chip.isSelected = true | ||
| chip.text = "Label" | ||
| chip.leftIcon = UIImage(named: "icInfoCircle") | ||
| chip.rightIcon = UIImage(named: "icClose") | ||
| chip.addTarget(self, action: #selector(fourthChip), for: .touchUpInside) | ||
| chip.translatesAutoresizingMaskIntoConstraints = false | ||
| return chip | ||
| }() | ||
|
|
||
| let disabledLargeChip: HandyChip = { | ||
| let chip = HandyChip() | ||
| chip.chipState = HandyChip.ChipState(type: .disabled) | ||
| chip.size = HandyChip.ChipSize(type: .large) | ||
| chip.text = "Label" | ||
| chip.leftIcon = UIImage(named: "icInfoCircle") | ||
| chip.rightIcon = UIImage(named: "icClose") | ||
| chip.translatesAutoresizingMaskIntoConstraints = false | ||
| return chip | ||
| }() | ||
|
|
||
| let disabledSmallChip: HandyChip = { | ||
| let chip = HandyChip() | ||
| chip.chipState = HandyChip.ChipState(type: .disabled) | ||
| chip.size = HandyChip.ChipSize(type: .small) | ||
| chip.text = "Label" | ||
| chip.leftIcon = UIImage(named: "icInfoCircle") | ||
| chip.rightIcon = UIImage(named: "icClose") | ||
| chip.translatesAutoresizingMaskIntoConstraints = false | ||
| return chip | ||
| }() | ||
|
|
||
|
|
||
| //MARK: Chip 뷰에 추가 | ||
| override func setViewHierarchies() { | ||
| view.addSubview(unTappedLargeChip) | ||
| view.addSubview(unTappedSmallChip) | ||
| view.addSubview(tappedLargeChip) | ||
| view.addSubview(tappedSmallChip) | ||
| view.addSubview(disabledLargeChip) | ||
| view.addSubview(disabledSmallChip) | ||
| } | ||
|
|
||
|
|
||
| //MARK: 레이아웃 배치 | ||
| override func setViewLayouts() { | ||
| unTappedLargeChip.snp.makeConstraints { | ||
| $0.centerX.equalToSuperview() | ||
| $0.top.equalTo(view.safeAreaLayoutGuide.snp.top).offset(100) | ||
| } | ||
| unTappedSmallChip.snp.makeConstraints { | ||
| $0.centerX.equalToSuperview() | ||
| $0.top.equalTo(unTappedLargeChip.snp.bottom).offset(24) | ||
| } | ||
| tappedLargeChip.snp.makeConstraints { | ||
| $0.centerX.equalToSuperview() | ||
| $0.top.equalTo(unTappedSmallChip.snp.bottom).offset(51) | ||
| } | ||
| tappedSmallChip.snp.makeConstraints { | ||
| $0.centerX.equalToSuperview() | ||
| $0.top.equalTo(tappedLargeChip.snp.bottom).offset(24) | ||
| } | ||
| disabledLargeChip.snp.makeConstraints { | ||
| $0.centerX.equalToSuperview() | ||
| $0.top.equalTo(tappedSmallChip.snp.bottom).offset(51) | ||
| } | ||
| disabledSmallChip.snp.makeConstraints { | ||
| $0.centerX.equalToSuperview() | ||
| $0.top.equalTo(disabledLargeChip.snp.bottom).offset(24) | ||
| } | ||
| } | ||
|
|
||
|
|
||
| //MARK: Chip 작동 함수 | ||
| @objc private func firstChip(_ sender: HandyChip) { | ||
| sender.isSelected.toggle() | ||
| } | ||
| @objc private func secondChip(_ sender: HandyChip) { | ||
| sender.isSelected.toggle() | ||
| } | ||
| @objc private func thirdChip(_ sender: HandyChip) { | ||
| sender.isSelected.toggle() | ||
| } | ||
| @objc private func fourthChip(_ sender: HandyChip) { | ||
| sender.isSelected.toggle() | ||
| } | ||
| } | ||
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
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.
view.addSubviews(unTappedLargeChip, unTappedSmallChip, tappedLargeChip, tappedSmallChip, disabledLargeChip, disabledSmallChip) 이런식으로도 사용하실 수 있어요~