-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into feat/#3-상세보기뷰
- Loading branch information
Showing
33 changed files
with
1,184 additions
and
40 deletions.
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
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file removed
BIN
-56.8 KB
...eproj/project.xcworkspace/xcuserdata/jeongkite.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
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
68 changes: 68 additions & 0 deletions
68
Oliveyoung-iOS/Oliveyoung-iOS/Source/Common/Extensions/UIColor+.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,68 @@ | ||
| // | ||
| // UIColor+.swift | ||
| // Oliveyoung-iOS | ||
| // | ||
| // Created by 양정연 on 2022/11/21. | ||
| // | ||
|
|
||
| import UIKit.UIColor | ||
|
|
||
| extension UIColor { | ||
|
|
||
| @nonobjc class var willaGrayGray500: UIColor { | ||
| return UIColor(white: 47.0 / 255.0, alpha: 1.0) | ||
| } | ||
|
|
||
| @nonobjc class var willaGrayGray550: UIColor { | ||
| return UIColor(white: 68.0 / 255.0, alpha: 1.0) | ||
| } | ||
|
|
||
| @nonobjc class var willaGrayGray400: UIColor { | ||
| return UIColor(white: 113.0 / 255.0, alpha: 1.0) | ||
| } | ||
|
|
||
| @nonobjc class var willaGrayGray350: UIColor { | ||
| return UIColor(white: 142.0 / 255.0, alpha: 1.0) | ||
| } | ||
|
|
||
| @nonobjc class var willaGrayGray300: UIColor { | ||
| return UIColor(white: 167.0 / 255.0, alpha: 1.0) | ||
| } | ||
|
|
||
| @nonobjc class var willaGrayGray250: UIColor { | ||
| return UIColor(white: 194.0 / 255.0, alpha: 1.0) | ||
| } | ||
|
|
||
| @nonobjc class var willaGrayGray200: UIColor { | ||
| return UIColor(white: 220.0 / 255.0, alpha: 1.0) | ||
| } | ||
|
|
||
| @nonobjc class var willaGrayGray150: UIColor { | ||
| return UIColor(white: 235.0 / 255.0, alpha: 1.0) | ||
| } | ||
|
|
||
| @nonobjc class var willaGrayGray100: UIColor { | ||
| return UIColor(white: 246.0 / 255.0, alpha: 1.0) | ||
| } | ||
|
|
||
| @nonobjc class var willaGrayGray000: UIColor { | ||
| return UIColor(white: 1.0, alpha: 1.0) | ||
| } | ||
|
|
||
| @nonobjc class var willaRedRed500: UIColor { | ||
| return UIColor(red: 239.0 / 255.0, green: 68.0 / 255.0, blue: 68.0 / 255.0, alpha: 1.0) | ||
| } | ||
|
|
||
| @nonobjc class var willaRedRed400: UIColor { | ||
| return UIColor(red: 248.0 / 255.0, green: 113.0 / 255.0, blue: 113.0 / 255.0, alpha: 1.0) | ||
| } | ||
|
|
||
| @nonobjc class var willaYellow: UIColor { | ||
| return UIColor(red: 1.0, green: 183.0 / 255.0, blue: 0.0, alpha: 1.0) | ||
| } | ||
|
|
||
| @nonobjc class var willa: UIColor { | ||
| return UIColor(red: 164.0 / 255.0, green: 210.0 / 255.0, blue: 50.0 / 255.0, alpha: 1.0) | ||
| } | ||
|
|
||
| } |
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
25 changes: 25 additions & 0 deletions
25
Oliveyoung-iOS/Oliveyoung-iOS/Source/Presentation/Common/BaseView.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,25 @@ | ||
| // | ||
| // BaseView.swift | ||
| // Oliveyoung-iOS | ||
| // | ||
| // Created by 양정연 on 2022/11/24. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class BaseView: UIView { | ||
|
|
||
| override init(frame: CGRect) { | ||
| super.init(frame: frame) | ||
| setView() | ||
| setLayout() | ||
| } | ||
|
|
||
| @available(*, unavailable) | ||
| required init?(coder: NSCoder) { | ||
| super.init(coder: coder) | ||
| } | ||
|
|
||
| func setView() {} | ||
| func setLayout() {} | ||
| } |
30 changes: 30 additions & 0 deletions
30
Oliveyoung-iOS/Oliveyoung-iOS/Source/Presentation/Common/BaseViewController.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,30 @@ | ||
| // | ||
| // BaseViewController.swift | ||
| // Oliveyoung-iOS | ||
| // | ||
| // Created by 양정연 on 2022/11/24. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class BaseViewController: UIViewController { | ||
|
|
||
| override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
|
|
||
| style() | ||
| } | ||
|
|
||
| override func viewWillAppear(_ animated: Bool) { | ||
|
|
||
| setNavigationBar() | ||
| } | ||
|
|
||
| func style() { | ||
| view.backgroundColor = .white | ||
| } | ||
|
|
||
| func setNavigationBar() { | ||
| navigationController?.setNavigationBarHidden(true, animated: true) | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
...ng-iOS/Oliveyoung-iOS/Source/Presentation/Search/Cell/PopularWordCollectionViewCell.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,58 @@ | ||
| // | ||
| // PopularWordCollectionViewCell.swift | ||
| // Oliveyoung-iOS | ||
| // | ||
| // Created by 양정연 on 2022/11/24. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class PopularWordCollectionViewCell: UICollectionViewCell { | ||
| // MARK: - Component | ||
| private let searchWordLabel = UILabel().then { | ||
| $0.font = .bodyBody5 | ||
| $0.textColor = .willaGrayGray500 | ||
| $0.textAlignment = .center | ||
| } | ||
|
|
||
| // MARK: - Life Cycles | ||
| override init(frame: CGRect) { | ||
| super.init(frame: frame) | ||
|
|
||
| setUI() | ||
| setLayout() | ||
| } | ||
|
|
||
| required init?(coder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| } | ||
|
|
||
| override func preferredLayoutAttributesFitting(_ layoutAttributes: UICollectionViewLayoutAttributes) -> UICollectionViewLayoutAttributes { | ||
| super.preferredLayoutAttributesFitting(layoutAttributes) | ||
| layoutIfNeeded() | ||
| let size = contentView.systemLayoutSizeFitting(layoutAttributes.size) | ||
| var frame = layoutAttributes.frame | ||
| frame.size.width = ceil(size.width) | ||
| layoutAttributes.frame = frame | ||
| return layoutAttributes | ||
| } | ||
|
|
||
| // MARK: - Function | ||
| private func setUI() { | ||
| contentView.addSubview(searchWordLabel) | ||
| contentView.makeColorRounded(12, 1, .willa) | ||
| } | ||
|
|
||
| private func setLayout() { | ||
| contentView.addSubview(searchWordLabel) | ||
|
|
||
| searchWordLabel.snp.makeConstraints { | ||
| $0.centerX.centerY.equalToSuperview() | ||
| $0.height.equalTo(24) | ||
| } | ||
| } | ||
|
|
||
| func configureUI(word: Word) { | ||
| searchWordLabel.text = word.word | ||
| } | ||
| } |
Oops, something went wrong.