[Fix] resolve Conflicts (#256)

# Conflicts: # DATEROAD-iOS/DATEROAD-iOS/Presentation/AddSchedule/Views/AddScheduleFirst/InAddScheduleFirstView.swift # DATEROAD-iOS/DATEROAD-iOS/Presentation/AddSchedule/Views/AddScheduleSecond/InAddScheduleSecondView.swift
TeamDATEROAD · Nov 10, 2024 · 2b4e8eb · 2b4e8eb
2 parents 4701d80 + 4a9db1c
commit 2b4e8eb
Show file tree

Hide file tree

Showing 34 changed files with 353 additions and 415 deletions.
diff --git a/DATEROAD-iOS/DATEROAD-iOS.xcodeproj/project.pbxproj b/DATEROAD-iOS/DATEROAD-iOS.xcodeproj/project.pbxproj
@@ -2400,7 +2400,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 = "";
@@ -2441,7 +2441,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 = "";

diff --git 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
@@ -28,6 +28,7 @@ final class DRCustomAlertView: BaseView {
 
     override func setHierarchy() {
         self.addSubviews(alertView)
+
         alertView.addSubviews(titleLabel,
                               descriptionLabel,
                               longButton,
@@ -37,54 +38,59 @@ 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)
         }
     }
 
     override func setStyle() {
         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
@@ -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
@@ -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/...ROAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Cells/AddCourseImageCollectionViewCell.swift b/...ROAD-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
@@ -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/...OAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseFirst/AddCourseFirstView.swift b/...OAD-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseFirst/AddCourseFirstView.swift
@@ -41,17 +41,18 @@ final class AddCourseFirstView: BaseView {
 
     override func setHierarchy() {
         self.addSubview(scrollView)
+
         scrollView.addSubview(scrollContentView)
 
         scrollContentView.addSubviews(
             collectionView,
             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
@@ -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,25 +212,18 @@ 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)
             $0.contentMode = .scaleToFill
         }
 
         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/...D-iOS/DATEROAD-iOS/Presentation/AddCourse/Views/AddCourseSecond/AddCourseSecondView.swift b/...D-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)
     }
 
 }