[Chore] #243 - 기기대응 코드 추가

DO-NOTTO-DO · Mar 20, 2024 · 42fc6f3 · 42fc6f3
1 parent 7c9e126
commit 42fc6f3
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 40 deletions.
diff --git a/iOS-NOTTODO/iOS-NOTTODO.xcodeproj/project.pbxproj b/iOS-NOTTODO/iOS-NOTTODO.xcodeproj/project.pbxproj
@@ -629,11 +629,11 @@
 		09F6717E29CAD68100708725 /* Onboarding */ = {
 			isa = PBXGroup;
 			children = (
-				3B877D602BA195A80002DFCB /* ViewModel */,
+				09F6719329CB6E7800708725 /* Cell */,
 				6C9628AA2A2220E2003ADE25 /* Lottie */,
-				09F6719229CB6E6200708725 /* ViewControllers */,
 				09F6719129CB6E4D00708725 /* Model */,
-				09F6719329CB6E7800708725 /* Cell */,
+				09F6719229CB6E6200708725 /* ViewControllers */,
+				3B877D602BA195A80002DFCB /* ViewModel */,
 			);
 			path = Onboarding;
 			sourceTree = "<group>";

diff --git a/iOS-NOTTODO/iOS-NOTTODO/Global/Extensions/UIImageView+.swift b/iOS-NOTTODO/iOS-NOTTODO/Global/Extensions/UIImageView+.swift
@@ -22,7 +22,7 @@ extension UIImageView {
                 } else {
                     guard let url = URL(string: urlString) else { return }
                     let resource = KF.ImageResource(downloadURL: url, cacheKey: urlString) // URL로부터 이미지를 다운받고 String 타입의 URL을 캐시키로 지정하고
-                    self.kf.setImage(with: resource) // 이미지를 셋한다.
+                    self?.kf.setImage(with: resource) // 이미지를 셋한다.
                 }
             case .failure(let error):
                 print(error)

diff --git a/iOS-NOTTODO/iOS-NOTTODO/Presentation/Onboarding/Cell/OnboardingCollectionViewCell.swift b/iOS-NOTTODO/iOS-NOTTODO/Presentation/Onboarding/Cell/OnboardingCollectionViewCell.swift
@@ -78,7 +78,7 @@ extension OnboardingCollectionViewCell {
         titleLabel.text = model.title
         titleLabel.snp.remakeConstraints {
             $0.centerY.equalToSuperview()
-            $0.leading.equalToSuperview().offset(20)
+            $0.leading.equalToSuperview().offset(20.adjusted)
         }
     }
 }
diff --git a/iOS-NOTTODO/iOS-NOTTODO/Presentation/Onboarding/Cell/SubOnboardingCollectionViewCell.swift b/iOS-NOTTODO/iOS-NOTTODO/Presentation/Onboarding/Cell/SubOnboardingCollectionViewCell.swift
@@ -60,17 +60,17 @@ extension SubOnboardingCollectionViewCell {
 
         iconImage.snp.makeConstraints {
             $0.centerY.equalToSuperview()
-            $0.leading.equalToSuperview().offset(21)
-            $0.size.equalTo(36)
+            $0.leading.equalToSuperview().offset(21.adjusted)
+            $0.size.equalTo(36.adjusted)
         }
         tagLabel.snp.makeConstraints {
-            $0.leading.equalTo(iconImage.snp.trailing).offset(13)
-            $0.top.equalToSuperview().offset(15)
+            $0.leading.equalTo(iconImage.snp.trailing).offset(13.adjusted)
+            $0.top.equalToSuperview().offset(15.adjusted)
         }
         titleLabel.snp.makeConstraints {
             $0.leading.equalTo(tagLabel.snp.leading)
-            $0.top.equalTo(tagLabel.snp.bottom).offset(6)
-            $0.bottom.equalToSuperview().inset(15)
+            $0.top.equalTo(tagLabel.snp.bottom).offset(6.adjusted)
+            $0.bottom.equalToSuperview().inset(15.adjusted)
         }
     }
 

