Skip to content

[Fix] #257 - 레이아웃 코드를 변경하였습니다. #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thingineeer merged 3 commits into from
Mar 6, 2024
Merged

[Fix] #257 - 레이아웃 코드를 변경하였습니다. #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d12ab9e
[Chore] #257 - 오타 수정
thingineeer Feb 22, 2024
b238256
[Chore] #257 - 전체 파일 레이아웃 코드 스타일 변경
thingineeer Mar 5, 2024
c033220
[Chore] #257 - 전체 파일 레이아웃 코드 스타일 변경 2nd
thingineeer Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Runnect-iOS/Runnect-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
CE40BB2D296808B00030ABCA /* DepartureSearchingRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE40BB2C296808B00030ABCA /* DepartureSearchingRouter.swift */; };
CE4545C9295D7AF4003201E1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4545C8295D7AF4003201E1 /* AppDelegate.swift */; };
CE4545CB295D7AF4003201E1 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4545CA295D7AF4003201E1 /* SceneDelegate.swift */; };
CE4545CD295D7AF4003201E1 /* TaBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4545CC295D7AF4003201E1 /* TaBarController.swift */; };
CE4545CD295D7AF4003201E1 /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4545CC295D7AF4003201E1 /* TabBarController.swift */; };
CE4545D2295D7AF5003201E1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CE4545D1295D7AF5003201E1 /* Assets.xcassets */; };
CE4545D5295D7AF5003201E1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CE4545D3295D7AF5003201E1 /* LaunchScreen.storyboard */; };
CE4942AD296FCD2300736701 /* UploadedCourseDetailResponseDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4942AC296FCD2300736701 /* UploadedCourseDetailResponseDto.swift */; };
Expand Down Expand Up @@ -266,7 +266,7 @@
CE4545C5295D7AF4003201E1 /* Runnect-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Runnect-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
CE4545C8295D7AF4003201E1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
CE4545CA295D7AF4003201E1 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
CE4545CC295D7AF4003201E1 /* TaBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaBarController.swift; sourceTree = "<group>"; };
CE4545CC295D7AF4003201E1 /* TabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarController.swift; sourceTree = "<group>"; };
CE4545D1295D7AF5003201E1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
CE4545D4295D7AF5003201E1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
CE4545D6295D7AF5003201E1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -966,7 +966,7 @@
CE6655AB295D7FBC00C64E12 /* TabBar */ = {
isa = PBXGroup;
children = (
CE4545CC295D7AF4003201E1 /* TaBarController.swift */,
CE4545CC295D7AF4003201E1 /* TabBarController.swift */,
);
path = TabBar;
sourceTree = "<group>";
Expand Down Expand Up @@ -1415,7 +1415,7 @@
CE665602295D918000C64E12 /* JsonCoder.swift in Sources */,
DA97A033296E65D80086760E /* CourseUploadingRequestDto.swift in Sources */,
711E18212B38516D00C651CD /* GAManager.swift in Sources */,
CE4545CD295D7AF4003201E1 /* TaBarController.swift in Sources */,
CE4545CD295D7AF4003201E1 /* TabBarController.swift in Sources */,
A3305A97296EF58C000B1A10 /* GoalRewardInfoDto.swift in Sources */,
CE21C024299E5FE500F62AF5 /* UserRouter.swift in Sources */,
71F780502B0893D700B53253 /* MarathonMapCollectionViewCell.swift in Sources */,
Expand Down
8 changes: 5 additions & 3 deletions Runnect-iOS/Runnect-iOS/Global/Extension/UIKit+/UIViewController+.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

import UIKit

import SnapKit

extension UIViewController {

/**
Expand Down Expand Up @@ -74,9 +76,9 @@ extension UIViewController {

self.view.addSubview(emptyView)

emptyView.snp.makeConstraints { make in
make.center.equalTo(view.safeAreaLayoutGuide)
make.leading.trailing.equalTo(view.safeAreaLayoutGuide).inset(80)
emptyView.snp.makeConstraints {
$0.center.equalTo(view.safeAreaLayoutGuide)
$0.leading.trailing.equalTo(view.safeAreaLayoutGuide).inset(80)
}
}

Expand Down
23 changes: 13 additions & 10 deletions Runnect-iOS/Runnect-iOS/Global/UIComponents/CourseDetailInfoView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

import UIKit

import SnapKit
import Then

final class CourseDetailInfoView: UIView {

// MARK: - UI Components
Expand Down Expand Up @@ -60,20 +63,20 @@ extension CourseDetailInfoView {
private func setLayout() {
self.addSubviews(leftImageView, titleLabel, descriptionLabel)

leftImageView.snp.makeConstraints { make in
make.top.leading.bottom.equalToSuperview()
make.width.equalTo(leftImageView.snp.height)
leftImageView.snp.makeConstraints {
$0.top.leading.bottom.equalToSuperview()
$0.width.equalTo(leftImageView.snp.height)
}

titleLabel.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.leading.equalTo(leftImageView.snp.trailing).offset(9)
titleLabel.snp.makeConstraints {
$0.centerY.equalToSuperview()
$0.leading.equalTo(leftImageView.snp.trailing).offset(9)
}

descriptionLabel.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.leading.equalTo(titleLabel.snp.leading).offset(57)
make.trailing.greaterThanOrEqualToSuperview()
descriptionLabel.snp.makeConstraints {
$0.centerY.equalToSuperview()
$0.leading.equalTo(titleLabel.snp.leading).offset(57)
$0.trailing.greaterThanOrEqualToSuperview()
}
}
}
44 changes: 24 additions & 20 deletions Runnect-iOS/Runnect-iOS/Global/UIComponents/CustomAlertVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import UIKit
import Combine

import SnapKit
import Then

final class CustomAlertVC: UIViewController {

// MARK: - Properties
Expand Down Expand Up @@ -69,9 +72,9 @@ extension CustomAlertVC {
/// 이미지 변경
public func setImage(_ image: UIImage, size: CGSize) {
self.alertImageView.image = image
self.alertImageView.snp.updateConstraints { make in
make.width.equalTo(size.width)
make.height.equalTo(size.height)
self.alertImageView.snp.updateConstraints {
$0.width.equalTo(size.width)
$0.height.equalTo(size.height)
}
}

Expand Down Expand Up @@ -121,28 +124,29 @@ extension CustomAlertVC {

alertView.addSubviews(alertImageView, contentsLabel, buttonStackView)

alertView.snp.makeConstraints { make in
make.center.equalTo(view.safeAreaLayoutGuide)
make.leading.trailing.equalTo(view.safeAreaLayoutGuide).inset(31)
alertView.snp.makeConstraints {
$0.center.equalTo(view.safeAreaLayoutGuide)
$0.leading.trailing.equalTo(view.safeAreaLayoutGuide).inset(31)
}

alertImageView.snp.makeConstraints { make in
make.top.equalToSuperview().inset(38)
make.centerX.equalToSuperview()
make.width.equalTo(189)
make.height.equalTo(169)
alertImageView.snp.makeConstraints {
$0.top.equalToSuperview().inset(38)
$0.centerX.equalToSuperview()
$0.width.equalTo(189)
$0.height.equalTo(169)
}

contentsLabel.snp.makeConstraints { make in
make.top.equalTo(alertImageView.snp.bottom).offset(24)
make.leading.trailing.equalToSuperview().inset(10)
make.centerX.equalToSuperview()
contentsLabel.snp.makeConstraints {
$0.top.equalTo(alertImageView.snp.bottom).offset(24)
$0.leading.trailing.equalToSuperview().inset(10)
$0.centerX.equalToSuperview()
}
buttonStackView.snp.makeConstraints { make in
make.top.equalTo(contentsLabel.snp.bottom).offset(26)
make.leading.trailing.equalToSuperview().inset(14)
make.height.equalTo(44)
make.bottom.equalToSuperview().inset(25)

buttonStackView.snp.makeConstraints {
$0.top.equalTo(contentsLabel.snp.bottom).offset(26)
$0.leading.trailing.equalToSuperview().inset(14)
$0.height.equalTo(44)
$0.bottom.equalToSuperview().inset(25)
}
}
}
88 changes: 46 additions & 42 deletions Runnect-iOS/Runnect-iOS/Global/UIComponents/CustomBottomSheetVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import UIKit
import Combine
import CombineCocoa

import SnapKit
import Then

@frozen
enum SheetType {
case image // 가운에 이미지가 있는 시트
Expand Down Expand Up @@ -135,8 +138,9 @@ final class CustomBottomSheetVC: UIViewController {
extension CustomBottomSheetVC {
private func setUI() {
view.addSubview(backgroundView)
backgroundView.snp.makeConstraints { make in
make.edges.equalToSuperview()

backgroundView.snp.makeConstraints {
$0.edges.equalToSuperview()
}
}

Expand All @@ -153,27 +157,27 @@ extension CustomBottomSheetVC {
view.addSubviews(bottomSheetView)
bottomSheetView.addSubviews(contentsLabel, mainImageView, completeButton)

bottomSheetView.snp.makeConstraints { make in
make.leading.bottom.trailing.equalToSuperview()
make.height.equalTo(330)
bottomSheetView.snp.makeConstraints {
$0.leading.bottom.trailing.equalToSuperview()
$0.height.equalTo(330)
}

contentsLabel.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.top.equalToSuperview().inset(30)
contentsLabel.snp.makeConstraints {
$0.centerX.equalToSuperview()
$0.top.equalToSuperview().inset(30)
}

mainImageView.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.top.equalTo(contentsLabel.snp.bottom).offset(24)
make.width.equalTo(267)
make.height.equalTo(158)
mainImageView.snp.makeConstraints {
$0.centerX.equalToSuperview()
$0.top.equalTo(contentsLabel.snp.bottom).offset(24)
$0.width.equalTo(267)
$0.height.equalTo(158)
}

completeButton.snp.makeConstraints { make in
make.top.equalTo(mainImageView.snp.bottom).offset(20)
make.height.equalTo(44)
make.leading.trailing.equalToSuperview().inset(16)
completeButton.snp.makeConstraints {
$0.top.equalTo(mainImageView.snp.bottom).offset(20)
$0.height.equalTo(44)
$0.leading.trailing.equalToSuperview().inset(16)
}
}

Expand All @@ -184,33 +188,33 @@ extension CustomBottomSheetVC {

bottomSheetView.addSubviews(contentsLabel, bottomSheetTextField, dismissIndicatorView, completeButton)

bottomSheetView.snp.makeConstraints { make in
make.leading.bottom.trailing.equalToSuperview()
make.top.equalTo(view.snp.top).offset(topConst)
bottomSheetView.snp.makeConstraints {
$0.leading.bottom.trailing.equalToSuperview()
$0.top.equalTo(view.snp.top).offset(topConst)
}

dismissIndicatorView.snp.makeConstraints { make in
make.width.equalTo(42)
make.height.equalTo(4)
make.top.equalTo(bottomSheetView.snp.top).inset(16)
make.centerX.equalToSuperview()
dismissIndicatorView.snp.makeConstraints {
$0.width.equalTo(42)
$0.height.equalTo(4)
$0.top.equalTo(bottomSheetView.snp.top).inset(16)
$0.centerX.equalToSuperview()
}

contentsLabel.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.top.equalToSuperview().inset(34)
contentsLabel.snp.makeConstraints {
$0.centerX.equalToSuperview()
$0.top.equalToSuperview().inset(34)
}

bottomSheetTextField.snp.makeConstraints { make in
make.top.equalTo(contentsLabel.snp.bottom).offset(19)
make.leading.trailing.equalToSuperview().inset(16)
make.height.equalTo(44)
bottomSheetTextField.snp.makeConstraints {
$0.top.equalTo(contentsLabel.snp.bottom).offset(19)
$0.leading.trailing.equalToSuperview().inset(16)
$0.height.equalTo(44)
}

completeButton.snp.makeConstraints { make in
make.top.equalTo(bottomSheetTextField.snp.bottom).offset(10)
make.height.equalTo(44)
make.leading.trailing.equalToSuperview().inset(16)
completeButton.snp.makeConstraints {
$0.top.equalTo(bottomSheetTextField.snp.bottom).offset(10)
$0.height.equalTo(44)
$0.leading.trailing.equalToSuperview().inset(16)
}
}

Expand All @@ -228,9 +232,9 @@ extension CustomBottomSheetVC {

let topConst = (safeAreaHeight + bottomPadding) - bottomHeight

bottomSheetView.snp.remakeConstraints { make in
make.leading.bottom.trailing.equalToSuperview()
make.top.equalTo(view.snp.top).offset(topConst)
bottomSheetView.snp.remakeConstraints {
$0.leading.bottom.trailing.equalToSuperview()
$0.top.equalTo(view.snp.top).offset(topConst)
}

UIView.animate(withDuration: 0.25, delay: 0, options: .curveEaseIn, animations: {
Expand Down Expand Up @@ -287,9 +291,9 @@ extension CustomBottomSheetVC {

let topConst = (safeAreaHeight + bottomPadding)

bottomSheetView.snp.remakeConstraints { make in
make.leading.bottom.trailing.equalToSuperview()
make.top.equalTo(view.snp.top).offset(topConst)
bottomSheetView.snp.remakeConstraints {
$0.leading.bottom.trailing.equalToSuperview()
$0.top.equalTo(view.snp.top).offset(topConst)
}

UIView.animate(withDuration: 0.25, delay: 0, options: .curveEaseIn, animations: {
Expand Down
2 changes: 1 addition & 1 deletion Runnect-iOS/Runnect-iOS/Global/UIComponents/CustomButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import UIKit
public class CustomButton: UIButton {

// MARK: - Initialize

public init(title: String) {
super.init(frame: .zero)
self.setUI(title)
Expand Down
Loading