From 15f6d34380fc650942b6fe9aafbe327bf5016c2e Mon Sep 17 00:00:00 2001 From: seongmin221 Date: Sat, 4 May 2024 12:59:30 +0900 Subject: [PATCH] [Chore] #253 - optional color unwrapped --- .../xcshareddata/swiftpm/Package.resolved | 3 +- .../DesignSystem/Source/Colors/UIColor+.swift | 43 +++++++++++-------- .../Global/Extensions/UI/TabBar+.swift | 4 +- GEON-PPANG-iOS/Global/Utils/LayoutUtils.swift | 2 +- .../BottomSheet/CommonBottomSheet.swift | 4 +- .../LoginRequiredViewController.swift | 2 +- .../Common/Button/CommonButton.swift | 4 +- .../Common/Button/IconWithTextView.swift | 4 +- .../Common/Button/ReviewSortButton.swift | 2 +- .../Cell/DescriptionCollectionViewCell.swift | 16 +++---- .../NavigationBar/CustomNavigationBar.swift | 2 +- .../Common/StackView/BreadTypeStackView.swift | 4 +- .../Common/StackView/IconLabelStackView.swift | 4 +- .../StackView/ReviewCategoryStackView.swift | 2 +- .../Common/TextField/CommonTextView.swift | 6 +-- .../Common/TextField/SearchTextField.swift | 4 +- .../Common/TextField/SignInTextField.swift | 2 +- .../Common/View/DrawDashLineView.swift | 2 +- .../ViewController/LogInViewController.swift | 10 ++--- .../NickNameViewController.swift | 8 ++-- .../ViewController/SignInViewController.swift | 6 +-- .../Cell/InfoCollectionViewCell.swift | 10 ++--- .../Cell/MenuCollectionViewCell.swift | 4 +- .../Cell/TitleCollectionViewCell.swift | 2 +- .../WrittenReviewsCollectionViewCell.swift | 8 ++-- .../BakeryDetailCollectionViewFooter.swift | 2 +- .../BakeryDetailCollectionViewHeader.swift | 4 +- .../View/ReviewProgressView.swift | 2 +- .../BakeryDetailViewController.swift | 4 +- .../Report/View/DetailReasonTextView.swift | 4 +- .../ViewController/ReportViewController.swift | 12 +++--- .../OptionsCollectionViewCell.swift | 12 +++--- .../View/ReviewDetailTextView.swift | 14 +++--- .../View/WriteReviewBottomSheetView.swift | 8 ++-- .../ViewController/ReviewViewController.swift | 2 +- .../Cell/BakeryCommonCollectionViewCell.swift | 2 +- .../Cell/BakeryFilterCollectionViewCell.swift | 4 +- .../BakeryList/View/BakeryListTopView.swift | 2 +- .../View/SortBakeryFilterView.swift | 2 +- .../View/FilterCollectionViewCell.swift | 4 +- .../ViewController/FilterViewController.swift | 6 +-- .../Home/HomeBakeryCollectionViewCell.swift | 2 +- .../Home/HomeBottomCollectionViewCell.swift | 2 +- .../Home/HomeReviewCollectionViewCell.swift | 2 +- .../Scene/Home/Home/View/BubbleView.swift | 2 +- .../Scene/Home/Home/View/HomeHeaderView.swift | 4 +- .../Scene/Home/Home/View/HomeTopView.swift | 2 +- .../MyPage/View/MyPageProfileCell.swift | 2 +- .../MyPage/View/MyPagePurposeChipView.swift | 2 +- .../MyReviews/View/MyReviewsHeaderView.swift | 2 +- .../Search/Cell/EmptyCollectionViewCell.swift | 4 +- .../Search/View/SearchResultHeaderView.swift | 4 +- 52 files changed, 138 insertions(+), 132 deletions(-) diff --git a/GEON-PPANG-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/GEON-PPANG-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5f8ee99d..1b2650ff 100644 --- a/GEON-PPANG-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/GEON-PPANG-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,4 +1,5 @@ { + "originHash" : "a32b0a1c0ad6f6a91a39529043231e700bfb3a573e73a0172a5e40c9106b8bba", "pins" : [ { "identity" : "alamofire", @@ -100,5 +101,5 @@ } } ], - "version" : 2 + "version" : 3 } diff --git a/GEON-PPANG-iOS/Core/DesignSystem/Source/Colors/UIColor+.swift b/GEON-PPANG-iOS/Core/DesignSystem/Source/Colors/UIColor+.swift index 07917fef..b812491f 100644 --- a/GEON-PPANG-iOS/Core/DesignSystem/Source/Colors/UIColor+.swift +++ b/GEON-PPANG-iOS/Core/DesignSystem/Source/Colors/UIColor+.swift @@ -13,28 +13,33 @@ extension UIColor { // $0.textColor = .gbbMain1 // $0.backgroundColor = .gbbBackground1 - static let gbbMain1 = UIColor(named: "Main_1") - static let gbbMain2 = UIColor(named: "Main_2") - static let gbbMain3 = UIColor(named: "Main_3") + // MARK: - main colors + static let gbbMain1: UIColor = UIColor(named: "Main_1")! + static let gbbMain2: UIColor = UIColor(named: "Main_2")! + static let gbbMain3: UIColor = UIColor(named: "Main_3")! - static let gbbPoint1 = UIColor(named: "Point_1") - static let gbbPoint2 = UIColor(named: "Point_2") + // MARK: - point colors + static let gbbPoint1: UIColor = UIColor(named: "Point_1")! + static let gbbPoint2: UIColor = UIColor(named: "Point_2")! - static let gbbError = UIColor(named: "Error") + // MARK: - error colors + static let gbbError: UIColor = UIColor(named: "Error")! - static let gbbBackground1 = UIColor(named: "Background_1") - static let gbbBackground2 = UIColor(named: "Background_2") - static let gbbAlertBackground = UIColor(named: "alert-gray") + // MARK: - background colors + static let gbbBackground1: UIColor = UIColor(named: "Background_1")! + static let gbbBackground2: UIColor = UIColor(named: "Background_2")! + static let gbbAlertBackground: UIColor = UIColor(named: "alert-gray")! - static let gbbWhite = UIColor(named: "Gray_Scale/white") - static let gbbGray100 = UIColor(named: "Gray_Scale/gray-100") - static let gbbGray200 = UIColor(named: "Gray_Scale/gray-200") - static let gbbGray300 = UIColor(named: "Gray_Scale/gray-300") - static let gbbGray400 = UIColor(named: "Gray_Scale/gray-400") - static let gbbGray500 = UIColor(named: "Gray_Scale/gray-500") - static let gbbGray600 = UIColor(named: "Gray_Scale/gray-600") - static let gbbGray700 = UIColor(named: "Gray_Scale/gray-700") - static let gbbBlack = UIColor(named: "Gray_Scale/black") - static let gray_500 = UIColor(named: "Gray_500") + // MARK: - grayscale colors + static let gbbWhite: UIColor = UIColor(named: "Gray_Scale/white")! + static let gbbGray100: UIColor = UIColor(named: "Gray_Scale/gray-100")! + static let gbbGray200: UIColor = UIColor(named: "Gray_Scale/gray-200")! + static let gbbGray300: UIColor = UIColor(named: "Gray_Scale/gray-300")! + static let gbbGray400: UIColor = UIColor(named: "Gray_Scale/gray-400")! + static let gbbGray500: UIColor = UIColor(named: "Gray_Scale/gray-500")! + static let gbbGray600: UIColor = UIColor(named: "Gray_Scale/gray-600")! + static let gbbGray700: UIColor = UIColor(named: "Gray_Scale/gray-700")! + static let gbbBlack: UIColor = UIColor(named: "Gray_Scale/black")! + static let gray_500: UIColor = UIColor(named: "Gray_500")! } diff --git a/GEON-PPANG-iOS/Global/Extensions/UI/TabBar+.swift b/GEON-PPANG-iOS/Global/Extensions/UI/TabBar+.swift index 7e3581a9..78296a84 100644 --- a/GEON-PPANG-iOS/Global/Extensions/UI/TabBar+.swift +++ b/GEON-PPANG-iOS/Global/Extensions/UI/TabBar+.swift @@ -16,10 +16,10 @@ extension UITabBar { UITabBar.appearance().backgroundColor = UIColor.white UITabBarItem.appearance().titlePositionAdjustment.vertical = -5 UITabBarItem.appearance().setTitleTextAttributes([NSAttributedString.Key.font: UIFont.captionB1!, - NSAttributedString.Key.foregroundColor: UIColor.gbbGray400!], + NSAttributedString.Key.foregroundColor: UIColor.gbbGray400], for: .normal) UITabBarItem.appearance().setTitleTextAttributes([NSAttributedString.Key.font: UIFont.captionB1!, - NSAttributedString.Key.foregroundColor: UIColor.gbbMain3!], + NSAttributedString.Key.foregroundColor: UIColor.gbbMain3], for: .selected) } } diff --git a/GEON-PPANG-iOS/Global/Utils/LayoutUtils.swift b/GEON-PPANG-iOS/Global/Utils/LayoutUtils.swift index a1e2b479..5cbb8930 100644 --- a/GEON-PPANG-iOS/Global/Utils/LayoutUtils.swift +++ b/GEON-PPANG-iOS/Global/Utils/LayoutUtils.swift @@ -58,7 +58,7 @@ final class LayoutUtils { var config = UICollectionLayoutListConfiguration(appearance: appearance) config.backgroundColor = .clear - config.separatorConfiguration.color = .gbbGray200! + config.separatorConfiguration.color = .gbbGray200 config.headerMode = headerMode config.separatorConfiguration.topSeparatorVisibility = .hidden config.itemSeparatorHandler = handler diff --git a/GEON-PPANG-iOS/Presentation/Common/BottomSheet/CommonBottomSheet.swift b/GEON-PPANG-iOS/Presentation/Common/BottomSheet/CommonBottomSheet.swift index c72a1d52..aa218eb7 100644 --- a/GEON-PPANG-iOS/Presentation/Common/BottomSheet/CommonBottomSheet.swift +++ b/GEON-PPANG-iOS/Presentation/Common/BottomSheet/CommonBottomSheet.swift @@ -85,10 +85,10 @@ final class CommonBottomSheet: UIView { bottonSheetTitle.do { $0.textAlignment = .center $0.numberOfLines = 0 - $0.basic(font: .pretendardBold(20), color: .gbbGray500!) + $0.basic(font: .pretendardBold(20), color: .gbbGray500) } confirmButton.do { - $0.configureButtonUI(.gbbGray700!) + $0.configureButtonUI(.gbbGray700) $0.configureButtonTitle(.confirm) $0.tappedCommonButton = { self.dismissBottomSheet?() diff --git a/GEON-PPANG-iOS/Presentation/Common/BottomSheet/LoginRequiredViewController.swift b/GEON-PPANG-iOS/Presentation/Common/BottomSheet/LoginRequiredViewController.swift index 5e26555e..aaf078e9 100644 --- a/GEON-PPANG-iOS/Presentation/Common/BottomSheet/LoginRequiredViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Common/BottomSheet/LoginRequiredViewController.swift @@ -120,7 +120,7 @@ final class LoginRequiredViewController: BaseViewController { $0.font = .title2 $0.numberOfLines = 2 $0.textAlignment = .center - $0.partColorChange(targetString: "로그인", textColor: .gbbMain2!) + $0.partColorChange(targetString: "로그인", textColor: .gbbMain2) } kakaoLoginButton.do { diff --git a/GEON-PPANG-iOS/Presentation/Common/Button/CommonButton.swift b/GEON-PPANG-iOS/Presentation/Common/Button/CommonButton.swift index 6ef52e0a..d3af196b 100644 --- a/GEON-PPANG-iOS/Presentation/Common/Button/CommonButton.swift +++ b/GEON-PPANG-iOS/Presentation/Common/Button/CommonButton.swift @@ -74,7 +74,7 @@ final class CommonButton: UIButton { self.backgroundColor = color switch color { - case .gbbMain2!, .gbbGray700!: setTitleColor(.gbbGray100, for: .normal) + case .gbbMain2, .gbbGray700: setTitleColor(.gbbGray100, for: .normal) case .clear: self.titleLabel?.font = .bodyB1! setTitleColor(.gbbGray400, for: .normal) @@ -108,6 +108,6 @@ final class CommonButton: UIButton { func configureInteraction(to value: Bool) { self.isUserInteractionEnabled = value - self.configureButtonUI(value ? .gbbGray700! : .gbbGray200!) + self.configureButtonUI(value ? .gbbGray700 : .gbbGray200) } } diff --git a/GEON-PPANG-iOS/Presentation/Common/Button/IconWithTextView.swift b/GEON-PPANG-iOS/Presentation/Common/Button/IconWithTextView.swift index 79df1886..95be214e 100644 --- a/GEON-PPANG-iOS/Presentation/Common/Button/IconWithTextView.swift +++ b/GEON-PPANG-iOS/Presentation/Common/Button/IconWithTextView.swift @@ -65,12 +65,12 @@ final class IconWithTextView: UIButton { func configureListUI(text: String) { - self.configuration?.attributedTitle = AttributedString(text, attributes: AttributeContainer([.font: UIFont.captionM1!, .foregroundColor: UIColor.gbbGray400!])) + self.configuration?.attributedTitle = AttributedString(text, attributes: AttributeContainer([.font: UIFont.captionM1!, .foregroundColor: UIColor.gbbGray400])) } func configureHomeCell(count: Int) { - self.configuration?.attributedTitle = AttributedString("(\(count))", attributes: AttributeContainer([.font: UIFont.captionB1!, .foregroundColor: UIColor.gbbGray400!])) + self.configuration?.attributedTitle = AttributedString("(\(count))", attributes: AttributeContainer([.font: UIFont.captionB1!, .foregroundColor: UIColor.gbbGray400])) } } diff --git a/GEON-PPANG-iOS/Presentation/Common/Button/ReviewSortButton.swift b/GEON-PPANG-iOS/Presentation/Common/Button/ReviewSortButton.swift index 7b7016ec..e38e6d09 100644 --- a/GEON-PPANG-iOS/Presentation/Common/Button/ReviewSortButton.swift +++ b/GEON-PPANG-iOS/Presentation/Common/Button/ReviewSortButton.swift @@ -50,7 +50,7 @@ final class ReviewSortButton: UIButton { private func setUI() { iconLabelStackViewContainer.do { - $0.makeBorder(width: 1, color: .gbbGray200!) + $0.makeBorder(width: 1, color: .gbbGray200) $0.makeCornerRound(radius: 18) } diff --git a/GEON-PPANG-iOS/Presentation/Common/Cell/DescriptionCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Common/Cell/DescriptionCollectionViewCell.swift index 1ef8b710..91d7b6c1 100644 --- a/GEON-PPANG-iOS/Presentation/Common/Cell/DescriptionCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Common/Cell/DescriptionCollectionViewCell.swift @@ -22,25 +22,25 @@ final class DescriptionCollectionViewCell: UICollectionViewCell { private var cellBorderColor: UIColor { switch cellColor { - case .basic: return .gbbGray300! - case .sub: return .gbbPoint1! + case .basic: return .gbbGray300 + case .sub: return .gbbPoint1 case .point: return .clear } } private var cellBackgroundColor: UIColor { switch cellColor { - case .basic: return .gbbBackground1! - case .sub: return .gbbBackground1! - case .point: return .gbbPoint2! + case .basic: return .gbbBackground1 + case .sub: return .gbbBackground1 + case .point: return .gbbPoint2 } } private var cellTextColor: UIColor { switch cellColor { - case .basic: return .gbbGray400! - case .sub: return .gbbPoint1! - case .point: return .gbbPoint1! + case .basic: return .gbbGray400 + case .sub: return .gbbPoint1 + case .point: return .gbbPoint1 } } diff --git a/GEON-PPANG-iOS/Presentation/Common/NavigationBar/CustomNavigationBar.swift b/GEON-PPANG-iOS/Presentation/Common/NavigationBar/CustomNavigationBar.swift index 18dd4447..78534e76 100644 --- a/GEON-PPANG-iOS/Presentation/Common/NavigationBar/CustomNavigationBar.swift +++ b/GEON-PPANG-iOS/Presentation/Common/NavigationBar/CustomNavigationBar.swift @@ -79,7 +79,7 @@ final class CustomNavigationBar: UIView { } centerTitleLabel.do { - $0.basic(text: title, font: font, color: .gbbGray700!) + $0.basic(text: title, font: font, color: .gbbGray700) } } diff --git a/GEON-PPANG-iOS/Presentation/Common/StackView/BreadTypeStackView.swift b/GEON-PPANG-iOS/Presentation/Common/StackView/BreadTypeStackView.swift index 0eed469e..2de0b807 100644 --- a/GEON-PPANG-iOS/Presentation/Common/StackView/BreadTypeStackView.swift +++ b/GEON-PPANG-iOS/Presentation/Common/StackView/BreadTypeStackView.swift @@ -62,9 +62,9 @@ final class BreadTypeStackView: UIStackView { [glutenFreeChip, veganBreadChip, nutFreeChip, subSugarChip].enumerated().forEach { index, chip in chip.do { - $0.basic(text: labeling[index], font: .captionM1!, color: .gbbPoint1!) + $0.basic(text: labeling[index], font: .captionM1!, color: .gbbPoint1) $0.makeCornerRound(radius: 3) - $0.makeBorder(width: 0.5, color: .gbbPoint1!) + $0.makeBorder(width: 0.5, color: .gbbPoint1) } } } diff --git a/GEON-PPANG-iOS/Presentation/Common/StackView/IconLabelStackView.swift b/GEON-PPANG-iOS/Presentation/Common/StackView/IconLabelStackView.swift index d9f59107..76fce1ab 100644 --- a/GEON-PPANG-iOS/Presentation/Common/StackView/IconLabelStackView.swift +++ b/GEON-PPANG-iOS/Presentation/Common/StackView/IconLabelStackView.swift @@ -70,9 +70,9 @@ final class IconLabelStackView: UIStackView { private var labelColor: UIColor { switch iconType { case .bookmark, .review, .notice: - return .gbbGray300! + return .gbbGray300 case .basic: - return .gbbBlack! + return .gbbBlack } } diff --git a/GEON-PPANG-iOS/Presentation/Common/StackView/ReviewCategoryStackView.swift b/GEON-PPANG-iOS/Presentation/Common/StackView/ReviewCategoryStackView.swift index 62d938cc..d56bdbaa 100644 --- a/GEON-PPANG-iOS/Presentation/Common/StackView/ReviewCategoryStackView.swift +++ b/GEON-PPANG-iOS/Presentation/Common/StackView/ReviewCategoryStackView.swift @@ -62,7 +62,7 @@ final class ReviewCategoryStackView: UIStackView { [deliciousChip, zerowasteChip, specialChip, kindChip].enumerated().forEach { index, chip in chip.do { $0.backgroundColor = .gbbPoint2 - $0.basic(text: labeling[index], font: .captionM1!, color: .gbbPoint1!) + $0.basic(text: labeling[index], font: .captionM1!, color: .gbbPoint1) $0.makeCornerRound(radius: 3) } } diff --git a/GEON-PPANG-iOS/Presentation/Common/TextField/CommonTextView.swift b/GEON-PPANG-iOS/Presentation/Common/TextField/CommonTextView.swift index 09d47fd4..b37f3646 100644 --- a/GEON-PPANG-iOS/Presentation/Common/TextField/CommonTextView.swift +++ b/GEON-PPANG-iOS/Presentation/Common/TextField/CommonTextView.swift @@ -69,7 +69,7 @@ final class CommonTextView: UIView { private func setUI(type: SignInPropertyType) { titleLabel.do { - $0.basic(font: .bodyB2!, color: .gbbGray400!) + $0.basic(font: .bodyB2!, color: .gbbGray400) $0.text = type.title } @@ -103,8 +103,8 @@ final class CommonTextView: UIView { titleLabel.textColor = isValid ? .gbbError: .gbbMain3 checkLabel.basic(text: message, font: .captionM1!, - color: isValid ? .gbbError!: .gbbMain3!) - commonTextField.layer.borderColor = isValid ? UIColor.gbbError?.cgColor : UIColor.gbbMain3?.cgColor + color: isValid ? .gbbError: .gbbMain3) + commonTextField.layer.borderColor = isValid ? UIColor.gbbError.cgColor : UIColor.gbbMain3.cgColor } func clearErrorMessage() { diff --git a/GEON-PPANG-iOS/Presentation/Common/TextField/SearchTextField.swift b/GEON-PPANG-iOS/Presentation/Common/TextField/SearchTextField.swift index 5490e5af..49c7f0c6 100644 --- a/GEON-PPANG-iOS/Presentation/Common/TextField/SearchTextField.swift +++ b/GEON-PPANG-iOS/Presentation/Common/TextField/SearchTextField.swift @@ -78,13 +78,13 @@ final class SearchTextField: UITextField { switch viewType { case .search: - setPlaceholder(color: .gbbGray300!, font: .bodyM1!) + setPlaceholder(color: .gbbGray300, font: .bodyM1!) leftView = searchButton leftViewMode = .always rightView = clearButton rightViewMode = .whileEditing case .home: - setPlaceholder(color: .gbbGray300!, font: .subHead!) + setPlaceholder(color: .gbbGray300, font: .subHead!) setLeftPadding(amount: 0) rightView = searchButton rightViewMode = .always diff --git a/GEON-PPANG-iOS/Presentation/Common/TextField/SignInTextField.swift b/GEON-PPANG-iOS/Presentation/Common/TextField/SignInTextField.swift index 31ad0dc6..a91d68d3 100644 --- a/GEON-PPANG-iOS/Presentation/Common/TextField/SignInTextField.swift +++ b/GEON-PPANG-iOS/Presentation/Common/TextField/SignInTextField.swift @@ -58,7 +58,7 @@ final class SignInTextField: UITextField { $0.makeCornerRound(radius: 10) $0.makeBorder(width: 1, color: .clear) - $0.setPlaceholder(color: .gbbGray300!, font: .headLine!) + $0.setPlaceholder(color: .gbbGray300, font: .headLine!) } } diff --git a/GEON-PPANG-iOS/Presentation/Common/View/DrawDashLineView.swift b/GEON-PPANG-iOS/Presentation/Common/View/DrawDashLineView.swift index c56828cd..00962142 100644 --- a/GEON-PPANG-iOS/Presentation/Common/View/DrawDashLineView.swift +++ b/GEON-PPANG-iOS/Presentation/Common/View/DrawDashLineView.swift @@ -18,7 +18,7 @@ final class DrawDashLineView: UIView { // 코너가 들어간 점선 그리기 override init(frame: CGRect) { super.init(frame: frame) - borderLayer.strokeColor = UIColor.gbbMain3?.cgColor + borderLayer.strokeColor = UIColor.gbbMain3.cgColor borderLayer.lineDashPattern = [2, 2] borderLayer.backgroundColor = UIColor.clear.cgColor borderLayer.fillColor = UIColor.clear.cgColor diff --git a/GEON-PPANG-iOS/Presentation/Scene/Auth/LogIn/ViewController/LogInViewController.swift b/GEON-PPANG-iOS/Presentation/Scene/Auth/LogIn/ViewController/LogInViewController.swift index 223214f6..077c7c28 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Auth/LogIn/ViewController/LogInViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Auth/LogIn/ViewController/LogInViewController.swift @@ -108,18 +108,18 @@ final class LogInViewController: BaseViewController { $0.numberOfLines = 0 $0.basic(text: I18N.LogIn.title, font: .title1!, - color: .gbbGray700!) + color: .gbbGray700) } loginButton.do { $0.isUserInteractionEnabled = false - $0.configureButtonUI(.gbbGray200!) + $0.configureButtonUI(.gbbGray200) $0.configureButtonTitle(.login) } signInButton.do { $0.setTitle(I18N.LogIn.signIn, for: .normal) - $0.setTitleColor(.gbbGray500!, for: .normal) + $0.setTitleColor(.gbbGray500, for: .normal) $0.titleLabel?.font = .bodyB2! $0.setUnderline() $0.addAction(UIAction { [weak self] _ in @@ -132,7 +132,7 @@ final class LogInViewController: BaseViewController { accountLabel.do { $0.basic(text: I18N.LogIn.noAccount, font: .subHead!, - color: .gray_500!) + color: .gray_500) } bottomSheet.do { @@ -152,7 +152,7 @@ final class LogInViewController: BaseViewController { loginButton.do { $0.isUserInteractionEnabled = isValid - $0.configureButtonUI(isValid ? .gbbMain2!: .gbbGray200!) + $0.configureButtonUI(isValid ? .gbbMain2: .gbbGray200) $0.tappedCommonButton = { if isValid { self.postLogin() diff --git a/GEON-PPANG-iOS/Presentation/Scene/Auth/NickName/ViewController/NickNameViewController.swift b/GEON-PPANG-iOS/Presentation/Scene/Auth/NickName/ViewController/NickNameViewController.swift index 5580dcda..36548a67 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Auth/NickName/ViewController/NickNameViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Auth/NickName/ViewController/NickNameViewController.swift @@ -96,7 +96,7 @@ final class NickNameViewController: BaseViewController { $0.numberOfLines = 0 $0.basic(text: I18N.Nickname.title, font: .title1!, - color: .gbbGray700!) + color: .gbbGray700) } checkButton.do { @@ -115,7 +115,7 @@ final class NickNameViewController: BaseViewController { nextButton.do { $0.isUserInteractionEnabled = false - $0.configureButtonUI(.gbbGray200!) + $0.configureButtonUI(.gbbGray200) $0.configureButtonTitle(.next) } @@ -131,7 +131,7 @@ final class NickNameViewController: BaseViewController { self.checkButton.do { $0.isEnabled = isValid $0.configureButtonUI(.clear) - $0.configureBorder(isValid ? 2 : 1, isValid ? .gbbMain2! : .gbbGray300!) + $0.configureBorder(isValid ? 2 : 1, isValid ? .gbbMain2 : .gbbGray300) } } @@ -140,7 +140,7 @@ final class NickNameViewController: BaseViewController { self.nextButton.do { $0.isUserInteractionEnabled = isValid $0.configureButtonTitle(isValid ? .start : .next) - $0.configureButtonUI(isValid ? .gbbMain2! : .gbbGray200!) + $0.configureButtonUI(isValid ? .gbbMain2 : .gbbGray200) $0.tappedCommonButton = { self.signUp() } diff --git a/GEON-PPANG-iOS/Presentation/Scene/Auth/SignIn/ViewController/SignInViewController.swift b/GEON-PPANG-iOS/Presentation/Scene/Auth/SignIn/ViewController/SignInViewController.swift index 1bc930eb..f3ea401f 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Auth/SignIn/ViewController/SignInViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Auth/SignIn/ViewController/SignInViewController.swift @@ -148,7 +148,7 @@ final class SignInViewController: BaseViewController { $0.numberOfLines = 0 $0.basic(text: I18N.SignIn.title, font: .title1!, - color: .gbbGray700!) + color: .gbbGray700) } emailTextField.do { @@ -165,7 +165,7 @@ final class SignInViewController: BaseViewController { nextButton.do { $0.configureButtonTitle(.next) - $0.configureButtonUI(.gbbGray200!) + $0.configureButtonUI(.gbbGray200) $0.isUserInteractionEnabled = false } } @@ -180,7 +180,7 @@ final class SignInViewController: BaseViewController { func configureButtonUI(_ isValid: Bool) { nextButton.do { - $0.configureButtonUI(isValid ? .gbbMain2!: .gbbGray200!) + $0.configureButtonUI(isValid ? .gbbMain2: .gbbGray200) $0.isUserInteractionEnabled = isValid $0.tappedCommonButton = { [weak self] in guard let self else { return } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/InfoCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/InfoCollectionViewCell.swift index 4bc704de..5e0b8782 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/InfoCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/InfoCollectionViewCell.swift @@ -153,13 +153,13 @@ final class InfoCollectionViewCell: UICollectionViewCell { } addressLabel.do { - $0.basic(font: .subHead!, color: .gbbGray400!) + $0.basic(font: .subHead!, color: .gbbGray400) $0.adjustsFontSizeToFitWidth = true } regionStackView.do { $0.configureChipCornerRadius(8) - $0.configureChipBackgroundColor(.gbbBackground2!) + $0.configureChipBackgroundColor(.gbbBackground2) } openingHoursImage.do { @@ -167,11 +167,11 @@ final class InfoCollectionViewCell: UICollectionViewCell { } closedDaysLabel.do { - $0.basic(font: .subHead!, color: .gbbError!) + $0.basic(font: .subHead!, color: .gbbError) } openingHoursLabel.do { - $0.basic(font: .subHead!, color: .gbbGray400!) + $0.basic(font: .subHead!, color: .gbbGray400) $0.adjustsFontSizeToFitWidth = true } @@ -180,7 +180,7 @@ final class InfoCollectionViewCell: UICollectionViewCell { } phoneNumberLabel.do { - $0.basic(font: .subHead!, color: .gbbGray400!) + $0.basic(font: .subHead!, color: .gbbGray400) } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/MenuCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/MenuCollectionViewCell.swift index 6dd984a6..8b793175 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/MenuCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/MenuCollectionViewCell.swift @@ -67,11 +67,11 @@ final class MenuCollectionViewCell: UICollectionViewCell { } bakeryMenuLabel.do { - $0.basic(font: .subHead!, color: .gbbGray500!) + $0.basic(font: .subHead!, color: .gbbGray500) } menuPriceLabel.do { - $0.basic(font: .subHead!, color: .gbbGray400!) + $0.basic(font: .subHead!, color: .gbbGray400) $0.textAlignment = .right } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/TitleCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/TitleCollectionViewCell.swift index e1f0d2a7..1cf1e322 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/TitleCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/TitleCollectionViewCell.swift @@ -88,7 +88,7 @@ final class TitleCollectionViewCell: UICollectionViewCell { } bakeryNameLabel.do { - $0.basic(font: .title1!, color: .gbbGray700!) + $0.basic(font: .title1!, color: .gbbGray700) $0.adjustsFontSizeToFitWidth = true } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/WrittenReviewsCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/WrittenReviewsCollectionViewCell.swift index ea0d5b53..27cfbef9 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/WrittenReviewsCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/Cell/WrittenReviewsCollectionViewCell.swift @@ -112,7 +112,7 @@ final class WrittenReviewsCollectionViewCell: UICollectionViewCell { reviewContainer.do { $0.backgroundColor = .gbbBackground1 $0.makeCornerRound(radius: 12) - $0.makeBorder(width: 1, color: .gbbGray300!) + $0.makeBorder(width: 1, color: .gbbGray300) } profileImage.do { @@ -121,11 +121,11 @@ final class WrittenReviewsCollectionViewCell: UICollectionViewCell { } userNicknameLabel.do { - $0.basic(font: .bodyB2!, color: .gbbMain1!) + $0.basic(font: .bodyB2!, color: .gbbMain1) } reviewDateLabel.do { - $0.basic(font: .captionM1!, color: .gbbGray400!) + $0.basic(font: .captionM1!, color: .gbbGray400) $0.textAlignment = .right } @@ -139,7 +139,7 @@ final class WrittenReviewsCollectionViewCell: UICollectionViewCell { } reviewTextLabel.do { - $0.basic(font: .subHead!, color: .gbbGray400!) + $0.basic(font: .subHead!, color: .gbbGray400) $0.numberOfLines = 0 } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/View/BakeryDetailCollectionViewFooter.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/View/BakeryDetailCollectionViewFooter.swift index 9c5e60c5..58a5e0bb 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/View/BakeryDetailCollectionViewFooter.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/View/BakeryDetailCollectionViewFooter.swift @@ -73,7 +73,7 @@ final class BakeryDetailCollectionViewFooter: UICollectionReusableView { label.do { $0.setLineHeight(by: 1.35) - $0.basic(text: I18N.Detail.menuNotice, font: .captionM2!, color: .gbbGray400!) + $0.basic(text: I18N.Detail.menuNotice, font: .captionM2!, color: .gbbGray400) $0.adjustsFontSizeToFitWidth = true $0.numberOfLines = 2 } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/View/BakeryDetailCollectionViewHeader.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/View/BakeryDetailCollectionViewHeader.swift index 24a33265..2bb644c5 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/View/BakeryDetailCollectionViewHeader.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/View/BakeryDetailCollectionViewHeader.swift @@ -74,7 +74,7 @@ final class BakeryDetailCollectionViewHeader: UICollectionReusableView { } titleLabel.do { - $0.basic(font: .bodyB1!, color: .gbbBlack!) + $0.basic(font: .bodyB1!, color: .gbbBlack) $0.frame.size = $0.sizeThatFits(self.frame.size) } @@ -110,7 +110,7 @@ final class BakeryDetailCollectionViewHeader: UICollectionReusableView { titleLabel.text = "건빵집 리뷰" case .writtenReviews: titleLabel.text = "작성된 리뷰 \(reviewCount)개" - titleLabel.partColorChange(targetString: "\(reviewCount)개", textColor: .gbbPoint1!) // 특정 문자열의 textColor를 변경 + titleLabel.partColorChange(targetString: "\(reviewCount)개", textColor: .gbbPoint1) // 특정 문자열의 textColor를 변경 } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/View/ReviewProgressView.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/View/ReviewProgressView.swift index ab8b021e..0713515d 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/View/ReviewProgressView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/View/ReviewProgressView.swift @@ -78,7 +78,7 @@ final class ReviewProgressView: UIView { } reviewLabel.do { - $0.basic(font: .captionB1!, color: .gbbMain2!) + $0.basic(font: .captionB1!, color: .gbbMain2) $0.textAlignment = .center $0.numberOfLines = 1 } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/ViewController/BakeryDetailViewController.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/ViewController/BakeryDetailViewController.swift index 02670dc3..2df7797c 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/ViewController/BakeryDetailViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/BakeryDetail/ViewController/BakeryDetailViewController.swift @@ -130,7 +130,7 @@ final class BakeryDetailViewController: BaseViewController { floatingButton.do { $0.setImage(.upArrowIcon, for: .normal) $0.backgroundColor = .gbbWhite - $0.makeBorder(width: 1, color: .gbbGray200!) + $0.makeBorder(width: 1, color: .gbbGray200) $0.makeCornerRound(radius: 24) $0.addAction(UIAction { [weak self] _ in self?.tappedFloatingButton() @@ -168,7 +168,7 @@ final class BakeryDetailViewController: BaseViewController { } tempLabel.do { - $0.basic(font: .subHead!, color: .gbbGray400!) + $0.basic(font: .subHead!, color: .gbbGray400) $0.numberOfLines = 0 } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/Report/View/DetailReasonTextView.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/Report/View/DetailReasonTextView.swift index e2c9d484..4cf5b1e2 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/Report/View/DetailReasonTextView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/Report/View/DetailReasonTextView.swift @@ -59,13 +59,13 @@ final class DetailReasonTextView: UIView { $0.textColor = .gbbGray300 $0.autocorrectionType = .no // 자동완성 비활성화 $0.makeCornerRound(radius: 12) - $0.makeBorder(width: 1, color: .gbbGray300!) + $0.makeBorder(width: 1, color: .gbbGray300) $0.textContainerInset = .init(top: 20, left: 24, bottom: 49, right: 24) $0.clipsToBounds = true } textLimitLabel.do { - $0.basic(text: "0/140자", font: .captionM1!, color: .gbbGray300!) + $0.basic(text: "0/140자", font: .captionM1!, color: .gbbGray300) $0.textAlignment = .right } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/Report/ViewController/ReportViewController.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/Report/ViewController/ReportViewController.swift index ccb02052..3e90c610 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/Report/ViewController/ReportViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/Report/ViewController/ReportViewController.swift @@ -194,14 +194,14 @@ final class ReportViewController: BaseViewController { } reportingReasonLabel.do { - $0.basic(text: I18N.Report.reportReason, font: .bodyB1!, color: .gbbGray700!) + $0.basic(text: I18N.Report.reportReason, font: .bodyB1!, color: .gbbGray700) } [advertisementReportButton, profanityReportButton, defamationReportButton, othersReportButton].enumerated().forEach { index, button in button.do { $0.configuration?.attributedTitle = AttributedString(labeling[index], attributes: AttributeContainer([.font: UIFont.captionB1!, - .foregroundColor: UIColor.gbbGray500!])) + .foregroundColor: UIColor.gbbGray500])) $0.configuration?.contentInsets = .init(top: 8, leading: 8, bottom: 8, @@ -217,7 +217,7 @@ final class ReportViewController: BaseViewController { } detailReasonLabel.do { - $0.basic(text: I18N.Report.detailReportReason, font: .bodyB1!, color: .gbbGray700!) + $0.basic(text: I18N.Report.detailReportReason, font: .bodyB1!, color: .gbbGray700) } pleaseReportContainer.do { @@ -225,7 +225,7 @@ final class ReportViewController: BaseViewController { } pleaseReportLabel.do { - $0.basic(text: I18N.Report.pleaseReport, font: .captionM2!, color: .gbbGray300!) + $0.basic(text: I18N.Report.pleaseReport, font: .captionM2!, color: .gbbGray300) $0.textAlignment = .center $0.adjustsFontSizeToFitWidth = true } @@ -291,7 +291,7 @@ final class ReportViewController: BaseViewController { private func nothingSelected() { // 버튼 선택 안하고 텍스트 입력하려 했을 때 border와 글자 수 라벨의 색깔 바꿔주기 if selectedButton == nil { - detailReasonTextView.detailTextView.makeBorder(width: 1, color: .gbbGray500!) + detailReasonTextView.detailTextView.makeBorder(width: 1, color: .gbbGray500) detailReasonTextView.textLimitLabel.textColor = .gbbGray500 } } @@ -401,7 +401,7 @@ extension ReportViewController: UITextViewDelegate { detailReasonTextView.updateTextLimitLabel(to: 0) if selectedButton == nil { - detailReasonTextView.detailTextView.makeBorder(width: 1, color: .gbbGray300!) + detailReasonTextView.detailTextView.makeBorder(width: 1, color: .gbbGray300) detailReasonTextView.textLimitLabel.textColor = .gbbGray300 } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/OptionsCollection/OptionsCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/OptionsCollection/OptionsCollectionViewCell.swift index 611ca59d..aa6df9b9 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/OptionsCollection/OptionsCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/OptionsCollection/OptionsCollectionViewCell.swift @@ -22,17 +22,17 @@ final class OptionsCollectionViewCell: UICollectionViewCell { private var cellBorderColor: UIColor { switch status { - case .deselected: return .gbbGray400! - case .selected: return .gbbMain3! - case .disabled: return .gbbGray300! + case .deselected: return .gbbGray400 + case .selected: return .gbbMain3 + case .disabled: return .gbbGray300 } } private var cellTextColor: UIColor { switch status { - case .deselected: return .gbbGray400! - case .selected: return .gbbMain1! - case .disabled: return .gbbGray300! + case .deselected: return .gbbGray400 + case .selected: return .gbbMain1 + case .disabled: return .gbbGray300 } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/ReviewDetailTextView.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/ReviewDetailTextView.swift index d043da22..e2b68777 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/ReviewDetailTextView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/ReviewDetailTextView.swift @@ -22,17 +22,17 @@ final class ReviewDetailTextView: UIView { private var borderColor: UIColor { switch status { - case .deactivated: return .gbbGray300! - case .activated: return .gbbGray500! - case .error: return .gbbError! + case .deactivated: return .gbbGray300 + case .activated: return .gbbGray500 + case .error: return .gbbError } } private var textColor: UIColor { switch status { - case .deactivated: return .gbbGray300! - case .activated: return .gbbGray700! - case .error: return .gbbError! + case .deactivated: return .gbbGray300 + case .activated: return .gbbGray700 + case .error: return .gbbError } } @@ -84,7 +84,7 @@ final class ReviewDetailTextView: UIView { self.do { $0.makeCornerRound(radius: 12) - $0.makeBorder(width: 1, color: .gbbGray300!) + $0.makeBorder(width: 1, color: .gbbGray300) } detailTextView.do { diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/WriteReviewBottomSheetView.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/WriteReviewBottomSheetView.swift index c0787a41..bc02b2a2 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/WriteReviewBottomSheetView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/View/WriteReviewBottomSheetView.swift @@ -98,18 +98,18 @@ final class WriteReviewBottomSheetView: UIView { } quitButton.do { - $0.configureButtonUI(.gbbGray100!) + $0.configureButtonUI(.gbbGray100) $0.configureButtonTitle(to: I18N.Review.sheetQuit) - $0.configureButtonTitle(color: .gbbGray300!) + $0.configureButtonTitle(color: .gbbGray300) $0.tappedCommonButton = { self.dismissClosure!() } } continueButton.do { - $0.configureButtonUI(.gbbBlack!) + $0.configureButtonUI(.gbbBlack) $0.configureButtonTitle(to: I18N.Review.sheetContinue) - $0.configureButtonTitle(color: .gbbGray100!) + $0.configureButtonTitle(color: .gbbGray100) $0.tappedCommonButton = { self.continueClosure!() } diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/ViewController/ReviewViewController.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/ViewController/ReviewViewController.swift index 59171b55..1a12f7da 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/ViewController/ReviewViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryDetail/WriteReview/ViewController/ReviewViewController.swift @@ -502,7 +502,7 @@ extension ReviewViewController: UICollectionViewDelegate { optionsCollectionView.toggleIsEnabled(to: isLikeSelected) - configureCollectionViewHeader(to: isLikeSelected ? .black : .gbbGray300!) + configureCollectionViewHeader(to: isLikeSelected ? .black : .gbbGray300) reviewDetailTextView.isLike = isLikeSelected reviewDetailTextView.isUserInteractionEnabled = !isLikeSelected diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/BakeryCommonCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/BakeryCommonCollectionViewCell.swift index 955add97..5c3638be 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/BakeryCommonCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/BakeryCommonCollectionViewCell.swift @@ -111,7 +111,7 @@ final class BakeryCommonCollectionViewCell: UICollectionViewCell { } bakeryTitle.do { - $0.basic(font: .title2!, color: .gbbGray700!) + $0.basic(font: .title2!, color: .gbbGray700) } collectionView.do { diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/BakeryFilterCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/BakeryFilterCollectionViewCell.swift index f56e0557..7d4e431b 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/BakeryFilterCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/Cell/BakeryFilterCollectionViewCell.swift @@ -59,7 +59,7 @@ final class BakeryFilterCollectionViewCell: UICollectionViewCell { contentView.do { $0.makeCornerRound(radius: 18) - $0.makeBorder(width: 1, color: .gbbGray200!) + $0.makeBorder(width: 1, color: .gbbGray200) $0.backgroundColor = .gbbGray100 } hStackView.do { @@ -85,7 +85,7 @@ final class BakeryFilterCollectionViewCell: UICollectionViewCell { filterTitle.textColor = isTapped ? .gbbGray700 : .gbbBackground2 filterTitle.font = .captionM1 contentView.backgroundColor = isTapped ? .gbbWhite : .gbbMain3 - contentView.makeBorder(width: 1, color: isTapped ? .gbbGray200! : .gbbMain2!) + contentView.makeBorder(width: 1, color: isTapped ? .gbbGray200 : .gbbMain2) } func configureFilterSize() { diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/BakeryListTopView.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/BakeryListTopView.swift index d2e93c2f..6dddc0b4 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/BakeryListTopView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/BakeryListTopView.swift @@ -52,7 +52,7 @@ final class BakeryListTopView: UIView { bakeryTitle.do { $0.basic(text: I18N.BakeryList.bakeryTitle, font: .title1!, - color: .gbbGray700!) + color: .gbbGray700) } searchButton.do { diff --git a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/SortBakeryFilterView.swift b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/SortBakeryFilterView.swift index 2cfaa299..4eed7e48 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/SortBakeryFilterView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/BakeryList/BakeryList/View/SortBakeryFilterView.swift @@ -84,7 +84,7 @@ final class SortBakeryFilterView: UIView { checkBoxTitle.do { $0.basic(text: I18N.BakeryListFilter.title, font: .captionB1!, - color: .gbbGray600!) + color: .gbbGray600) } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/Filter/Filter/View/FilterCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/Filter/Filter/View/FilterCollectionViewCell.swift index b4d368e3..da3ac10e 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Filter/Filter/View/FilterCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Filter/Filter/View/FilterCollectionViewCell.swift @@ -59,7 +59,7 @@ final class FilterCollectionViewCell: UICollectionViewCell { self.do { $0.backgroundColor = .gbbBackground2 - $0.makeBorder(width: 1, color: .gbbGray300!) + $0.makeBorder(width: 1, color: .gbbGray300) $0.makeCornerRound(radius: 10) } @@ -101,7 +101,7 @@ final class FilterCollectionViewCell: UICollectionViewCell { UIView.animate(withDuration: 0.2) { self.do { - $0.makeBorder(width: self.isSelected ? 2 : 1, color: self.isSelected ? .gbbMain3! : .gbbGray300!) + $0.makeBorder(width: self.isSelected ? 2 : 1, color: self.isSelected ? .gbbMain3 : .gbbGray300) } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/Filter/Filter/ViewController/FilterViewController.swift b/GEON-PPANG-iOS/Presentation/Scene/Filter/Filter/ViewController/FilterViewController.swift index dc8fb679..74e74d4d 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Filter/Filter/ViewController/FilterViewController.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Filter/Filter/ViewController/FilterViewController.swift @@ -96,7 +96,7 @@ final class FilterViewController: BaseViewController { nextButton.do { $0.configureButtonTitle(.next) - $0.configureButtonUI(.gbbGray200!) + $0.configureButtonUI(.gbbGray200) $0.tappedCommonButton = { self.nextButtonTapped() } @@ -183,7 +183,7 @@ final class FilterViewController: BaseViewController { let isAnySelected = FilterCellModel.isAnySelected(of: currentFilterType) nextButton.isUserInteractionEnabled = isAnySelected ? true : false UIView.animate(withDuration: 0.2) { - self.nextButton.configureButtonUI(isAnySelected ? .gbbMain2! : .gbbGray200!) + self.nextButton.configureButtonUI(isAnySelected ? .gbbMain2 : .gbbGray200) } } @@ -328,7 +328,7 @@ extension FilterViewController: UICollectionViewDelegate { } else { nextButton.isUserInteractionEnabled = true UIView.animate(withDuration: 0.2) { - self.nextButton.configureButtonUI(.gbbMain2!) + self.nextButton.configureButtonUI(.gbbMain2) } } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeBakeryCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeBakeryCollectionViewCell.swift index 52a7aed9..bbf33492 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeBakeryCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeBakeryCollectionViewCell.swift @@ -107,7 +107,7 @@ final class HomeBakeryCollectionViewCell: UICollectionViewCell { bakeryTitle.do { $0.numberOfLines = 1 - $0.basic(font: .bodyB1!, color: .gbbGray700!) + $0.basic(font: .bodyB1!, color: .gbbGray700) $0.sizeToFit() } diff --git a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeBottomCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeBottomCollectionViewCell.swift index aa72937a..227767b3 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeBottomCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeBottomCollectionViewCell.swift @@ -45,7 +45,7 @@ final class HomeBottomCollectionViewCell: UICollectionViewCell { $0.textAlignment = .left $0.numberOfLines = 4 $0.basic(font: .captionM2!, - color: .gbbGray300!) + color: .gbbGray300) $0.setLineHeight(by: 1.37, with: I18N.Home.bottomSectionTitle) } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeReviewCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeReviewCollectionViewCell.swift index c205f1e9..65495b02 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeReviewCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/HomeReviewCollectionViewCell.swift @@ -114,7 +114,7 @@ final class HomeReviewCollectionViewCell: UICollectionViewCell { bakeryTitle.do { $0.numberOfLines = 1 - $0.basic(font: .bodyB1!, color: .gbbGray700!) + $0.basic(font: .bodyB1!, color: .gbbGray700) $0.textAlignment = .left } diff --git a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/BubbleView.swift b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/BubbleView.swift index 3feb3a71..784ab7aa 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/BubbleView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/BubbleView.swift @@ -81,7 +81,7 @@ final class BubbleView: UIView { titleLabel.do { $0.basic(text: I18N.Home.bubbleTitle, font: .captionM2!, - color: .gbbGray400!) + color: .gbbGray400) } cancelButton.do { diff --git a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/HomeHeaderView.swift b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/HomeHeaderView.swift index cfc57930..a48d43f5 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/HomeHeaderView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/HomeHeaderView.swift @@ -53,12 +53,12 @@ final class HomeHeaderView: UICollectionReusableView { string: headerTitle, attributes: [ .font: UIFont.title2!, - .foregroundColor: UIColor.gbbGray700! + .foregroundColor: UIColor.gbbGray700 ] ) attributedString.addAttributes( - [.foregroundColor: UIColor.gbbPoint1!], + [.foregroundColor: UIColor.gbbPoint1], range: NSRange( location: headerTitle.count - 8, length: 8 diff --git a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/HomeTopView.swift b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/HomeTopView.swift index 26a71fec..fca42578 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/HomeTopView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Home/Home/View/HomeTopView.swift @@ -76,7 +76,7 @@ final class HomeTopView: UIView { $0.numberOfLines = 2 $0.textAlignment = .left $0.basic(font: .title1!, - color: .gbbGray700!) + color: .gbbGray700) } searchTextField.do { diff --git a/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/MyPageProfileCell.swift b/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/MyPageProfileCell.swift index 8ec91314..37401855 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/MyPageProfileCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/MyPageProfileCell.swift @@ -146,7 +146,7 @@ final class MyPageProfileCell: UICollectionViewCell { buttonsContainer.do { $0.makeCornerRound(radius: 12) - $0.makeBorder(width: 1, color: .gbbPoint1!) + $0.makeBorder(width: 1, color: .gbbPoint1) $0.backgroundColor = .gbbBackground1 } diff --git a/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/MyPagePurposeChipView.swift b/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/MyPagePurposeChipView.swift index ef421b8e..82067242 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/MyPagePurposeChipView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyPage/View/MyPagePurposeChipView.swift @@ -50,7 +50,7 @@ final class MyPagePurposeChipView: UIView { self.do { $0.backgroundColor = .gbbPoint2 $0.makeCornerRound(radius: 12.5) - $0.makeBorder(width: 0.5, color: .gbbPoint1!) + $0.makeBorder(width: 0.5, color: .gbbPoint1) } purposeLabel.do { diff --git a/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyReviews/View/MyReviewsHeaderView.swift b/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyReviews/View/MyReviewsHeaderView.swift index 86f0eb3d..402c491b 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyReviews/View/MyReviewsHeaderView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/MyPage/MyReviews/View/MyReviewsHeaderView.swift @@ -46,7 +46,7 @@ final class MyReviewsHeaderView: UICollectionReusableView { dateLabel.do { $0.basic(font: .captionM1!, - color: .gbbGray400!) + color: .gbbGray400) } } diff --git a/GEON-PPANG-iOS/Presentation/Scene/Search/Search/Cell/EmptyCollectionViewCell.swift b/GEON-PPANG-iOS/Presentation/Scene/Search/Search/Cell/EmptyCollectionViewCell.swift index b973a020..5ab508a9 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Search/Search/Cell/EmptyCollectionViewCell.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Search/Search/Cell/EmptyCollectionViewCell.swift @@ -96,7 +96,7 @@ final class EmptyCollectionViewCell: UICollectionViewCell { emptyLabel.do { $0.numberOfLines = 0 - $0.basic(font: .title2!, color: .gbbGray300!, align: .center) + $0.basic(font: .title2!, color: .gbbGray300, align: .center) } } @@ -116,7 +116,7 @@ final class EmptyCollectionViewCell: UICollectionViewCell { case .initialize, .noReview, .noMyReview, .noBookmark: return emptyLabel.basic(text: emptyType.rawValue, font: .title2!, - color: .gbbGray300!, + color: .gbbGray300, align: .center) case .noSearch: return emptyLabel.partFontChange(targetString: type.subTitle, font: .subHead!) diff --git a/GEON-PPANG-iOS/Presentation/Scene/Search/Search/View/SearchResultHeaderView.swift b/GEON-PPANG-iOS/Presentation/Scene/Search/Search/View/SearchResultHeaderView.swift index 09c21b93..93534fe8 100644 --- a/GEON-PPANG-iOS/Presentation/Scene/Search/Search/View/SearchResultHeaderView.swift +++ b/GEON-PPANG-iOS/Presentation/Scene/Search/Search/View/SearchResultHeaderView.swift @@ -43,13 +43,13 @@ final class SearchResultHeaderView: UICollectionReusableView { private func setUI() { resultLabel.do { - $0.basic(font: .headLine!, color: .gbbGray600!) + $0.basic(font: .headLine!, color: .gbbGray600) } } func configureUI(count: Int) { resultLabel.text = "건빵집 결과 \(count)개" - resultLabel.partColorChange(targetString: "\(count)개", textColor: .gbbPoint1!) + resultLabel.partColorChange(targetString: "\(count)개", textColor: .gbbPoint1) } }