diff --git a/...O/iOS-NOTTODO/Presentation/Onboarding/ViewControllers/FifthOnboardingViewController.swift b/...O/iOS-NOTTODO/Presentation/Onboarding/ViewControllers/FifthOnboardingViewController.swift
@@ -101,22 +101,22 @@ extension FifthOnboardingViewController {
         nextButton.addSubview(arrowImage)
 
         nextButton.snp.makeConstraints {
-            $0.trailing.equalTo(safeArea).inset(34)
-            $0.size.equalTo(CGSize(width: 205, height: 24))
-            $0.bottom.equalTo(safeArea).inset(12)
+            $0.trailing.equalTo(safeArea).inset(34.adjusted)
+            $0.size.equalTo(CGSize(width: 205.adjusted, height: 24.adjusted))
+            $0.bottom.equalTo(safeArea).inset(12.adjusted)
         }
         arrowImage.snp.makeConstraints {
-            $0.size.equalTo(CGSize(width: 8, height: 16))
+            $0.size.equalTo(CGSize(width: 8.adjusted, height: 16.adjusted))
             $0.trailing.equalToSuperview()
             $0.centerY.equalToSuperview()
         }
         collectionView.snp.makeConstraints {
             $0.top.equalTo(safeArea)
-            $0.directionalHorizontalEdges.equalTo(safeArea).inset(27)
+            $0.directionalHorizontalEdges.equalTo(safeArea).inset(27.adjusted)
             $0.bottom.equalTo(nextButton.snp.top)
         }
         gradientView.snp.makeConstraints {
-            $0.bottom.equalTo(nextButton.snp.top).offset(-90)
+            $0.bottom.equalTo(nextButton.snp.top).offset(-90.adjusted)
             $0.top.equalTo(safeArea).offset(Numbers.height*0.5)
             $0.directionalHorizontalEdges.equalTo(safeArea)
         }

diff --git a/.../iOS-NOTTODO/Presentation/Onboarding/ViewControllers/FourthOnboardingViewController.swift b/.../iOS-NOTTODO/Presentation/Onboarding/ViewControllers/FourthOnboardingViewController.swift
@@ -91,13 +91,13 @@ extension FourthOnboardingViewController {
         view.addSubviews(collectionView, gradientView, nextButton)
 
         nextButton.snp.makeConstraints {
-            $0.trailing.equalTo(safeArea).inset(34)
-            $0.size.equalTo(CGSize(width: 95, height: 24))
-            $0.bottom.equalTo(safeArea).inset(12)
+            $0.trailing.equalTo(safeArea).inset(34.adjusted)
+            $0.size.equalTo(CGSize(width: 95.adjusted, height: 24.adjusted))
+            $0.bottom.equalTo(safeArea).inset(12.adjusted)
         }
         collectionView.snp.makeConstraints {
             $0.top.equalTo(safeArea)
-            $0.directionalHorizontalEdges.equalTo(safeArea).inset(27)
+            $0.directionalHorizontalEdges.equalTo(safeArea).inset(27.adjusted)
             $0.bottom.equalTo(nextButton.snp.top)
         }
         gradientView.snp.makeConstraints {

diff --git a/...DO/iOS-NOTTODO/Presentation/Onboarding/ViewControllers/LogoOnboardingViewController.swift b/...DO/iOS-NOTTODO/Presentation/Onboarding/ViewControllers/LogoOnboardingViewController.swift
@@ -109,9 +109,9 @@ extension LogoOnboardingViewController {
         }
 
         nextButton.snp.makeConstraints {
-            $0.bottom.equalTo(safeArea).inset(10)
-            $0.directionalHorizontalEdges.equalTo(safeArea).inset(15)
-            $0.height.equalTo(50)
+            $0.bottom.equalTo(safeArea).inset(10.adjusted)
+            $0.directionalHorizontalEdges.equalTo(safeArea).inset(15.adjusted)
+            $0.height.equalTo(50.adjusted)
         }
     }
 

diff --git a/iOS-NOTTODO/iOS-NOTTODO/Presentation/Onboarding/ViewControllers/OnboardingFooterView.swift b/iOS-NOTTODO/iOS-NOTTODO/Presentation/Onboarding/ViewControllers/OnboardingFooterView.swift
@@ -51,9 +51,9 @@ extension OnboardingFooterView {
         addSubviews(iconImage, actionLabel)
 
         iconImage.snp.makeConstraints {
-            $0.top.equalToSuperview().offset(21)
+            $0.top.equalToSuperview().offset(21.adjusted)
             $0.centerX.equalToSuperview()
-            $0.height.equalTo(17)
+            $0.height.equalTo(17.adjusted)
         }
 
         actionLabel.snp.makeConstraints {

diff --git a/iOS-NOTTODO/iOS-NOTTODO/Presentation/Onboarding/ViewControllers/OnboardingHeaderView.swift b/iOS-NOTTODO/iOS-NOTTODO/Presentation/Onboarding/ViewControllers/OnboardingHeaderView.swift
@@ -86,31 +86,31 @@ extension OnboardingHeaderView {
         addSubviews(pageControl, pageControlLabel, verticalStackView)
 
         pageControl.snp.makeConstraints {
-            $0.top.equalToSuperview().offset(21)
-            $0.size.equalTo(CGSize(width: 27, height: 6))
+            $0.top.equalToSuperview().offset(21.adjusted)
+            $0.size.equalTo(CGSize(width: 27.adjusted, height: 6.adjusted))
             $0.centerX.equalToSuperview()
         }
         pageControlLabel.snp.makeConstraints {
-            $0.top.equalTo(pageControl.snp.bottom).offset(10)
+            $0.top.equalTo(pageControl.snp.bottom).offset(10.adjusted)
             $0.centerX.equalToSuperview()
-            $0.height.equalTo(18)
+            $0.height.equalTo(18.adjusted)
         }
         verticalStackView.snp.makeConstraints {
-            $0.top.equalTo(pageControlLabel.snp.bottom).offset(43)
+            $0.top.equalTo(pageControlLabel.snp.bottom).offset(43.adjusted)
             $0.directionalHorizontalEdges.equalToSuperview()
             $0.bottom.equalToSuperview()
         }
 
         if isControl {
             titleLabel.snp.makeConstraints {
-                $0.bottom.equalToSuperview().inset(40)
+                $0.bottom.equalToSuperview().inset(40.adjusted)
             }
             horizontalStackView.snp.makeConstraints {
-                $0.bottom.equalTo(titleLabel.snp.top).inset(20)
+                $0.bottom.equalTo(titleLabel.snp.top).inset(20.adjusted)
             }
 
             flagImage.snp.makeConstraints {
-                $0.size.equalTo(20)
+                $0.size.equalTo(20.adjusted)
             }
         } else {
             horizontalStackView.snp.remakeConstraints {
@@ -119,7 +119,7 @@ extension OnboardingHeaderView {
             }
             titleLabel.snp.remakeConstraints {
                 $0.top.equalToSuperview()
-                $0.height.equalTo(50)
+                $0.height.equalTo(50.adjusted)
             }
         }
     }

diff --git a/.../iOS-NOTTODO/Presentation/Onboarding/ViewControllers/SecondOnboardingViewController.swift b/.../iOS-NOTTODO/Presentation/Onboarding/ViewControllers/SecondOnboardingViewController.swift
@@ -79,7 +79,7 @@ extension SecondOnboardingViewController {
 
         collectionView.snp.makeConstraints {
             $0.top.equalTo(safeArea)
-            $0.directionalHorizontalEdges.equalTo(safeArea).inset(27)
+            $0.directionalHorizontalEdges.equalTo(safeArea).inset(27.adjusted)
             $0.bottom.equalTo(safeArea)
         }
     }

diff --git a/...O/iOS-NOTTODO/Presentation/Onboarding/ViewControllers/ThirdOnboardingViewController.swift b/...O/iOS-NOTTODO/Presentation/Onboarding/ViewControllers/ThirdOnboardingViewController.swift
@@ -103,13 +103,13 @@ extension ThirdOnboardingViewController {
 
         nextButton.snp.makeConstraints {
             $0.top.equalTo(collectionView.snp.bottom)
-            $0.bottom.equalTo(safeArea).inset(10)
-            $0.directionalHorizontalEdges.equalTo(safeArea).inset(15)
-            $0.height.equalTo(50)
+            $0.bottom.equalTo(safeArea).inset(10.adjusted)
+            $0.directionalHorizontalEdges.equalTo(safeArea).inset(15.adjusted)
+            $0.height.equalTo(50.adjusted)
         }
         collectionView.snp.makeConstraints {
             $0.top.equalTo(safeArea)
-            $0.directionalHorizontalEdges.equalTo(safeArea).inset(27)
+            $0.directionalHorizontalEdges.equalTo(safeArea).inset(27.adjusted)
             $0.bottom.equalTo(nextButton.snp.top)
         }
     }