From fa27a0cac83fb2ae3167cbf0db50d008273c63ba Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Sat, 28 Sep 2024 03:36:37 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[Chore]=20#181=20-=20UIColor=20Extension?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Terning-iOS.xcodeproj/project.pbxproj | 8 ++++-- .../Colors/grey_shadow.colorset/Contents.json | 18 ------------- .../tabBar_shadow.colorset/Contents.json | 20 ++++++++++++++ .../terning_sub3.colorset/Contents.json | 18 ------------- .../Resource/Extension/UIKit+/UIColor+.swift | 26 +++++++++++++++++++ .../Calendar/Cell/JobListingCell.swift | 18 ------------- 6 files changed, 52 insertions(+), 56 deletions(-) create mode 100644 Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Colors/tabBar_shadow.colorset/Contents.json create mode 100644 Terning-iOS/Terning-iOS/Resource/Extension/UIKit+/UIColor+.swift diff --git a/Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj b/Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj index 7b5332df..9c6c8909 100644 --- a/Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj +++ b/Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj @@ -73,6 +73,7 @@ 2DF257252C8F691300B85843 /* ProfileFixViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DF257242C8F691300B85843 /* ProfileFixViewModel.swift */; }; 2DF257272C8F692B00B85843 /* ProfileViewModelType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DF257262C8F692B00B85843 /* ProfileViewModelType.swift */; }; 2DF257292C8F6A7D00B85843 /* ProfileImageUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DF257282C8F6A7D00B85843 /* ProfileImageUtils.swift */; }; + 7119B8112CA72FBD00E94E62 /* UIColor+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7119B8102CA72FBD00E94E62 /* UIColor+.swift */; }; 7121A1332C396FB40056DB8B /* CustomButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7121A1322C396FB40056DB8B /* CustomButton.swift */; }; 7121A1352C39CCF60056DB8B /* UIButton+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7121A1342C39CCF60056DB8B /* UIButton+.swift */; }; 7121A13A2C3A6CEB0056DB8B /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = 7121A1392C3A6CEB0056DB8B /* RxCocoa */; }; @@ -247,6 +248,7 @@ 2DF257242C8F691300B85843 /* ProfileFixViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileFixViewModel.swift; sourceTree = ""; }; 2DF257262C8F692B00B85843 /* ProfileViewModelType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewModelType.swift; sourceTree = ""; }; 2DF257282C8F6A7D00B85843 /* ProfileImageUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileImageUtils.swift; sourceTree = ""; }; + 7119B8102CA72FBD00E94E62 /* UIColor+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+.swift"; sourceTree = ""; }; 7121A1322C396FB40056DB8B /* CustomButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomButton.swift; sourceTree = ""; }; 7121A1342C39CCF60056DB8B /* UIButton+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+.swift"; sourceTree = ""; }; 7121A13D2C3A98E10056DB8B /* LabelFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelFactory.swift; sourceTree = ""; }; @@ -835,6 +837,7 @@ 71461ED32C3811E8002A6999 /* ViewController+.swift */, 71461ED52C38150C002A6999 /* UILabel+.swift */, 7121A1342C39CCF60056DB8B /* UIButton+.swift */, + 7119B8102CA72FBD00E94E62 /* UIColor+.swift */, ); path = "UIKit+"; sourceTree = ""; @@ -1511,6 +1514,7 @@ 71780C3A2C4577FF0073B731 /* CalendarTargetType.swift in Sources */, 71780C462C4589400073B731 /* NewTokenModel.swift in Sources */, B871D7372C3EF87B008D78C2 /* NonJobCardCell.swift in Sources */, + 7119B8112CA72FBD00E94E62 /* UIColor+.swift in Sources */, 71780C482C458FF80073B731 /* HomeTargetType.swift in Sources */, 71780C3E2C45849A0073B731 /* UserDefaultWrapper.swift in Sources */, 7121A14B2C3B09800056DB8B /* setImage.swift in Sources */, @@ -1720,7 +1724,7 @@ CODE_SIGN_ENTITLEMENTS = "Terning-iOS/Terning-iOS.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2024.0924.0212; + CURRENT_PROJECT_VERSION = 2024.0928.0029; DEVELOPMENT_TEAM = 8Q4H7X3Q58; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; @@ -1760,7 +1764,7 @@ CODE_SIGN_ENTITLEMENTS = "Terning-iOS/Terning-iOS.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2024.0924.0212; + CURRENT_PROJECT_VERSION = 2024.0928.0029; DEVELOPMENT_TEAM = 8Q4H7X3Q58; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; diff --git a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Colors/grey_shadow.colorset/Contents.json b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Colors/grey_shadow.colorset/Contents.json index 3a33f158..e7d0cebf 100644 --- a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Colors/grey_shadow.colorset/Contents.json +++ b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Colors/grey_shadow.colorset/Contents.json @@ -11,24 +11,6 @@ } }, "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFE" - } - }, - "idiom" : "universal" } ], "info" : { diff --git a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Colors/tabBar_shadow.colorset/Contents.json b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Colors/tabBar_shadow.colorset/Contents.json new file mode 100644 index 00000000..a7320b81 --- /dev/null +++ b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Colors/tabBar_shadow.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xF3", + "green" : "0xF3", + "red" : "0xF3" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Colors/terning_sub3.colorset/Contents.json b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Colors/terning_sub3.colorset/Contents.json index e0eec317..c884a095 100644 --- a/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Colors/terning_sub3.colorset/Contents.json +++ b/Terning-iOS/Terning-iOS/Resource/Assets.xcassets/Colors/terning_sub3.colorset/Contents.json @@ -11,24 +11,6 @@ } }, "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xE9", - "green" : "0xF1", - "red" : "0xE2" - } - }, - "idiom" : "universal" } ], "info" : { diff --git a/Terning-iOS/Terning-iOS/Resource/Extension/UIKit+/UIColor+.swift b/Terning-iOS/Terning-iOS/Resource/Extension/UIKit+/UIColor+.swift new file mode 100644 index 00000000..28f08c70 --- /dev/null +++ b/Terning-iOS/Terning-iOS/Resource/Extension/UIKit+/UIColor+.swift @@ -0,0 +1,26 @@ +// +// UIColor+.swift +// Terning-iOS +// +// Created by 이명진 on 9/28/24. +// + +import UIKit + +extension UIColor { + convenience init(hex: String, alpha: CGFloat = 1.0) { + var hexFormatted: String = hex.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).uppercased() + + if hexFormatted.hasPrefix("#") { + hexFormatted = String(hexFormatted.dropFirst()) + } + + assert(hexFormatted.count == 6, "Invalid hex code used.") + var rgbValue: UInt64 = 0 + Scanner(string: hexFormatted).scanHexInt64(&rgbValue) + + self.init(red: CGFloat((rgbValue & 0xFF0000) >> 16) / 255.0, + green: CGFloat((rgbValue & 0x00FF00) >> 8) / 255.0, + blue: CGFloat(rgbValue & 0x0000FF) / 255.0, alpha: alpha) + } +} diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/Cell/JobListingCell.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/Cell/JobListingCell.swift index b08f302e..059ea95a 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/Cell/JobListingCell.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/Cell/JobListingCell.swift @@ -199,21 +199,3 @@ extension JobListingCell { delegate?.scrapButtonDidTapInCalendar(in: collectionView, isScrap: sender.isSelected, indexPath: indexPath) } } - -extension UIColor { - convenience init(hex: String, alpha: CGFloat = 1.0) { - var hexFormatted: String = hex.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).uppercased() - - if hexFormatted.hasPrefix("#") { - hexFormatted = String(hexFormatted.dropFirst()) - } - - assert(hexFormatted.count == 6, "Invalid hex code used.") - var rgbValue: UInt64 = 0 - Scanner(string: hexFormatted).scanHexInt64(&rgbValue) - - self.init(red: CGFloat((rgbValue & 0xFF0000) >> 16) / 255.0, - green: CGFloat((rgbValue & 0x00FF00) >> 8) / 255.0, - blue: CGFloat(rgbValue & 0x0000FF) / 255.0, alpha: alpha) - } -} From 3469e0af6659d8a84df7467dcda10b3e49ab1a39 Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Sat, 28 Sep 2024 03:37:18 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[Design]=20#181=20-=20=EA=B7=B8=EB=A6=BC?= =?UTF-8?q?=EC=9E=90=20=ED=94=BC=EA=B7=B8=EB=A7=88=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Terning-iOS/Resource/Extension/UIKit+/CALayer+.swift | 4 ++-- .../Resource/UIComponents/CustomNavigationBar.swift | 2 +- .../ViewController/TNCalendarViewController.swift | 6 +++--- .../Presentation/Home/Cell/CheckDeadlineCell.swift | 2 +- .../Presentation/Home/Cell/IsScrapInfoViewCell.swift | 2 +- .../Source/Presentation/Home/Cell/JobCardCell.swift | 2 +- .../Source/Presentation/Home/Cell/NonScrapInfoCell.swift | 2 +- .../Search/Cell/RecommendCollectionViewCell.swift | 9 +-------- .../Source/Presentation/TabBar/TNTabBarController.swift | 2 +- 9 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Terning-iOS/Terning-iOS/Resource/Extension/UIKit+/CALayer+.swift b/Terning-iOS/Terning-iOS/Resource/Extension/UIKit+/CALayer+.swift index c15c60b6..557a7b90 100644 --- a/Terning-iOS/Terning-iOS/Resource/Extension/UIKit+/CALayer+.swift +++ b/Terning-iOS/Terning-iOS/Resource/Extension/UIKit+/CALayer+.swift @@ -22,14 +22,14 @@ public extension CALayer { alpha: Float = 0.05, // 피그마 디자인 시스템에 있는 기본 alpha 값 입니다. x: CGFloat = 0, y: CGFloat = 2, - blur: CGFloat = 5, // 흐림 정도 + blur: CGFloat = 4, // 흐림 정도 spread: CGFloat = 0) { // 그림자의 범위 masksToBounds = false shadowColor = color.cgColor shadowOpacity = alpha shadowOffset = CGSize(width: x, height: y) - shadowRadius = blur + shadowRadius = blur / 2 if spread == 0 { shadowPath = nil } else { diff --git a/Terning-iOS/Terning-iOS/Resource/UIComponents/CustomNavigationBar.swift b/Terning-iOS/Terning-iOS/Resource/UIComponents/CustomNavigationBar.swift index 78b1a0ec..83b6f0f2 100644 --- a/Terning-iOS/Terning-iOS/Resource/UIComponents/CustomNavigationBar.swift +++ b/Terning-iOS/Terning-iOS/Resource/UIComponents/CustomNavigationBar.swift @@ -100,7 +100,7 @@ extension CustomNavigationBar { } if isShadow { - self.layer.applyShadow(color: .terningBlack, alpha: 0.15, y: 3, blur: 4, spread: 0) + self.layer.applyShadow(color: .terningBlack, alpha: 0.15, y: 3) } } diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/ViewController/TNCalendarViewController.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/ViewController/TNCalendarViewController.swift index 447a194b..42fffc09 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/ViewController/TNCalendarViewController.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/ViewController/TNCalendarViewController.swift @@ -340,7 +340,7 @@ extension TNCalendarViewController: FSCalendarDelegate { if isWeekView { rootView.calenderBottomCollectionView.backgroundColor = .back rootView.roundCalendarViewCorners(radius: 20) // 라운드 처리 해주기 - rootView.calendarViewContainer.layer.applyShadow(alpha: 0.1, y: 4, blur: 1) + rootView.calendarViewContainer.layer.applyShadow(color: .black, alpha: 0.1, y: 4, blur: 4) rootView.calendarView.snp.updateConstraints { make in make.height.equalTo(90.adjustedH) // 주간 뷰 높이 설정 @@ -573,7 +573,7 @@ extension TNCalendarViewController: UICollectionViewDataSource { cell.bind(model: self.viewModel.calendarDaily[indexPath.row], indexPath: indexPath, in: collectionView) cell.delegate = self - cell.layer.applyShadow(color: .greyShadow, alpha: 1, y: 0, blur: 4) + cell.layer.applyShadow(color: .greyShadow, alpha: 1, y: 0) return cell } else { guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: JobListingCell.className, for: indexPath) as? JobListingCell else { @@ -585,7 +585,7 @@ extension TNCalendarViewController: UICollectionViewDataSource { let scrapItem = scrapSection[indexPath.row] cell.bind(model: scrapItem, indexPath: indexPath, in: collectionView) - cell.layer.applyShadow(color: .greyShadow, alpha: 1, y: 0, blur: 4) + cell.layer.applyShadow(color: .greyShadow, alpha: 1, y: 0) cell.delegate = self return cell } diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/CheckDeadlineCell.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/CheckDeadlineCell.swift index 842f1ba3..b26e2c75 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/CheckDeadlineCell.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/CheckDeadlineCell.swift @@ -25,7 +25,7 @@ final class CheckDeadlineCell: UICollectionViewCell { private let checkDeadlineCard = UIView().then { $0.layer.cornerRadius = 5 $0.backgroundColor = .white - $0.layer.applyShadow(color: .greyShadow, alpha: 1.0, x: 0, y: 0, blur: 4, spread: 0) + $0.layer.applyShadow(color: .greyShadow, alpha: 1, y: 0) } private let checkDeadlineCardLabel = LabelFactory.build( diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/IsScrapInfoViewCell.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/IsScrapInfoViewCell.swift index 083eab42..84751516 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/IsScrapInfoViewCell.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/IsScrapInfoViewCell.swift @@ -35,7 +35,7 @@ final class IsScrapInfoViewCell: UICollectionViewCell { private let scrapAndDeadlineCard = UIView().then { $0.layer.cornerRadius = 5 $0.backgroundColor = .white - $0.layer.applyShadow(color: .greyShadow, alpha: 1.0, x: 0, y: 0, blur: 3, spread: 0) + $0.layer.applyShadow(color: .greyShadow, alpha: 1.0, y: 0, blur: 4) $0.isUserInteractionEnabled = true } diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/JobCardCell.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/JobCardCell.swift index 9662d463..1ab6759b 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/JobCardCell.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/JobCardCell.swift @@ -29,7 +29,7 @@ final class JobCardCell: UICollectionViewCell { private let jobCard = UIView().then { $0.backgroundColor = UIColor.white $0.layer.cornerRadius = 10 - $0.layer.applyShadow(color: .greyShadow, alpha: 1, x: 0, y: 0, blur: 3, spread: 0) + $0.layer.applyShadow(color: .greyShadow, alpha: 1, y: 0) } private let jobCardCoverImage = UIImageView().then { diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/NonScrapInfoCell.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/NonScrapInfoCell.swift index b4ea391c..77f9d70e 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/NonScrapInfoCell.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/NonScrapInfoCell.swift @@ -17,7 +17,7 @@ final class NonScrapInfoCell: UICollectionViewCell { private let internshipScrapedStatus = UIView().then { $0.layer.cornerRadius = 5 $0.backgroundColor = .white - $0.layer.applyShadow(color: .greyShadow, alpha: 0.25, x: 0, y: 0, blur: 4, spread: 0) + $0.layer.applyShadow(color: .greyShadow, alpha: 1, y: 0) } private let internshipScrapedStatusLabel = LabelFactory.build( diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Search/Cell/RecommendCollectionViewCell.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Search/Cell/RecommendCollectionViewCell.swift index 1e27e72c..4f0876b1 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Search/Cell/RecommendCollectionViewCell.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Search/Cell/RecommendCollectionViewCell.swift @@ -61,14 +61,7 @@ extension RecommendCollectionViewCell { private func setUI() { self.backgroundColor = .white self.layer.cornerRadius = 5 - self.layer.applyShadow( - color: .black, - alpha: 0.15, - x: 0, - y: 0, - blur: 4, - spread: 0 - ) + self.layer.applyShadow(color: .greyShadow, alpha: 1, y: 0, blur: 4) } private func setHierarchy() { diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/TabBar/TNTabBarController.swift b/Terning-iOS/Terning-iOS/Source/Presentation/TabBar/TNTabBarController.swift index 71313dc3..44fecb88 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/TabBar/TNTabBarController.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/TabBar/TNTabBarController.swift @@ -28,7 +28,7 @@ extension TNTabBarController { $0.backgroundColor = .white $0.unselectedItemTintColor = .gray $0.tintColor = .terningMain - $0.layer.applyShadow(alpha: 0.05, y: -2, blur: 5) + $0.layer.applyShadow(color: .tabBarShadow, alpha: 1, y: -2, blur: 2) } } From 41c15f81a2b970062a69797b10b27770ac91f721 Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Sat, 28 Sep 2024 03:37:43 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[Fix]=20#181=20-=20=EC=BA=98=EB=A6=B0?= =?UTF-8?q?=EB=8D=94=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=B7=B0=20=EC=9D=BC?= =?UTF-8?q?=EB=95=8C=20=ED=97=A4=EB=8D=94=20=ED=81=AC=EA=B8=B0=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Calendar/Cell/Header/CalendarDateHeaderView.swift | 7 +++++++ .../Calendar/ViewController/TNCalendarViewController.swift | 1 + 2 files changed, 8 insertions(+) diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/Cell/Header/CalendarDateHeaderView.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/Cell/Header/CalendarDateHeaderView.swift index 8ba6f5e1..c75fa7aa 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/Cell/Header/CalendarDateHeaderView.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/Cell/Header/CalendarDateHeaderView.swift @@ -62,6 +62,13 @@ extension CalendarDateHeaderView { func bind(title: String) { self.titleLabel.text = convertToDayOfWeek(from: title) } + + func setListViewLayout() { + titleLabel.snp.updateConstraints { + $0.centerY.equalToSuperview() + $0.leading.equalToSuperview() + } + } } // MARK: - Methods diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/ViewController/TNCalendarViewController.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/ViewController/TNCalendarViewController.swift index 42fffc09..f9ba4a79 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/ViewController/TNCalendarViewController.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/ViewController/TNCalendarViewController.swift @@ -606,6 +606,7 @@ extension TNCalendarViewController: UICollectionViewDataSource { let sortedKeys = self.viewModel.scrapLists.keys.sorted() let scrapSection = sortedKeys[indexPath.section] let formattedDate = isoDateFormatter.string(from: scrapSection) + headerView.setListViewLayout() headerView.bind(title: formattedDate) return headerView From eb91a25b4a873ba12bc6216145b2e308141aa5dc Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Sat, 28 Sep 2024 03:38:39 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[Fix]=20#181=20-=20=EA=B3=B5=EA=B3=A0=20?= =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=9E=A9=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=A7=80=EC=9B=90=20=EB=A7=88=EA=B0=90=20=EC=9D=BC=EB=95=8C=20?= =?UTF-8?q?=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Source/Presentation/Calendar/Cell/JobListingCell.swift | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/Cell/JobListingCell.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/Cell/JobListingCell.swift index 059ea95a..63c64f97 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/Cell/JobListingCell.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Calendar/Cell/JobListingCell.swift @@ -171,6 +171,12 @@ extension JobListingCell { func bind(model: AnnouncementModel, indexPath: IndexPath? = nil, in collectionView: UICollectionView? = nil) { + if model.dDay == "지원마감" { + self.dDayLabel.textColor = .grey300 + } else { + self.dDayLabel.textColor = .terningMain + } + self.indexPath = indexPath self.collectionView = collectionView From 7065f4a7e4e6996e0d5912c04d5da6a2eec2d00e Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Sat, 28 Sep 2024 03:44:29 +0900 Subject: [PATCH 5/8] =?UTF-8?q?[Fix]=20#181=20-=20JobCardCell=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20=EA=B8=B0=EA=B8=B0=20=EB=8C=80?= =?UTF-8?q?=EC=9D=91=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Presentation/Home/Cell/JobCardCell.swift | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/JobCardCell.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/JobCardCell.swift index 1ab6759b..3a1c4a7a 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/JobCardCell.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Home/Cell/JobCardCell.swift @@ -107,40 +107,40 @@ extension JobCardCell { func setLayout() { jobCard.snp.makeConstraints { $0.top.equalToSuperview() - $0.horizontalEdges.equalToSuperview().inset(20) + $0.horizontalEdges.equalToSuperview().inset(20.adjusted) $0.height.equalTo(100.adjustedH) } jobCardCoverImage.snp.makeConstraints { - $0.top.equalTo(jobCard.snp.top).offset(12) - $0.leading.equalTo(jobCard.snp.leading).offset(12) + $0.top.equalTo(jobCard.snp.top).offset(12.adjustedH) + $0.leading.equalTo(jobCard.snp.leading).offset(12.adjusted) $0.width.height.equalTo(72.adjusted) } daysRemaining.snp.makeConstraints { - $0.top.equalTo(jobCard.snp.top).offset(12) - $0.leading.equalTo(jobCardCoverImage.snp.trailing).offset(8) + $0.top.equalTo(jobCard.snp.top).offset(12.adjustedH) + $0.leading.equalTo(jobCardCoverImage.snp.trailing).offset(8.adjusted) } jobLabel.snp.makeConstraints { - $0.top.equalTo(jobCard.snp.top).offset(30) - $0.leading.equalTo(jobCardCoverImage.snp.trailing).offset(8) - $0.trailing.equalTo(jobCard.snp.trailing).inset(50) + $0.top.equalTo(jobCard.snp.top).offset(30.adjustedH) + $0.leading.equalTo(jobCardCoverImage.snp.trailing).offset(8.adjusted) + $0.trailing.equalTo(jobCard.snp.trailing).inset(12.adjusted) } periodTitle.snp.makeConstraints { - $0.bottom.equalTo(jobCard.snp.bottom).inset(12) - $0.leading.equalTo(jobCardCoverImage.snp.trailing).offset(8) + $0.bottom.equalTo(jobCard.snp.bottom).inset(12.adjustedH) + $0.leading.equalTo(jobCardCoverImage.snp.trailing).offset(8.adjusted) } period.snp.makeConstraints { - $0.bottom.equalTo(jobCard.snp.bottom).inset(12) + $0.bottom.equalTo(jobCard.snp.bottom).inset(12.adjustedH) $0.leading.equalTo(periodTitle.snp.trailing).offset(4) } scrapButton.snp.makeConstraints { - $0.top.equalTo(jobCard.snp.top).offset(62) - $0.trailing.equalTo(jobCard.snp.trailing).inset(12) + $0.top.equalTo(jobCard.snp.top).offset(62.adjustedH) + $0.trailing.equalTo(jobCard.snp.trailing).inset(12.adjusted) } } From f6751263545c5edebf4187f5d49c7c0aeaf66db1 Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Sat, 28 Sep 2024 03:47:01 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[Del]=20#181=20-=20ViewController+=20?= =?UTF-8?q?=EC=97=90=20=ED=95=84=EC=9A=94=20=EC=97=86=EB=8A=94=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extension/UIKit+/ViewController+.swift | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/Terning-iOS/Terning-iOS/Resource/Extension/UIKit+/ViewController+.swift b/Terning-iOS/Terning-iOS/Resource/Extension/UIKit+/ViewController+.swift index f0d63b50..8dcf020e 100644 --- a/Terning-iOS/Terning-iOS/Resource/Extension/UIKit+/ViewController+.swift +++ b/Terning-iOS/Terning-iOS/Resource/Extension/UIKit+/ViewController+.swift @@ -83,26 +83,6 @@ extension UIViewController { @objc private func dismissKeyboard() { view.endEditing(true) } - - func scrapAnnouncement(internshipAnnouncementId: Int, color: String) { - Providers.scrapsProvider.request(.addScrap(internshipAnnouncementId: internshipAnnouncementId, color: color)) { [weak self] result in - LoadingIndicator.hideLoading() - guard let self = self else { return } - switch result { - case .success(let response): - let status = response.statusCode - if 200..<300 ~= status { - print("스크랩 성공") - } else { - print("400 error") - self.showToast(message: "네트워크 오류") - } - case .failure(let error): - print(error.localizedDescription) - self.showToast(message: "네트워크 오류") - } - } - } } extension UIViewController { From c02148c93f788440ce58bcc811595ab7383f1405 Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Thu, 3 Oct 2024 02:57:48 +0900 Subject: [PATCH 7/8] =?UTF-8?q?[Fix]=20#181=20-=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=95=84=20=EC=9D=B4=EB=A6=84=EC=9D=B4=20=EC=95=84=EB=8B=8C=20?= =?UTF-8?q?=EB=8B=89=EB=84=A4=EC=9E=84=EC=9C=BC=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - HIG Design GuideLine 준수 --- .../Terning-iOS/Resource/Utils/ValidationMessage.swift | 8 ++++---- .../Source/Presentation/Profile/View/ProfileView.swift | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Terning-iOS/Terning-iOS/Resource/Utils/ValidationMessage.swift b/Terning-iOS/Terning-iOS/Resource/Utils/ValidationMessage.swift index abf5d400..18a29923 100644 --- a/Terning-iOS/Terning-iOS/Resource/Utils/ValidationMessage.swift +++ b/Terning-iOS/Terning-iOS/Resource/Utils/ValidationMessage.swift @@ -8,10 +8,10 @@ import UIKit enum ValidationMessage: String { - case valid = "사용 가능한 이름이에요" - case tooLong = "이름은 12자리 이내로 설정해 주세요" - case containsSpecialCharacters = "이름에 특수문자는 입력할 수 없어요" - case containsSymbols = "이름에 기호는 입력할 수 없어요" + case valid = "사용 가능한 닉네임이에요" + case tooLong = "닉네임은 12자리 이내로 설정해 주세요" + case containsSpecialCharacters = "닉네임에 특수문자는 입력할 수 없어요" + case containsSymbols = "닉네임에 기호는 입력할 수 없어요" case defaultMessage = "12자리 이내, 문자/숫자 가능, 특수문자/기호 입력불가" case nullMessage = "" diff --git a/Terning-iOS/Terning-iOS/Source/Presentation/Profile/View/ProfileView.swift b/Terning-iOS/Terning-iOS/Source/Presentation/Profile/View/ProfileView.swift index d4fa933c..a5d720cc 100644 --- a/Terning-iOS/Terning-iOS/Source/Presentation/Profile/View/ProfileView.swift +++ b/Terning-iOS/Terning-iOS/Source/Presentation/Profile/View/ProfileView.swift @@ -21,7 +21,7 @@ final class ProfileView: UIView { let navigationBar = CustomNavigationBar(type: .centerTitleWithLeftButton) private let welcomeLabel = LabelFactory.build( - text: "반가워요!\n이름을 알려주세요", + text: "반가워요!\n닉네임을 알려주세요", font: .heading2, textAlignment: .left ).then { @@ -53,7 +53,7 @@ final class ProfileView: UIView { } private let nameLabel = LabelFactory.build( - text: "이름", + text: "닉네임", font: .body2, textColor: .grey500, lineSpacing: 1.2, @@ -65,7 +65,7 @@ final class ProfileView: UIView { $0.textColor = .terningBlack $0.font = .detail0 $0.attributedPlaceholder = NSAttributedString( - string: "이름을 입력해주세요", + string: "닉네임을 입력해주세요", attributes: [ .foregroundColor: UIColor.grey300, .font: UIFont.detail1 From ab15a3af9e7df41394160f8cb8b0b6bd09c074a7 Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Thu, 3 Oct 2024 14:02:59 +0900 Subject: [PATCH 8/8] [Setting] - 1.0.0 version release --- Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj b/Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj index 9c6c8909..9c0f99f0 100644 --- a/Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj +++ b/Terning-iOS/Terning-iOS.xcodeproj/project.pbxproj @@ -1724,7 +1724,7 @@ CODE_SIGN_ENTITLEMENTS = "Terning-iOS/Terning-iOS.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2024.0928.0029; + CURRENT_PROJECT_VERSION = 2024.1002.0940; DEVELOPMENT_TEAM = 8Q4H7X3Q58; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; @@ -1764,7 +1764,7 @@ CODE_SIGN_ENTITLEMENTS = "Terning-iOS/Terning-iOS.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2024.0928.0029; + CURRENT_PROJECT_VERSION = 2024.1002.0940; DEVELOPMENT_TEAM = 8Q4H7X3Q58; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES;