From 13cfb9b3d4536b4596f2e87483930f57771f56ba Mon Sep 17 00:00:00 2001 From: seuriseuljjeok Date: Mon, 11 Nov 2024 01:14:22 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Chore]=20=EC=BD=94=EB=93=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC=20(#274)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UpcomingDateScheduleSkeletonView.swift | 28 +++----- .../CustomAlert/DRCustomAlertView.swift | 42 ++++++----- .../Global/UIComponents/CustomEmptyView.swift | 1 + .../UIComponents/DRErrorViewController.swift | 4 +- .../AddCourseImageCollectionViewCell.swift | 8 +-- .../Cells/AddSecondViewTableViewCell.swift | 4 +- .../AddCourseFirst/AddCourseFirstView.swift | 13 ++-- .../Views/AddCourseFirst/AddFirstView.swift | 70 +++++++------------ .../AddCourseSecond/AddCourseSecondView.swift | 17 +++-- .../Views/AddCourseSecond/AddSecondView.swift | 66 +++++++---------- .../Views/AddCourseThird/AddThirdView.swift | 53 ++++++-------- .../InAddScheduleFirstView.swift | 55 ++++++--------- .../InAddScheduleSecondView.swift | 44 ++++-------- .../Views/Cells/BannerInfoHeaderView.swift | 4 +- .../Views/LocationFilterView.swift | 19 +++-- .../Cells/CourseListCollectionViewCell.swift | 28 +++----- .../Views/CourseNavigationBarView.swift | 12 ++-- .../Views/DeleteCourseSettingView.swift | 11 ++- .../Views/TimelineHeaderView.swift | 18 ++--- .../Cells/DateCardCollectionViewCell.swift | 20 ++++-- .../DateTimeLineCollectionViewCell.swift | 8 +-- .../Cells/PastDateCollectionViewCell.swift | 41 +++++------ .../View/DateDetailContentView.swift | 29 ++++---- .../View/DateScheduleDeleteView.swift | 10 ++- .../Main/Views/Cells/HotDateCourseCell.swift | 38 ++++++---- .../Main/Views/Cells/MainHeaderView.swift | 10 ++- .../Main/Views/Cells/NewDateCourseCell.swift | 39 +++++++---- .../Main/Views/DateTicketView.swift | 17 ++--- .../Main/Views/EmptyTicketView.swift | 18 ++--- .../Cells/OnboardingCollectionViewCell.swift | 12 +--- .../Cells/PointSystemCollectionViewCell.swift | 8 ++- .../Views/ProfileImageSettingView.swift | 16 ++--- .../Profile/Views/ProfileView.swift | 40 +++++------ 33 files changed, 363 insertions(+), 440 deletions(-) diff --git a/DATEROAD-iOS/DATEROAD-iOS/Global/Skeleton/UpcomingDateScheduleSkeletonView.swift b/DATEROAD-iOS/DATEROAD-iOS/Global/Skeleton/UpcomingDateScheduleSkeletonView.swift index ba5f24b2..b4ff561e 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Global/Skeleton/UpcomingDateScheduleSkeletonView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Global/Skeleton/UpcomingDateScheduleSkeletonView.swift @@ -61,11 +61,9 @@ final class UpcomingDateScheduleSkeletonView: BaseView { override func setStyle() { self.backgroundColor = UIColor(resource: .drWhite) - titleLabel.setLabel( - text: StringLiterals.DateSchedule.upcomingDate, - textColor: UIColor(resource: .drBlack), - font: UIFont.suit(.title_bold_20) - ) + titleLabel.setLabel(text: StringLiterals.DateSchedule.upcomingDate, + textColor: UIColor(resource: .drBlack), + font: UIFont.suit(.title_bold_20)) cardImageView.do { $0.backgroundColor = UIColor(resource: .drWhite) @@ -75,22 +73,18 @@ final class UpcomingDateScheduleSkeletonView: BaseView { dateRegisterButton.do { $0.backgroundColor = UIColor(resource: .deepPurple) $0.setImage(UIImage(resource: .plusSchedule), for: .normal) - $0.roundedButton(cornerRadius: 15, maskedCorners: [ - .layerMaxXMaxYCorner, - .layerMaxXMinYCorner, - .layerMinXMaxYCorner, - .layerMinXMinYCorner - ]) + $0.roundedButton(cornerRadius: 15, maskedCorners: [.layerMaxXMaxYCorner, + .layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMinXMinYCorner]) } pastDateButton.do { $0.backgroundColor = UIColor(resource: .gray100) - $0.roundCorners(cornerRadius: 13, maskedCorners: [ - .layerMaxXMaxYCorner, - .layerMaxXMinYCorner, - .layerMinXMaxYCorner, - .layerMinXMinYCorner - ]) + $0.roundCorners(cornerRadius: 13, maskedCorners: [.layerMaxXMaxYCorner, + .layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMinXMinYCorner]) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Global/UIComponents/CustomAlert/DRCustomAlertView.swift b/DATEROAD-iOS/DATEROAD-iOS/Global/UIComponents/CustomAlert/DRCustomAlertView.swift index 5a5ede22..7bbf2baf 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Global/UIComponents/CustomAlert/DRCustomAlertView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Global/UIComponents/CustomAlert/DRCustomAlertView.swift @@ -28,6 +28,7 @@ final class DRCustomAlertView: BaseView { override func setHierarchy() { self.addSubviews(alertView) + alertView.addSubviews(titleLabel, descriptionLabel, longButton, @@ -37,37 +38,37 @@ final class DRCustomAlertView: BaseView { override func setLayout() { alertView.snp.makeConstraints { - $0.width.equalTo(ScreenUtils.width * 343/375) - $0.height.equalTo(ScreenUtils.height * 162/812) + $0.width.equalTo(ScreenUtils.width * 343 / 375) + $0.height.equalTo(ScreenUtils.height * 162 / 812) $0.center.equalToSuperview() } titleLabel.snp.makeConstraints { $0.horizontalEdges.equalToSuperview() - $0.top.equalToSuperview().inset(ScreenUtils.height * 23/812) + $0.top.equalToSuperview().inset(ScreenUtils.height * 23 / 812) } descriptionLabel.snp.makeConstraints { $0.horizontalEdges.equalToSuperview() - $0.top.equalToSuperview().inset(ScreenUtils.height * 52/812) + $0.top.equalToSuperview().inset(ScreenUtils.height * 52 / 812) } longButton.snp.makeConstraints { - $0.horizontalEdges.bottom.equalToSuperview().inset(ScreenUtils.width * 14/375) - $0.height.equalTo(ScreenUtils.height * 48/812) + $0.horizontalEdges.bottom.equalToSuperview().inset(ScreenUtils.width * 14 / 375) + $0.height.equalTo(ScreenUtils.height * 48 / 812) } leftButton.snp.makeConstraints { - $0.leading.bottom.equalToSuperview().inset(ScreenUtils.width * 14/375) - $0.height.equalTo(ScreenUtils.height * 48/812) - $0.width.equalTo(ScreenUtils.width * 152/375) + $0.leading.bottom.equalToSuperview().inset(ScreenUtils.width * 14 / 375) + $0.height.equalTo(ScreenUtils.height * 48 / 812) + $0.width.equalTo(ScreenUtils.width * 152 / 375) } rightButton.snp.makeConstraints { - $0.trailing.bottom.equalToSuperview().inset(ScreenUtils.width * 14/375) - $0.height.equalTo(ScreenUtils.height * 48/812) - $0.width.equalTo(ScreenUtils.width * 152/375) - $0.leading.equalTo(leftButton.snp.trailing).offset(ScreenUtils.width * 11/375) + $0.trailing.bottom.equalToSuperview().inset(ScreenUtils.width * 14 / 375) + $0.height.equalTo(ScreenUtils.height * 48 / 812) + $0.width.equalTo(ScreenUtils.width * 152 / 375) + $0.leading.equalTo(leftButton.snp.trailing).offset(ScreenUtils.width * 11 / 375) } } @@ -75,16 +76,21 @@ final class DRCustomAlertView: BaseView { self.backgroundColor = UIColor(resource: .drBlack).withAlphaComponent(0.5) alertView.do { - $0.roundCorners(cornerRadius: 20, maskedCorners: [.layerMaxXMaxYCorner, .layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMinXMinYCorner]) + $0.roundCorners(cornerRadius: 20, maskedCorners: [.layerMaxXMaxYCorner, + .layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMinXMinYCorner]) $0.backgroundColor = UIColor(resource: .drWhite) } - titleLabel.do { - $0.setLabel(alignment: .center, textColor: UIColor(resource: .drBlack), font: UIFont.suit(.body_bold_17)) - } + titleLabel.setLabel(alignment: .center, + textColor: UIColor(resource: .drBlack), + font: UIFont.suit(.body_bold_17)) descriptionLabel.do { - $0.setLabel(alignment: .center, textColor: UIColor(resource: .drBlack), font: UIFont.suit(.body_med_13)) + $0.setLabel(alignment: .center, + textColor: UIColor(resource: .drBlack), + font: UIFont.suit(.body_med_13)) $0.isHidden = true } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Global/UIComponents/CustomEmptyView.swift b/DATEROAD-iOS/DATEROAD-iOS/Global/UIComponents/CustomEmptyView.swift index fb5a5cc5..e37857f8 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Global/UIComponents/CustomEmptyView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Global/UIComponents/CustomEmptyView.swift @@ -30,6 +30,7 @@ final class CustomEmptyView: BaseView { $0.top.horizontalEdges.equalToSuperview() $0.height.equalTo(ScreenUtils.height * 394 / 812) } + titleLabel.snp.makeConstraints { $0.top.equalTo(imageView.snp.bottom) $0.horizontalEdges.equalToSuperview() diff --git a/DATEROAD-iOS/DATEROAD-iOS/Global/UIComponents/DRErrorViewController.swift b/DATEROAD-iOS/DATEROAD-iOS/Global/UIComponents/DRErrorViewController.swift index 80626e82..e74069d8 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Global/UIComponents/DRErrorViewController.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Global/UIComponents/DRErrorViewController.swift @@ -53,7 +53,9 @@ final class DRErrorViewController: BaseNavBarViewController { override func setHierarchy() { super.setHierarchy() - self.contentView.addSubviews(errorImageView, mainErrorMessageLabel, subErrorMessageLabel) + self.contentView.addSubviews(errorImageView, + mainErrorMessageLabel, + subErrorMessageLabel) } override func setLayout() { diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Cells/AddCourseImageCollectionViewCell.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Cells/AddCourseImageCollectionViewCell.swift index 61ba2847..81095536 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Cells/AddCourseImageCollectionViewCell.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Cells/AddCourseImageCollectionViewCell.swift @@ -102,11 +102,9 @@ final class AddCourseImageCollectionViewCell: BaseCollectionViewCell { } emptyLabel.do { - $0.setLabel( - numberOfLines: 2, - textColor: UIColor(resource: .gray300), - font: .suit(.body_bold_11) - ) + $0.setLabel(numberOfLines: 2, + textColor: UIColor(resource: .gray300), + font: .suit(.body_bold_11)) $0.text = StringLiterals.AddCourseOrSchedule.AddFirstView.emptyImage } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Cells/AddSecondViewTableViewCell.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Cells/AddSecondViewTableViewCell.swift index f79abd11..ae137e5c 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Cells/AddSecondViewTableViewCell.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Cells/AddSecondViewTableViewCell.swift @@ -90,9 +90,7 @@ final class AddSecondViewCollectionViewCell: BaseCollectionViewCell { $0.setLabel(textColor: UIColor(resource: .drBlack), font: .suit(.body_med_13)) } - moveAbleButton.do { - $0.setImage(UIImage(resource: .icMovecourse), for: .normal) - } + moveAbleButton.setImage(UIImage(resource: .icMovecourse), for: .normal) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseFirst/AddCourseFirstView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseFirst/AddCourseFirstView.swift index ff9bfa09..1eebe2ff 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseFirst/AddCourseFirstView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseFirst/AddCourseFirstView.swift @@ -41,6 +41,7 @@ final class AddCourseFirstView: BaseView { override func setHierarchy() { self.addSubview(scrollView) + scrollView.addSubview(scrollContentView) scrollContentView.addSubviews( @@ -48,10 +49,10 @@ final class AddCourseFirstView: BaseView { imageAccessoryView, addFirstView, dateNameErrorLabel, - visitDateErrorLabel - ) + visitDateErrorLabel) imageAccessoryView.addSubviews(cameraBtn, imageCountLabelContainer) + imageCountLabelContainer.addSubview(imageCountLabel) } @@ -167,16 +168,12 @@ extension AddCourseFirstView { func updateDateNameTextField(isPassValid: Bool) { dateNameErrorLabel.isHidden = isPassValid - addFirstView.dateNameTextField.do { - $0.layer.borderWidth = isPassValid ? 0 : 1 - } + addFirstView.dateNameTextField.layer.borderWidth = isPassValid ? 0 : 1 } func updateVisitDateTextField(isPassValid: Bool) { visitDateErrorLabel.isHidden = isPassValid - addFirstView.visitDateContainer.do { - $0.layer.borderWidth = isPassValid ? 0 : 1 - } + addFirstView.visitDateContainer.layer.borderWidth = isPassValid ? 0 : 1 } func updateImageCellUI(isEmpty: Bool, ImageDataCount: Int) { diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseFirst/AddFirstView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseFirst/AddFirstView.swift index 5c312512..a393d6f3 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseFirst/AddFirstView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseFirst/AddFirstView.swift @@ -61,14 +61,12 @@ final class AddFirstView: BaseView { textFieldStackView, tagContainer, datePlaceContainer, - sixCheckNextBtnContainer - ) + sixCheckNextBtnContainer) textFieldStackView.addArrangedSubviews( dateNameTextField, visitDateContainer, - dateStartAtContainer - ) + dateStartAtContainer) visitDateContainer.addSubviews(visitDateLabel, visitDateImage) @@ -181,36 +179,31 @@ final class AddFirstView: BaseView { } visitDateImage.image = UIImage(resource: .calendar) + dateStartTimeImage.image = UIImage(resource: .time) dateNameTextField.do { - $0.setPlaceholder( - placeholder: StringLiterals.AddCourseOrSchedule.AddFirstView.dateNmaePlaceHolder, - fontColor: .gray300, - font: UIFont.suit(.body_semi_13) - ) + $0.setPlaceholder(placeholder: StringLiterals.AddCourseOrSchedule.AddFirstView.dateNmaePlaceHolder, + fontColor: .gray300, + font: UIFont.suit(.body_semi_13)) $0.setLeftPadding(amount: 16) $0.setRightPadding(amount: 6) } - visitDateLabel.do { - $0.setLabel( - text: StringLiterals.AddCourseOrSchedule.AddFirstView.visitDateLabel, - alignment: .left, - textColor: UIColor(resource: .gray300), - font: UIFont.suit(.body_semi_13)) - } + visitDateLabel.setLabel(text: StringLiterals.AddCourseOrSchedule.AddFirstView.visitDateLabel, + alignment: .left, + textColor: UIColor(resource: .gray300), + font: UIFont.suit(.body_semi_13)) - dateStartTimeLabel.do { - $0.setLabel( - text: StringLiterals.AddCourseOrSchedule.AddFirstView.dateStartTimeLabel, - alignment: .left, - textColor: UIColor(resource: .gray300), - font: UIFont.suit(.body_semi_13)) - } + dateStartTimeLabel.setLabel(text: StringLiterals.AddCourseOrSchedule.AddFirstView.dateStartTimeLabel, + alignment: .left, + textColor: UIColor(resource: .gray300), + font: UIFont.suit(.body_semi_13)) tagTitleLabel.do { - $0.setLabel(alignment: .left, textColor: UIColor(resource: .drBlack), font: .suit(.body_semi_15)) + $0.setLabel(alignment: .left, + textColor: UIColor(resource: .drBlack), + font: .suit(.body_semi_15)) $0.text = StringLiterals.AddCourseOrSchedule.AddFirstView.tagTitle } @@ -219,14 +212,10 @@ final class AddFirstView: BaseView { $0.layer.cornerRadius = 14 } - datePlaceLabel.do { - $0.setLabel( - text: StringLiterals.AddCourseOrSchedule.AddFirstView.datePlaceLabel, - alignment: .left, - textColor: UIColor(resource: .gray300), - font: .suit(.body_semi_13) - ) - } + datePlaceLabel.setLabel(text: StringLiterals.AddCourseOrSchedule.AddFirstView.datePlaceLabel, + alignment: .left, + textColor: UIColor(resource: .gray300), + font: .suit(.body_semi_13)) datePlaceImage.do { $0.image = UIImage(resource: .downArrow) @@ -234,10 +223,7 @@ final class AddFirstView: BaseView { } sixCheckNextButton.do { - $0.setTitle( - StringLiterals.AddCourseOrSchedule.AddFirstView.addFirstNextBtnOfCourse, - for: .normal - ) + $0.setTitle(StringLiterals.AddCourseOrSchedule.AddFirstView.addFirstNextBtnOfCourse, for: .normal) $0.titleLabel?.font = UIFont.suit(.body_med_13) $0.setButtonStatus(buttonType: disabledButtonType) } @@ -300,14 +286,10 @@ extension AddFirstView { $0.text = text } } else { - datePlaceLabel.do { - $0.setLabel( - text: StringLiterals.AddCourseOrSchedule.AddFirstView.datePlaceLabel, - alignment: .left, - textColor: UIColor(resource: .gray300), - font: .suit(.body_semi_13) - ) - } + datePlaceLabel.setLabel(text: StringLiterals.AddCourseOrSchedule.AddFirstView.datePlaceLabel, + alignment: .left, + textColor: UIColor(resource: .gray300), + font: .suit(.body_semi_13)) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseSecond/AddCourseSecondView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseSecond/AddCourseSecondView.swift index 16b08467..aacab3e0 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseSecond/AddCourseSecondView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseSecond/AddCourseSecondView.swift @@ -38,11 +38,10 @@ final class AddCourseSecondView: BaseView { override func setHierarchy() { self.addSubviews (collectionView, addSecondView) - addSecondView.addSubviews( - editButton, - guideLabel, - addPlaceCollectionView - ) + + addSecondView.addSubviews(editButton, + guideLabel, + addPlaceCollectionView) } override func setLayout() { @@ -107,7 +106,9 @@ final class AddCourseSecondView: BaseView { } guideLabel.do { - $0.setLabel(alignment: .left, textColor: UIColor(resource: .gray400), font: .suit(.body_med_13)) + $0.setLabel(alignment: .left, + textColor: UIColor(resource: .gray400), + font: .suit(.body_med_13)) $0.text = StringLiterals.AddCourseOrSchedule.AddSecondView.guideLabel } } @@ -127,9 +128,7 @@ extension AddCourseSecondView { func editBtnState(isAble: Bool) { let state = isAble ? enabledButtonType : disabledButtonType - editButton.do { - $0.setButtonStatus(buttonType: state) - } + editButton.setButtonStatus(buttonType: state) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseSecond/AddSecondView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseSecond/AddSecondView.swift index f7fbdc55..85d8bef2 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseSecond/AddSecondView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseSecond/AddSecondView.swift @@ -45,20 +45,16 @@ final class AddSecondView: BaseView { // MARK: - Methods override func setHierarchy() { - addSubviews ( - container, - contentTitleLabel, - contentSubTitleLabel, - placeRegistrationContainer, - separatorLine, - nextBtn - ) + addSubviews(container, + contentTitleLabel, + contentSubTitleLabel, + placeRegistrationContainer, + separatorLine, + nextBtn) - placeRegistrationContainer.addSubviews( - datePlaceTextField, - timeRequireTextField, - addPlaceButton - ) + placeRegistrationContainer.addSubviews(datePlaceTextField, + timeRequireTextField, + addPlaceButton) } override func setLayout() { @@ -109,30 +105,20 @@ final class AddSecondView: BaseView { } override func setStyle() { - contentTitleLabel.do { - $0.setLabel( - text: StringLiterals.AddCourseOrSchedule.AddSecondView.contentTitleLabelOfCourse, - alignment: .left, - textColor: UIColor(resource: .drBlack), - font: .suit(.body_bold_17) - ) - } + contentTitleLabel.setLabel(text: StringLiterals.AddCourseOrSchedule.AddSecondView.contentTitleLabelOfCourse, + alignment: .left, + textColor: UIColor(resource: .drBlack), + font: .suit(.body_bold_17)) - contentSubTitleLabel.do { - $0.setLabel( - text: StringLiterals.AddCourseOrSchedule.AddSecondView.subTitleLabel, - alignment: .left, - textColor: UIColor(resource: .gray400), - font: .suit(.body_med_13) - ) - } + contentSubTitleLabel.setLabel(text: StringLiterals.AddCourseOrSchedule.AddSecondView.subTitleLabel, + alignment: .left, + textColor: UIColor(resource: .gray400), + font: .suit(.body_med_13)) datePlaceTextField.do { - $0.setPlaceholder( - placeholder: StringLiterals.AddCourseOrSchedule.AddSecondView.datePlacePlaceHolder, - fontColor: UIColor(resource: .gray300), - font: UIFont.suit(.body_semi_13) - ) + $0.setPlaceholder(placeholder: StringLiterals.AddCourseOrSchedule.AddSecondView.datePlacePlaceHolder, + fontColor: UIColor(resource: .gray300), + font: UIFont.suit(.body_semi_13)) $0.setLeftPadding(amount: 14) $0.setRightPadding(amount: 4) $0.textAlignment = .left @@ -146,11 +132,9 @@ final class AddSecondView: BaseView { } timeRequireTextField.do { - $0.setPlaceholder( - placeholder: StringLiterals.AddCourseOrSchedule.AddSecondView.timeRequiredPlaceHolder, - fontColor: UIColor(resource: .gray300), - font: UIFont.suit(.body_semi_13) - ) + $0.setPlaceholder(placeholder: StringLiterals.AddCourseOrSchedule.AddSecondView.timeRequiredPlaceHolder, + fontColor: UIColor(resource: .gray300), + font: UIFont.suit(.body_semi_13)) $0.textAlignment = .center $0.backgroundColor = UIColor(resource: .gray100) $0.layer.borderWidth = 0 @@ -168,9 +152,7 @@ final class AddSecondView: BaseView { } } - separatorLine.do { - $0.backgroundColor = UIColor(resource: .gray200) - } + separatorLine.backgroundColor = UIColor(resource: .gray200) nextBtn.do { $0.setButtonStatus(buttonType: disabledButtonType) diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseThird/AddThirdView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseThird/AddThirdView.swift index 68469af0..f104f86e 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseThird/AddThirdView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseThird/AddThirdView.swift @@ -39,14 +39,12 @@ final class AddThirdView: BaseView { override func setHierarchy() { addSubviews(container) - container.addSubviews( - contentTitleLabel, - contentTextView, - contentTextCountLabel, - priceTitleLabel, - priceTextField, - addThirdDoneBtnContainer - ) + container.addSubviews(contentTitleLabel, + contentTextView, + contentTextCountLabel, + priceTitleLabel, + priceTextField, + addThirdDoneBtnContainer) } override func setLayout() { @@ -88,14 +86,10 @@ final class AddThirdView: BaseView { } override func setStyle() { - contentTitleLabel.do { - $0.setLabel( - text: StringLiterals.AddCourseOrSchedule.AddThirdView.contentTitleLabel, - alignment: .left, - textColor: UIColor(resource: .drBlack), - font: .suit(.body_bold_17) - ) - } + contentTitleLabel.setLabel(text: StringLiterals.AddCourseOrSchedule.AddThirdView.contentTitleLabel, + alignment: .left, + textColor: UIColor(resource: .drBlack), + font: .suit(.body_bold_17)) [contentTextView, priceTextField].forEach { $0.layer.borderWidth = 0 @@ -125,27 +119,21 @@ final class AddThirdView: BaseView { $0.spellCheckingType = .no } - priceTextField.setPlaceholder( - placeholder: StringLiterals.AddCourseOrSchedule.AddThirdView.priceTextFieldPlaceHolder, - fontColor: UIColor(resource: .gray300), - font: .suit(.body_med_13) - ) + priceTextField.setPlaceholder(placeholder: StringLiterals.AddCourseOrSchedule.AddThirdView.priceTextFieldPlaceHolder, + fontColor: UIColor(resource: .gray300), + font: .suit(.body_med_13)) contentTextCountLabel.do { - $0.setLabel( - alignment: .right, - textColor: UIColor(resource: .gray300), - font: .suit(.body_med_13) - ) + $0.setLabel(alignment: .right, + textColor: UIColor(resource: .gray300), + font: .suit(.body_med_13)) $0.text = StringLiterals.AddCourseOrSchedule.AddThirdView.contentTextCountLabel } priceTitleLabel.do { - $0.setLabel( - alignment: .left, - textColor: UIColor(resource: .drBlack), - font: .suit(.body_bold_17) - ) + $0.setLabel(alignment: .left, + textColor: UIColor(resource: .drBlack), + font: .suit(.body_bold_17)) $0.text = StringLiterals.AddCourseOrSchedule.AddThirdView.priceTitleLabel } } @@ -168,8 +156,7 @@ extension AddThirdView { let textColor = isTextEmpty ? UIColor(resource: .gray300) : UIColor(resource: .drBlack) textView.text = textToDisplay - textView.setFontAndLineLetterSpacing(textView.text, - font:UIFont.systemFont(ofSize: 13, weight: .semibold)) + textView.setFontAndLineLetterSpacing(textView.text, font:UIFont.systemFont(ofSize: 13, weight: .semibold)) textView.textColor = textColor } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddSchedule/Views/AddScheduleFirst/InAddScheduleFirstView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddSchedule/Views/AddScheduleFirst/InAddScheduleFirstView.swift index 86f58a54..6d76fcc0 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddSchedule/Views/AddScheduleFirst/InAddScheduleFirstView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddSchedule/Views/AddScheduleFirst/InAddScheduleFirstView.swift @@ -183,25 +183,21 @@ final class InAddScheduleFirstView: BaseView { $0.setRightPadding(amount: 6) } - visitDateLabel.do { - $0.setLabel( - text: StringLiterals.AddCourseOrSchedule.AddFirstView.visitDateLabel, - alignment: .left, - textColor: UIColor(resource: .gray300), - font: UIFont.suit(.body_semi_13)) - } + visitDateLabel.setLabel(text: StringLiterals.AddCourseOrSchedule.AddFirstView.visitDateLabel, + alignment: .left, + textColor: UIColor(resource: .gray300), + font: UIFont.suit(.body_semi_13)) - dateStartTimeLabel.do { - $0.setLabel( - text: StringLiterals.AddCourseOrSchedule.AddFirstView.dateStartTimeLabel, - alignment: .left, - textColor: UIColor(resource: .gray300), - font: UIFont.suit(.body_semi_13)) - } + dateStartTimeLabel.setLabel(text: StringLiterals.AddCourseOrSchedule.AddFirstView.dateStartTimeLabel, + alignment: .left, + textColor: UIColor(resource: .gray300), + font: UIFont.suit(.body_semi_13)) tagTitleLabel.do { - $0.setLabel(alignment: .left, textColor: UIColor(resource: .drBlack), font: .suit(.body_semi_15)) $0.text = StringLiterals.AddCourseOrSchedule.AddFirstView.tagTitle + $0.setLabel(alignment: .left, + textColor: UIColor(resource: .drBlack), + font: .suit(.body_semi_15)) } datePlaceContainer.do { @@ -209,14 +205,10 @@ final class InAddScheduleFirstView: BaseView { $0.layer.cornerRadius = 14 } - datePlaceLabel.do { - $0.setLabel( - text: StringLiterals.AddCourseOrSchedule.AddFirstView.datePlaceLabel, - alignment: .left, - textColor: UIColor(resource: .gray300), - font: .suit(.body_semi_13) - ) - } + datePlaceLabel.setLabel(text: StringLiterals.AddCourseOrSchedule.AddFirstView.datePlaceLabel, + alignment: .left, + textColor: UIColor(resource: .gray300), + font: .suit(.body_semi_13)) datePlaceImage.do { $0.image = UIImage(resource: .downArrow) @@ -224,10 +216,7 @@ final class InAddScheduleFirstView: BaseView { } sixCheckNextButton.do { - $0.setTitle( - StringLiterals.AddCourseOrSchedule.AddFirstView.addFirstNextBtnOfSchedule, - for: .normal - ) + $0.setTitle(StringLiterals.AddCourseOrSchedule.AddFirstView.addFirstNextBtnOfSchedule, for: .normal) $0.titleLabel?.font = UIFont.suit(.body_med_13) $0.setButtonStatus(buttonType: disabledButtonType) } @@ -290,14 +279,10 @@ extension InAddScheduleFirstView { $0.text = text } } else { - datePlaceLabel.do { - $0.setLabel( - text: StringLiterals.AddCourseOrSchedule.AddFirstView.datePlaceLabel, - alignment: .left, - textColor: UIColor(resource: .gray300), - font: .suit(.body_semi_13) - ) - } + datePlaceLabel.setLabel(text: StringLiterals.AddCourseOrSchedule.AddFirstView.datePlaceLabel, + alignment: .left, + textColor: UIColor(resource: .gray300), + font: .suit(.body_semi_13)) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddSchedule/Views/AddScheduleSecond/InAddScheduleSecondView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddSchedule/Views/AddScheduleSecond/InAddScheduleSecondView.swift index 5a8dca72..e59aac8b 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddSchedule/Views/AddScheduleSecond/InAddScheduleSecondView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/AddSchedule/Views/AddScheduleSecond/InAddScheduleSecondView.swift @@ -98,30 +98,20 @@ final class InAddScheduleSecondView: BaseView { } override func setStyle() { - contentTitleLabel.do { - $0.setLabel( - text: StringLiterals.AddCourseOrSchedule.AddSecondView.contentTitleLabelOfCourse, - alignment: .left, - textColor: UIColor(resource: .drBlack), - font: .suit(.body_bold_17) - ) - } + contentTitleLabel.setLabel(text: StringLiterals.AddCourseOrSchedule.AddSecondView.contentTitleLabelOfCourse, + alignment: .left, + textColor: UIColor(resource: .drBlack), + font: .suit(.body_bold_17)) - contentSubTitleLabel.do { - $0.setLabel( - text: StringLiterals.AddCourseOrSchedule.AddSecondView.subTitleLabel, - alignment: .left, - textColor: UIColor(resource: .gray400), - font: .suit(.body_med_13) - ) - } + contentSubTitleLabel.setLabel(text: StringLiterals.AddCourseOrSchedule.AddSecondView.subTitleLabel, + alignment: .left, + textColor: UIColor(resource: .gray400), + font: .suit(.body_med_13)) datePlaceTextField.do { - $0.setPlaceholder( - placeholder: StringLiterals.AddCourseOrSchedule.AddSecondView.datePlacePlaceHolder, - fontColor: UIColor(resource: .gray300), - font: .suit(.body_semi_13) - ) + $0.setPlaceholder(placeholder: StringLiterals.AddCourseOrSchedule.AddSecondView.datePlacePlaceHolder, + fontColor: UIColor(resource: .gray300), + font: .suit(.body_semi_13)) $0.setLeftPadding(amount: 14) $0.setRightPadding(amount: 4) $0.textAlignment = .left @@ -135,11 +125,9 @@ final class InAddScheduleSecondView: BaseView { } timeRequireTextField.do { - $0.setPlaceholder( - placeholder: StringLiterals.AddCourseOrSchedule.AddSecondView.timeRequiredPlaceHolder, - fontColor: UIColor(resource: .gray300), - font: .suit(.body_semi_13) - ) + $0.setPlaceholder(placeholder: StringLiterals.AddCourseOrSchedule.AddSecondView.timeRequiredPlaceHolder, + fontColor: UIColor(resource: .gray300), + font: .suit(.body_semi_13)) $0.textAlignment = .center $0.backgroundColor = UIColor(resource: .gray100) $0.layer.borderWidth = 0 @@ -157,9 +145,7 @@ final class InAddScheduleSecondView: BaseView { } } - separatorLine.do { - $0.backgroundColor = UIColor(resource: .gray200) - } + separatorLine.backgroundColor = UIColor(resource: .gray200) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Banner/Views/Cells/BannerInfoHeaderView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Banner/Views/Cells/BannerInfoHeaderView.swift index a3332938..05bc9e32 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Banner/Views/Cells/BannerInfoHeaderView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Banner/Views/Cells/BannerInfoHeaderView.swift @@ -78,9 +78,7 @@ private extension BannerInfoHeaderView { $0.setLabel(textColor: UIColor(resource: .drWhite), font: UIFont.suit(.body_semi_13)) } - visitDateLabel.do { - $0.setLabel(textColor: UIColor(resource: .gray400), font: UIFont.suit(.body_semi_15)) - } + visitDateLabel.setLabel(textColor: UIColor(resource: .gray400), font: UIFont.suit(.body_semi_15)) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Commons/LocationFilter/Views/LocationFilterView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Commons/LocationFilter/Views/LocationFilterView.swift index 4960bb11..8ac52392 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Commons/LocationFilter/Views/LocationFilterView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Commons/LocationFilter/Views/LocationFilterView.swift @@ -108,30 +108,29 @@ final class LocationFilterView: BaseView { } override func setStyle() { - cityCollectionView.do { - $0.showsVerticalScrollIndicator = false - } + cityCollectionView.showsVerticalScrollIndicator = false bottomSheetView.do { $0.backgroundColor = UIColor(resource: .drWhite) $0.roundCorners(cornerRadius: 16, maskedCorners: [.layerMinXMinYCorner, .layerMaxXMinYCorner]) } - titleLabel.do { - $0.setLabel(text:StringLiterals.LocationFilter.title,textColor: UIColor(resource: .drBlack), font: UIFont.suit(.title_bold_18)) - } + titleLabel.setLabel(text:StringLiterals.LocationFilter.title, + textColor: UIColor(resource: .drBlack), + font: UIFont.suit(.title_bold_18)) closeButton.do { $0.setImage(UIImage(resource: .btnClose), for: .normal) $0.addTarget(self, action: #selector(closeLocationFilterView), for: .touchUpInside) } - lineView.do { - $0.backgroundColor = UIColor(resource: .gray200) - } + lineView.backgroundColor = UIColor(resource: .gray200) applyButton.do { - $0.roundedButton(cornerRadius: 14, maskedCorners: [.layerMinXMinYCorner, .layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner]) + $0.roundedButton(cornerRadius: 14, maskedCorners: [.layerMinXMinYCorner, + .layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner]) $0.backgroundColor = UIColor(resource: .gray200) $0.setTitle(StringLiterals.LocationFilter.apply, for: .normal) $0.setTitleColor(UIColor(resource: .gray400), for: .normal) diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Course/Views/Cells/CourseListCollectionViewCell.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Course/Views/Cells/CourseListCollectionViewCell.swift index 1caaead9..78f542ee 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Course/Views/Cells/CourseListCollectionViewCell.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Course/Views/Cells/CourseListCollectionViewCell.swift @@ -156,28 +156,20 @@ final class CourseListCollectionViewCell: BaseCollectionViewCell { $0.backgroundColor = UIColor(resource: .deepPurple) } - likeNumLabel.do { - $0.setLabel(textColor: UIColor(resource: .drWhite), font: UIFont.suit(.body_bold_13)) - } + likeNumLabel.setLabel(textColor: UIColor(resource: .drWhite), font: UIFont.suit(.body_bold_13)) - locationLabel.do { - $0.setLabel(numberOfLines: 1, textColor: UIColor(resource: .gray400), font: UIFont.suit(.body_med_13)) - } + locationLabel.setLabel(numberOfLines: 1, + textColor: UIColor(resource: .gray400), + font: UIFont.suit(.body_med_13)) - titleLabel.do { - $0.setLabel(alignment: .left, - numberOfLines: 2, - textColor: UIColor(resource: .drBlack), - font: UIFont.systemFont(ofSize: 15, weight: .bold)) - } + titleLabel.setLabel(alignment: .left, + numberOfLines: 2, + textColor: UIColor(resource: .drBlack), + font: UIFont.systemFont(ofSize: 15, weight: .bold)) - coastLabel.do { - $0.setLabel(textColor: UIColor(resource: .gray400), font: UIFont.suit(.cap_reg_11)) - } + coastLabel.setLabel(textColor: UIColor(resource: .gray400), font: UIFont.suit(.cap_reg_11)) - timeLabel.do { - $0.setLabel(textColor: UIColor(resource: .gray400), font: UIFont.suit(.cap_reg_11)) - } + timeLabel.setLabel(textColor: UIColor(resource: .gray400), font: UIFont.suit(.cap_reg_11)) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Course/Views/CourseNavigationBarView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Course/Views/CourseNavigationBarView.swift index 8db11ce8..a5d9ddce 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Course/Views/CourseNavigationBarView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Course/Views/CourseNavigationBarView.swift @@ -60,16 +60,18 @@ final class CourseNavigationBarView: BaseView { } override func setStyle() { - - courseLabel.do { - $0.setLabel(text: StringLiterals.Course.course, textColor: UIColor(resource: .drBlack), font: UIFont.suit(.title_bold_20)) - } + courseLabel.setLabel(text: StringLiterals.Course.course, + textColor: UIColor(resource: .drBlack), + font: UIFont.suit(.title_bold_20)) addCourseButton.do { - $0.roundedButton(cornerRadius: 15, maskedCorners: [.layerMinXMinYCorner, .layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner]) $0.backgroundColor = UIColor(resource: .deepPurple) $0.setImage(.plusSchedule, for: .normal) $0.addTarget(self, action: #selector(didTapAddCourseButton), for: .touchUpInside) + $0.roundedButton(cornerRadius: 15, maskedCorners: [.layerMinXMinYCorner, + .layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner]) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/CourseDetail/Views/DeleteCourseSettingView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/CourseDetail/Views/DeleteCourseSettingView.swift index a1e9aba5..b7cc4447 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/CourseDetail/Views/DeleteCourseSettingView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/CourseDetail/Views/DeleteCourseSettingView.swift @@ -27,6 +27,7 @@ final class DeleteCourseSettingView: BaseView { override func setHierarchy() { self.addSubview(settingStackView) + settingStackView.addArrangedSubviews(titleLabel, deleteLabel) } @@ -43,12 +44,10 @@ final class DeleteCourseSettingView: BaseView { $0.distribution = .fillEqually } - titleLabel.do { - $0.setLabel(text: StringLiterals.CourseDetail.settingDateCourse, - alignment: .center, - textColor: UIColor(resource: .drBlack), - font: UIFont.suit(.title_bold_18)) - } + titleLabel.setLabel(text: StringLiterals.CourseDetail.settingDateCourse, + alignment: .center, + textColor: UIColor(resource: .drBlack), + font: UIFont.suit(.title_bold_18)) deleteLabel.do { $0.isUserInteractionEnabled = true diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/CourseDetail/Views/TimelineHeaderView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/CourseDetail/Views/TimelineHeaderView.swift index a0fd91df..cc322aba 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/CourseDetail/Views/TimelineHeaderView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/CourseDetail/Views/TimelineHeaderView.swift @@ -58,21 +58,15 @@ final class TimelineHeaderView: UICollectionReusableView { func setStyle() { titleLabel.do { - $0.setLabel(text: StringLiterals.CourseDetail.timelineInfoLabel, textColor: UIColor(resource: .drBlack), font: UIFont.suit(.title_bold_18)) + $0.setLabel(text: StringLiterals.CourseDetail.timelineInfoLabel, + textColor: UIColor(resource: .drBlack), + font: UIFont.suit(.title_bold_18)) $0.numberOfLines = 1 } - subLabel.do { - $0.setLabel( - text:"12:00 PM 시작", - textColor: UIColor( - resource: .gray400 - ), - font: UIFont.suit( - .body_semi_15 - ) - ) - } + subLabel.setLabel(text:"12:00 PM 시작", + textColor: UIColor(resource: .gray400), + font: UIFont.suit(.body_semi_15)) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/Cells/DateCardCollectionViewCell.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/Cells/DateCardCollectionViewCell.swift index 73bebf9f..6bd6d68f 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/Cells/DateCardCollectionViewCell.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/Cells/DateCardCollectionViewCell.swift @@ -168,7 +168,10 @@ final class DateCardCollectionViewCell: BaseCollectionViewCell { $0.titleLabel?.textColor = UIColor(resource: .drWhite) $0.backgroundColor = UIColor(resource: .deepPurple) $0.contentEdgeInsets = UIEdgeInsets(top: 2, left: 10, bottom: 2, right: 10) - $0.roundedButton(cornerRadius: 10, maskedCorners: [.layerMaxXMaxYCorner, .layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMinXMinYCorner]) + $0.roundedButton(cornerRadius: 10, maskedCorners: [.layerMaxXMaxYCorner, + .layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMinXMinYCorner]) } firstTagButton.do { @@ -261,11 +264,20 @@ extension DateCardCollectionViewCell { func setColor(index: Int) { let colorIndex = index % 3 if colorIndex == 0 { - setColorToLabel(bgColor: UIColor(resource: .pink200), topImage: UIImage(resource: .lilacTop), bottomImage: UIImage(resource: .lilacBottom), buttonColor: UIColor(resource: .pink100)) + setColorToLabel(bgColor: UIColor(resource: .pink200), + topImage: UIImage(resource: .lilacTop), + bottomImage: UIImage(resource: .lilacBottom), + buttonColor: UIColor(resource: .pink100)) } else if colorIndex == 1 { - setColorToLabel(bgColor: UIColor(resource: .purple200), topImage: UIImage(resource: .deepPurpleTop), bottomImage: UIImage(resource: .deepPurpleBottom), buttonColor: UIColor(resource: .purple100)) + setColorToLabel(bgColor: UIColor(resource: .purple200), + topImage: UIImage(resource: .deepPurpleTop), + bottomImage: UIImage(resource: .deepPurpleBottom), + buttonColor: UIColor(resource: .purple100)) } else { - setColorToLabel(bgColor: UIColor(resource: .lime), topImage: UIImage(resource: .limeTop), bottomImage: UIImage(resource: .limeBottom), buttonColor: UIColor(resource: .lime100)) + setColorToLabel(bgColor: UIColor(resource: .lime), + topImage: UIImage(resource: .limeTop), + bottomImage: UIImage(resource: .limeBottom), + buttonColor: UIColor(resource: .lime100)) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/Cells/DateTimeLineCollectionViewCell.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/Cells/DateTimeLineCollectionViewCell.swift index 3cfa8d22..afb7f5bc 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/Cells/DateTimeLineCollectionViewCell.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/Cells/DateTimeLineCollectionViewCell.swift @@ -97,9 +97,7 @@ final class DateTimeLineCollectionViewCell: BaseCollectionViewCell { $0.layer.cornerRadius = 12 } - indexNumLabel.do { - $0.setLabel(textColor: UIColor(resource: .drWhite), font: UIFont.suit(.body_bold_13)) - } + indexNumLabel.setLabel(textColor: UIColor(resource: .drWhite), font: UIFont.suit(.body_bold_13)) locationLabel.setLabel(alignment: .left, numberOfLines: 1, @@ -111,9 +109,7 @@ final class DateTimeLineCollectionViewCell: BaseCollectionViewCell { $0.layer.cornerRadius = 10 } - timeLabel.do { - $0.setLabel(textColor: UIColor(resource: .drBlack), font: UIFont.suit(.body_med_13)) - } + timeLabel.setLabel(textColor: UIColor(resource: .drBlack), font: UIFont.suit(.body_med_13)) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/Cells/PastDateCollectionViewCell.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/Cells/PastDateCollectionViewCell.swift index 5b4daa79..492cd9ad 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/Cells/PastDateCollectionViewCell.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/Cells/PastDateCollectionViewCell.swift @@ -127,15 +127,14 @@ final class PastDateCollectionViewCell: BaseCollectionViewCell { override func setStyle() { self.backgroundColor = UIColor(resource: .lilac) - self.roundCorners(cornerRadius: 20, maskedCorners: [.layerMaxXMaxYCorner, .layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMinXMinYCorner]) + self.roundCorners(cornerRadius: 20, maskedCorners: [.layerMaxXMaxYCorner, + .layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMinXMinYCorner]) - ribbonImageView.do { - $0.contentMode = .scaleAspectFill - } + ribbonImageView.contentMode = .scaleAspectFill - dateLabel.do { - $0.setLabel(textColor: UIColor(resource: .drBlack), font: UIFont.suit(.body_semi_13)) - } + dateLabel.setLabel(textColor: UIColor(resource: .drBlack), font: UIFont.suit(.body_semi_13)) firstTagButton.do { $0.setButtonStatus(buttonType: tagButtonType) @@ -175,21 +174,13 @@ final class PastDateCollectionViewCell: BaseCollectionViewCell { $0.adjustsImageWhenDisabled = false } - dotDividerView.do { - $0.image = UIImage(resource: .dottedLine) - } + dotDividerView.image = UIImage(resource: .dottedLine) - leftCircleInsetImageView.do { - $0.image = UIImage(resource: .leftCardInset) - } + leftCircleInsetImageView.image = UIImage(resource: .leftCardInset) - rightCircleInsetImageView.do { - $0.image = UIImage(resource: .rightCardInset) - } + rightCircleInsetImageView.image = UIImage(resource: .rightCardInset) - locationLabel.do { - $0.setLabel(textColor: UIColor(resource: .drBlack), font: UIFont.suit(.body_semi_13)) - } + locationLabel.setLabel(textColor: UIColor(resource: .drBlack), font: UIFont.suit(.body_semi_13)) titleLabel.setLabel(alignment: .left, numberOfLines: 2, @@ -227,11 +218,17 @@ extension PastDateCollectionViewCell { func setColor(index: Int) { let colorIndex = index % 3 if colorIndex == 0 { - setColorToLabel(bgColor: UIColor(resource: .pink200), ribbonImage: UIImage(resource: .lilacRibbon), buttonColor: UIColor(resource: .pink100)) + setColorToLabel(bgColor: UIColor(resource: .pink200), + ribbonImage: UIImage(resource: .lilacRibbon), + buttonColor: UIColor(resource: .pink100)) } else if colorIndex == 1 { - setColorToLabel(bgColor: UIColor(resource: .purple200), ribbonImage: UIImage(resource: .deepPurpleRibbon), buttonColor: UIColor(resource: .purple100)) + setColorToLabel(bgColor: UIColor(resource: .purple200), + ribbonImage: UIImage(resource: .deepPurpleRibbon), + buttonColor: UIColor(resource: .purple100)) } else { - setColorToLabel(bgColor: UIColor(resource: .lime), ribbonImage: UIImage(resource: .limeRibbon), buttonColor: UIColor(resource: .lime100)) + setColorToLabel(bgColor: UIColor(resource: .lime), + ribbonImage: UIImage(resource: .limeRibbon), + buttonColor: UIColor(resource: .lime100)) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/DateDetailContentView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/DateDetailContentView.swift index 66624382..f4961d21 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/DateDetailContentView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/DateDetailContentView.swift @@ -158,9 +158,7 @@ final class DateDetailContentView: BaseView { $0.clipsToBounds = true } - dateLabel.do { - $0.setLabel(textColor: UIColor(resource: .drBlack), font: UIFont.suit(.body_semi_15)) - } + dateLabel.setLabel(textColor: UIColor(resource: .drBlack), font: UIFont.suit(.body_semi_15)) dDayButton.do { $0.isHidden = true @@ -168,7 +166,10 @@ final class DateDetailContentView: BaseView { $0.titleLabel?.textColor = UIColor(resource: .drWhite) $0.backgroundColor = UIColor(resource: .deepPurple) $0.contentEdgeInsets = UIEdgeInsets(top: 2, left: 10, bottom: 2, right: 10) - $0.roundedButton(cornerRadius: 10, maskedCorners: [.layerMaxXMaxYCorner, .layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMinXMinYCorner]) + $0.roundedButton(cornerRadius: 10, maskedCorners: [.layerMaxXMaxYCorner, + .layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMinXMinYCorner]) } firstTagButton.do { @@ -209,9 +210,7 @@ final class DateDetailContentView: BaseView { $0.adjustsImageWhenDisabled = false } - locationLabel.do { - $0.setLabel(textColor: UIColor(resource: .gray500), font: UIFont.suit(.body_med_15)) - } + locationLabel.setLabel(textColor: UIColor(resource: .gray500), font: UIFont.suit(.body_med_15)) titleLabel.setLabel(alignment: .left, numberOfLines: 2, @@ -223,9 +222,7 @@ final class DateDetailContentView: BaseView { $0.roundCorners(cornerRadius: 20, maskedCorners: [.layerMinXMinYCorner, .layerMaxXMinYCorner]) } - dateStartTimeLabel.do { - $0.setLabel(textColor: UIColor(resource: .drBlack), font: UIFont.suit(.body_semi_15)) - } + dateStartTimeLabel.setLabel(textColor: UIColor(resource: .drBlack), font: UIFont.suit(.body_semi_15)) dateTimeLineCollectionView.do { $0.backgroundColor = UIColor(resource: .drWhite) @@ -306,11 +303,17 @@ extension DateDetailContentView { func setColor(index: Int) { let colorIndex = index % 3 if colorIndex == 0 { - setColorToLabel(bgColor: UIColor(resource: .pink200), ribbonImage: UIImage(resource: .lilacRibbon), buttonColor: UIColor(resource: .pink100)) + setColorToLabel(bgColor: UIColor(resource: .pink200), + ribbonImage: UIImage(resource: .lilacRibbon), + buttonColor: UIColor(resource: .pink100)) } else if colorIndex == 1 { - setColorToLabel(bgColor: UIColor(resource: .purple200), ribbonImage: UIImage(resource: .deepPurpleRibbon), buttonColor: UIColor(resource: .purple100)) + setColorToLabel(bgColor: UIColor(resource: .purple200), + ribbonImage: UIImage(resource: .deepPurpleRibbon), + buttonColor: UIColor(resource: .purple100)) } else { - setColorToLabel(bgColor: UIColor(resource: .lime), ribbonImage: UIImage(resource: .limeRibbon), buttonColor: UIColor(resource: .lime100)) + setColorToLabel(bgColor: UIColor(resource: .lime), + ribbonImage: UIImage(resource: .limeRibbon), + buttonColor: UIColor(resource: .lime100)) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/DateScheduleDeleteView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/DateScheduleDeleteView.swift index 2089fc83..842e9f6e 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/DateScheduleDeleteView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/DateSchedule/View/DateScheduleDeleteView.swift @@ -35,12 +35,10 @@ final class DateScheduleDeleteView: BaseView { } override func setStyle() { - titleLabel.do { - $0.setLabel(text: StringLiterals.DateSchedule.dateSetting, - alignment: .center, - textColor: UIColor(resource: .drBlack), - font: UIFont.suit(.title_bold_18)) - } + titleLabel.setLabel(text: StringLiterals.DateSchedule.dateSetting, + alignment: .center, + textColor: UIColor(resource: .drBlack), + font: UIFont.suit(.title_bold_18)) deleteLabel.do { $0.setLabel(text: StringLiterals.DateSchedule.deleteDate, diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/Cells/HotDateCourseCell.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/Cells/HotDateCourseCell.swift index ef14f9f2..21d943e8 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/Cells/HotDateCourseCell.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/Cells/HotDateCourseCell.swift @@ -161,12 +161,17 @@ final class HotDateCourseCell: BaseCollectionViewCell { $0.image = UIImage(resource: .placeholder) $0.clipsToBounds = true $0.contentMode = .scaleAspectFill - $0.roundCorners(cornerRadius: 13, maskedCorners: [.layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner]) + $0.roundCorners(cornerRadius: 13, maskedCorners: [.layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner]) } likeView.do { $0.backgroundColor = UIColor(resource: .deepPurple) - $0.roundCorners(cornerRadius: 12, maskedCorners: [.layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner, .layerMinXMinYCorner]) + $0.roundCorners(cornerRadius: 12, maskedCorners: [.layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner, + .layerMinXMinYCorner]) } likeImage.image = UIImage(resource: .heartIcon) @@ -185,15 +190,17 @@ final class HotDateCourseCell: BaseCollectionViewCell { $0.textAlignment = .left $0.backgroundColor = UIColor(resource: .drWhite) $0.numberOfLines = 2 - $0.lineBreakMode = .byWordWrapping $0.setLabel(alignment: .left, - textColor: UIColor(resource: .drBlack), - font: UIFont.systemFont(ofSize: 17, weight: .bold)) + textColor: UIColor(resource: .drBlack), + font: UIFont.systemFont(ofSize: 17, weight: .bold)) } costView.do { $0.backgroundColor = UIColor(resource: .gray100) - $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner, .layerMinXMinYCorner]) + $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner, + .layerMinXMinYCorner]) } costImage.image = UIImage(resource: .coastIcon) @@ -203,24 +210,31 @@ final class HotDateCourseCell: BaseCollectionViewCell { $0.textColor = UIColor(resource: .gray400) $0.font = UIFont.suit(.body_med_13) $0.setPadding(top: 4, left: 0, bottom: 4, right: 10) - $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner, .layerMinXMinYCorner]) + $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner, + .layerMinXMinYCorner]) } timeView.do { $0.backgroundColor = UIColor(resource: .gray100) - $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner, .layerMinXMinYCorner]) + $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner, + .layerMinXMinYCorner]) } - timeImage.do { - $0.image = UIImage(resource: .timeIcon) - } + timeImage.image = UIImage(resource: .timeIcon) timeLabel.do { $0.backgroundColor = UIColor(resource: .gray100) $0.textColor = UIColor(resource: .gray400) $0.font = UIFont.suit(.body_med_13) - $0.roundedLabel(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner, .layerMinXMinYCorner]) $0.setPadding(top: 4, left: 0, bottom: 4, right: 10) + $0.roundedLabel(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner, + .layerMinXMinYCorner]) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/Cells/MainHeaderView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/Cells/MainHeaderView.swift index 9a4cc5d2..ca3bca3d 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/Cells/MainHeaderView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/Cells/MainHeaderView.swift @@ -82,13 +82,11 @@ final class MainHeaderView: UICollectionReusableView { func setStyle() { self.backgroundColor = UIColor(resource: .deepPurple) - backgroundView.do { - $0.backgroundColor = UIColor(resource: .drWhite) - } + backgroundView.backgroundColor = UIColor(resource: .drWhite) - subLabel.do { - $0.setLabel(alignment: .left, textColor: UIColor(resource: .gray400), font: UIFont.suit(.body_med_13)) - } + subLabel.setLabel(alignment: .left, + textColor: UIColor(resource: .gray400), + font: UIFont.suit(.body_med_13)) viewMoreButton.do { $0.setTitle(StringLiterals.Main.viewMore, for: .normal) diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/Cells/NewDateCourseCell.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/Cells/NewDateCourseCell.swift index 69847634..133cb4a4 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/Cells/NewDateCourseCell.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/Cells/NewDateCourseCell.swift @@ -103,8 +103,8 @@ final class NewDateCourseCell: BaseCollectionViewCell { } dateNameLabel.snp.makeConstraints { - $0.top.leading.equalToSuperview() - $0.trailing.bottom.lessThanOrEqualToSuperview() + $0.top.horizontalEdges.equalToSuperview() + $0.bottom.lessThanOrEqualToSuperview() } costView.snp.makeConstraints { @@ -157,12 +157,18 @@ final class NewDateCourseCell: BaseCollectionViewCell { $0.image = UIImage(resource: .placeholder) $0.clipsToBounds = true $0.contentMode = .scaleAspectFill - $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner, .layerMinXMinYCorner]) + $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner, + .layerMinXMinYCorner]) } likeView.do { $0.backgroundColor = UIColor(resource: .deepPurple) - $0.roundCorners(cornerRadius: 12, maskedCorners: [.layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner, .layerMinXMinYCorner]) + $0.roundCorners(cornerRadius: 12, maskedCorners: [.layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner, + .layerMinXMinYCorner]) } likeImage.image = UIImage(resource: .heartIcon) @@ -181,7 +187,6 @@ final class NewDateCourseCell: BaseCollectionViewCell { $0.textAlignment = .left $0.backgroundColor = UIColor(resource: .drWhite) $0.numberOfLines = 2 - $0.lineBreakMode = .byWordWrapping $0.setLabel(alignment: .left, textColor: UIColor(resource: .drBlack), font: UIFont.systemFont(ofSize: 17, weight: .bold)) @@ -189,7 +194,10 @@ final class NewDateCourseCell: BaseCollectionViewCell { costView.do { $0.backgroundColor = UIColor(resource: .gray100) - $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner, .layerMinXMinYCorner]) + $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner, + .layerMinXMinYCorner]) } costImage.image = UIImage(resource: .coastIcon) @@ -199,24 +207,31 @@ final class NewDateCourseCell: BaseCollectionViewCell { $0.textColor = UIColor(resource: .gray400) $0.font = UIFont.suit(.body_med_13) $0.setPadding(top: 4, left: 0, bottom: 4, right: 10) - $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner, .layerMinXMinYCorner]) + $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner, + .layerMinXMinYCorner]) } timeView.do { $0.backgroundColor = UIColor(resource: .gray100) - $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner, .layerMinXMinYCorner]) + $0.roundCorners(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner, + .layerMinXMinYCorner]) } - timeImage.do { - $0.image = UIImage(resource: .timeIcon) - } + timeImage.image = UIImage(resource: .timeIcon) timeLabel.do { $0.backgroundColor = UIColor(resource: .gray100) $0.textColor = UIColor(resource: .gray400) $0.font = UIFont.suit(.body_med_13) - $0.roundedLabel(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner, .layerMinXMinYCorner]) $0.setPadding(top: 4, left: 0, bottom: 4, right: 10) + $0.roundedLabel(cornerRadius: 14, maskedCorners: [.layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner, + .layerMinXMinYCorner]) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/DateTicketView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/DateTicketView.swift index cbdfe865..9a7c31a5 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/DateTicketView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/DateTicketView.swift @@ -80,7 +80,10 @@ final class DateTicketView: BaseView { } dDayLabel.do { - $0.roundedLabel(cornerRadius: 10, maskedCorners: [.layerMinXMinYCorner, .layerMaxXMinYCorner, .layerMinXMaxYCorner, .layerMaxXMaxYCorner]) + $0.roundedLabel(cornerRadius: 10, maskedCorners: [.layerMinXMinYCorner, + .layerMaxXMinYCorner, + .layerMinXMaxYCorner, + .layerMaxXMaxYCorner]) $0.setLabel(textColor: UIColor(resource: .drWhite), font: UIFont.suit(.body_bold_13)) $0.setPadding(top: 0, left: 10, bottom: 0, right: 10) $0.backgroundColor = UIColor(resource: .deepPurple) @@ -91,17 +94,11 @@ final class DateTicketView: BaseView { textColor: UIColor(resource: .drWhite), font: UIFont.systemFont(ofSize: 20,weight: .bold)) - dateLabel.do { - $0.setLabel(textColor: UIColor(resource: .lightPurple), font: UIFont.suit(.body_med_15)) - } + dateLabel.setLabel(textColor: UIColor(resource: .lightPurple), font: UIFont.suit(.body_med_15)) - startTimeLabel.do { - $0.setLabel(textColor: UIColor(resource: .lightPurple), font: UIFont.suit(.body_med_15)) - } + startTimeLabel.setLabel(textColor: UIColor(resource: .lightPurple), font: UIFont.suit(.body_med_15)) - moveButton.do { - $0.setImage(UIImage(resource: .icRightarrowPurple), for: .normal) - } + moveButton.setImage(UIImage(resource: .icRightarrowPurple), for: .normal) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/EmptyTicketView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/EmptyTicketView.swift index c42c72f3..cb651a1d 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/EmptyTicketView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Main/Views/EmptyTicketView.swift @@ -57,17 +57,17 @@ final class EmptyTicketView: BaseView { $0.contentMode = .scaleAspectFill } - emptyDateLabel.do { - $0.setLabel(text: StringLiterals.Main.emptyDateTitle, alignment: .left, textColor: UIColor(resource: .drWhite), font: UIFont.suit(.title_bold_18)) - } + emptyDateLabel.setLabel(text: StringLiterals.Main.emptyDateTitle, + alignment: .left, + textColor: UIColor(resource: .drWhite), + font: UIFont.suit(.title_bold_18)) - goToRegisterLabel.do { - $0.setLabel(text: StringLiterals.Main.emptyDateSub, alignment: .left, textColor: UIColor(resource: .lightPurple), font: UIFont.suit(.body_med_15)) - } + goToRegisterLabel.setLabel(text: StringLiterals.Main.emptyDateSub, + alignment: .left, + textColor: UIColor(resource: .lightPurple), + font: UIFont.suit(.body_med_15)) - moveButton.do { - $0.setImage(UIImage(resource: .icPlus), for: .normal) - } + moveButton.setImage(UIImage(resource: .icPlus), for: .normal) } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Onboarding/Views/Cells/OnboardingCollectionViewCell.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Onboarding/Views/Cells/OnboardingCollectionViewCell.swift index 297b430d..3d251928 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Onboarding/Views/Cells/OnboardingCollectionViewCell.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Onboarding/Views/Cells/OnboardingCollectionViewCell.swift @@ -61,17 +61,11 @@ final class OnboardingCollectionViewCell: BaseCollectionViewCell { $0.clipsToBounds = true } - mainInfoLabel.do { - $0.setLabel(textColor: UIColor(resource: .drBlack), font: UIFont.suit(.title_extra_24)) - } + mainInfoLabel.setLabel(textColor: UIColor(resource: .drBlack), font: UIFont.suit(.title_extra_24)) - subInfoLabel.do { - $0.setLabel(textColor: UIColor(resource: .gray500), font: UIFont.suit(.body_med_15)) - } + subInfoLabel.setLabel(textColor: UIColor(resource: .gray500), font: UIFont.suit(.body_med_15)) - hintInfoLabel.do { - $0.setLabel(textColor: UIColor(resource: .gray400), font: UIFont.suit(.cap_reg_11)) - } + hintInfoLabel.setLabel(textColor: UIColor(resource: .gray400), font: UIFont.suit(.cap_reg_11)) } // 각 온보딩 페이지에 맞는 데이터를 세팅해주는 메소드 diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/PointSystem/Views/Cells/PointSystemCollectionViewCell.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/PointSystem/Views/Cells/PointSystemCollectionViewCell.swift index d2b7201f..d165abcf 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/PointSystem/Views/Cells/PointSystemCollectionViewCell.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/PointSystem/Views/Cells/PointSystemCollectionViewCell.swift @@ -56,13 +56,17 @@ final class PointSystemCollectionViewCell: BaseCollectionViewCell { mainLabel.do { $0.backgroundColor = UIColor(resource: .gray100) - $0.setLabel(alignment: .left, textColor: UIColor(resource: .drBlack), font: UIFont.suit(.body_bold_15)) + $0.setLabel(alignment: .left, + textColor: UIColor(resource: .drBlack), + font: UIFont.suit(.body_bold_15)) $0.numberOfLines = 2 } subLabel.do { $0.backgroundColor = UIColor(resource: .gray100) - $0.setLabel(alignment: .left, textColor: UIColor(resource: .gray500), font: UIFont.suit(.body_med_13)) + $0.setLabel(alignment: .left, + textColor: UIColor(resource: .gray500), + font: UIFont.suit(.body_med_13)) $0.numberOfLines = 1 } } diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Profile/Views/ProfileImageSettingView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Profile/Views/ProfileImageSettingView.swift index 055641cf..0e15cbe1 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Profile/Views/ProfileImageSettingView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Profile/Views/ProfileImageSettingView.swift @@ -29,7 +29,9 @@ final class ProfileImageSettingView: BaseView { override func setHierarchy() { self.addSubview(settingStackView) - settingStackView.addArrangedSubviews(titleLabel, registerLabel, deleteLabel) + settingStackView.addArrangedSubviews(titleLabel, + registerLabel, + deleteLabel) } override func setLayout() { @@ -45,13 +47,11 @@ final class ProfileImageSettingView: BaseView { $0.distribution = .fillEqually } - titleLabel.do { - $0.setLabel(text: StringLiterals.Profile.settingImage, - alignment: .center, - textColor: UIColor(resource: .drBlack), - font: UIFont.suit(.title_bold_18)) - } - + titleLabel.setLabel(text: StringLiterals.Profile.settingImage, + alignment: .center, + textColor: UIColor(resource: .drBlack), + font: UIFont.suit(.title_bold_18)) + registerLabel.do { $0.isUserInteractionEnabled = true $0.setLabel(text: StringLiterals.Profile.registerImage, diff --git a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Profile/Views/ProfileView.swift b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Profile/Views/ProfileView.swift index d4396085..69bcd1d6 100644 --- a/DATEROAD-iOS/DATEROAD-iOS/Presentation/Profile/Views/ProfileView.swift +++ b/DATEROAD-iOS/DATEROAD-iOS/Presentation/Profile/Views/ProfileView.swift @@ -177,11 +177,10 @@ final class ProfileView: BaseView { $0.clipsToBounds = true $0.layer.cornerRadius = 14 $0.placeholder = StringLiterals.Profile.nicknamePlaceholder - $0.setPlaceholder(placeholder: StringLiterals.Profile.nicknamePlaceholder, fontColor: UIColor(resource: .gray300), font: UIFont.suit(.body_semi_15)) - let attributes: [NSAttributedString.Key: Any] = [ - .font: UIFont.systemFont(ofSize: 15, weight: .semibold), - .foregroundColor: UIColor(resource: .drBlack) - ] + $0.setPlaceholder(placeholder: StringLiterals.Profile.nicknamePlaceholder, + fontColor: UIColor(resource: .gray300), + font: UIFont.suit(.body_semi_15)) + let attributes: [NSAttributedString.Key: Any] = [.font: UIFont.systemFont(ofSize: 15, weight: .semibold), .foregroundColor: UIColor(resource: .drBlack)] $0.defaultTextAttributes = attributes } @@ -196,20 +195,16 @@ final class ProfileView: BaseView { $0.setErrorLabel(text: StringLiterals.Profile.disabledNickname, errorType: warningType) } - countLabel.do { - $0.setLabel(text: StringLiterals.Profile.countPlaceholder, - alignment: .right , - textColor: UIColor(resource: .gray300), - font: UIFont.suit(.cap_reg_11)) - } - - datingTendencyLabel.do { - $0.setLabel(text: StringLiterals.Profile.dateTendency, - alignment: .left, - textColor: UIColor(resource: .drBlack), - font: UIFont.suit(.body_bold_15)) - } + countLabel.setLabel(text: StringLiterals.Profile.countPlaceholder, + alignment: .right , + textColor: UIColor(resource: .gray300), + font: UIFont.suit(.cap_reg_11)) + datingTendencyLabel.setLabel(text: StringLiterals.Profile.dateTendency, + alignment: .left, + textColor: UIColor(resource: .drBlack), + font: UIFont.suit(.body_bold_15)) + registerButton.do { $0.setTitle(StringLiterals.Profile.registerProfile, for: .normal) $0.setButtonStatus(buttonType: disabledButtonType) @@ -246,7 +241,7 @@ extension ProfileView { } func updateTagErrLabel(isValid: Bool) { - tagErrMessageLabel.isHidden = isValid ? true : false + tagErrMessageLabel.isHidden = isValid } func updateNicknameCount(count: Int) { @@ -273,15 +268,14 @@ extension ProfileView { } func updateRegisterButton(isValid: Bool) { - isValid ? registerButton.setButtonStatus(buttonType: enabledButtonType) + isValid + ? registerButton.setButtonStatus(buttonType: enabledButtonType) : registerButton.setButtonStatus(buttonType: disabledButtonType) registerButton.titleLabel?.font = UIFont.suit(.body_bold_15) } func updateProfileImage(image: UIImage) { - profileImageView.do { - $0.image = image - } + profileImageView.image = image } } From 220494fc7e5cf2e89c2d27b7099945666602e4cb Mon Sep 17 00:00:00 2001 From: seuriseuljjeok Date: Mon, 11 Nov 2024 01:16:03 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20=EB=B9=8C=EB=93=9C=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20&=20=EB=B2=84=EC=A0=84=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20(#274)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DATEROAD-iOS/DATEROAD-iOS.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DATEROAD-iOS/DATEROAD-iOS.xcodeproj/project.pbxproj b/DATEROAD-iOS/DATEROAD-iOS.xcodeproj/project.pbxproj index e85c493d..54af8959 100644 --- a/DATEROAD-iOS/DATEROAD-iOS.xcodeproj/project.pbxproj +++ b/DATEROAD-iOS/DATEROAD-iOS.xcodeproj/project.pbxproj @@ -2372,7 +2372,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.3; + MARKETING_VERSION = 1.0.4; PRODUCT_BUNDLE_IDENTIFIER = "com.DateRoad.DateRoad-iOS"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -2413,7 +2413,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.3; + MARKETING_VERSION = 1.0.4; PRODUCT_BUNDLE_IDENTIFIER = "com.DateRoad.DateRoad-iOS"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "";