Merge pull request #78 from teamCA-PIN/feature/#73

⚡ CAFETI뷰, 카페메뉴 뷰 레이아웃 수정
teamCA-PIN · Jul 16, 2021 · bf76ce1 · bf76ce1
2 parents 461e93b + 0db434e
commit bf76ce1
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 68 deletions.
diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeMenu/ViewControllers/CafeMenuViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeMenu/ViewControllers/CafeMenuViewController.swift
@@ -132,8 +132,9 @@ extension CafeMenuViewController {
       $0.snp.makeConstraints {
         $0.top.equalTo(self.menuallLabel.snp.bottom).offset(48)
         $0.centerX.equalToSuperview()
-        $0.height.equalTo(650)
-        $0.width.equalTo(335)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(49*UIScreen.main.bounds.width/375)
+
       }
     }
   }

diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeTI/ViewControllers/CAFETIResultViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeTI/ViewControllers/CAFETIResultViewController.swift
@@ -137,8 +137,8 @@ extension CAFETIResultViewController {
       $0.setRounded(radius: 24.5)
       $0.snp.makeConstraints {
         $0.centerX.equalToSuperview()
-        $0.height.equalTo(49)
-        $0.width.equalTo(335)
+        $0.height.equalTo(49*UIScreen.main.bounds.width/375)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
         $0.bottom.equalTo(self.view.snp.bottom).offset(-34)
       }
     }
@@ -149,7 +149,6 @@ extension CAFETIResultViewController {
 
       }
   func setResultData() {
-    print(self.resultData)
     self.resultImageView.imageFromUrl(self.resultData?.img, defaultImgPath: "https://capin.s3.ap-northeast-2.amazonaws.com/cafeti/Deer_coffee%402x.png")
     self.CAFETIresultLabel.setupLabel(text: self.resultData?.type ?? "", color: .white, font: UIFont.notoSansKRMediumFont(fontSize: 16))
     self.CAFETItitleLabel.setupLabel(text: self.resultData?.modifier ?? "", color: .subcolorBrown4, font: UIFont.notoSansKRMediumFont(fontSize: 26))

diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeTI/ViewControllers/CAFETITest21ViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeTI/ViewControllers/CAFETITest21ViewController.swift
@@ -102,7 +102,8 @@ extension CAFETITest21ViewController {
         $0.top.equalTo(self.contentLabel.snp.bottom).offset(86)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -118,7 +119,8 @@ extension CAFETITest21ViewController {
         $0.top.equalTo(self.questiononeButton.snp.bottom).offset(10)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -134,7 +136,8 @@ extension CAFETITest21ViewController {
         $0.top.equalTo(self.questiontwoButton.snp.bottom).offset(10)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -148,9 +151,9 @@ extension CAFETITest21ViewController {
       $0.backgroundColor = .clear
       $0.snp.makeConstraints {
         $0.centerX.equalToSuperview()
-        $0.bottom.equalTo(self.view.safeAreaLayoutGuide.snp.bottom).offset(-34)
-        $0.width.equalTo(318)
-        $0.height.equalTo(49)
+        $0.bottom.equalTo(self.view.snp.bottom).offset(-34)
+        $0.width.equalTo(UIScreen.main.bounds.width-58)
+        $0.height.equalTo(49*UIScreen.main.bounds.width/375)
       }
     }
   }
@@ -161,12 +164,12 @@ extension CAFETITest21ViewController {
       $0.backgroundColor = .gray2
       $0.titleLabel?.font = UIFont.notoSansKRMediumFont(fontSize: 16)
       $0.addTarget(self, action: #selector(self.backButtonClicked), for: .touchUpInside)
-      $0.setRounded(radius: 24.5)
+      $0.setRounded(radius: 25)
       $0.snp.makeConstraints {
         $0.top.equalTo(self.buttonContainerView.snp.top)
         $0.bottom.equalTo(self.buttonContainerView.snp.bottom)
         $0.leading.equalTo(self.buttonContainerView.snp.leading)
-        $0.width.equalTo(154)
+        $0.width.equalTo((UIScreen.main.bounds.width-68)/2)
       }
     }
   }
@@ -177,12 +180,12 @@ extension CAFETITest21ViewController {
       $0.backgroundColor = .subcolorBlue2
       $0.titleLabel?.font = UIFont.notoSansKRMediumFont(fontSize: 16)
       $0.addTarget(self, action: #selector(self.nextButtonClicked), for: .touchUpInside)
-      $0.setRounded(radius: 24.5)
+      $0.setRounded(radius: 25)
       $0.snp.makeConstraints {
         $0.top.equalTo(self.buttonContainerView.snp.top)
         $0.bottom.equalTo(self.buttonContainerView.snp.bottom)
         $0.trailing.equalTo(self.buttonContainerView.snp.trailing)
-        $0.width.equalTo(154)
+        $0.width.equalTo((UIScreen.main.bounds.width-68)/2)
       }
     }
   }

diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeTI/ViewControllers/CAFETITest22ViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeTI/ViewControllers/CAFETITest22ViewController.swift
@@ -102,7 +102,8 @@ extension CAFETITest22ViewController {
         $0.top.equalTo(self.contentLabel.snp.bottom).offset(86)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -118,7 +119,8 @@ extension CAFETITest22ViewController {
         $0.top.equalTo(self.questiononeButton.snp.bottom).offset(10)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -134,7 +136,8 @@ extension CAFETITest22ViewController {
         $0.top.equalTo(self.questiontwoButton.snp.bottom).offset(10)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -148,9 +151,9 @@ extension CAFETITest22ViewController {
       $0.backgroundColor = .clear
       $0.snp.makeConstraints {
         $0.centerX.equalToSuperview()
-        $0.bottom.equalTo(self.view.safeAreaLayoutGuide.snp.bottom).offset(-34)
-        $0.width.equalTo(318)
-        $0.height.equalTo(49)
+        $0.bottom.equalTo(self.view.snp.bottom).offset(-34)
+        $0.width.equalTo(UIScreen.main.bounds.width-58)
+        $0.height.equalTo(49*UIScreen.main.bounds.width/375)
       }
     }
   }
@@ -161,12 +164,12 @@ extension CAFETITest22ViewController {
       $0.backgroundColor = .gray2
       $0.titleLabel?.font = UIFont.notoSansKRMediumFont(fontSize: 16)
       $0.addTarget(self, action: #selector(self.backButtonClicked), for: .touchUpInside)
-      $0.setRounded(radius: 24.5)
+      $0.setRounded(radius: 25)
       $0.snp.makeConstraints {
         $0.top.equalTo(self.buttonContainerView.snp.top)
         $0.bottom.equalTo(self.buttonContainerView.snp.bottom)
         $0.leading.equalTo(self.buttonContainerView.snp.leading)
-        $0.width.equalTo(154)
+        $0.width.equalTo((UIScreen.main.bounds.width-68)/2)
       }
     }
   }
@@ -177,12 +180,12 @@ extension CAFETITest22ViewController {
       $0.backgroundColor = .subcolorBlue2
       $0.titleLabel?.font = UIFont.notoSansKRMediumFont(fontSize: 16)
       $0.addTarget(self, action: #selector(self.nextButtonClicked), for: .touchUpInside)
-      $0.setRounded(radius: 24.5)
+      $0.setRounded(radius: 25)
       $0.snp.makeConstraints {
         $0.top.equalTo(self.buttonContainerView.snp.top)
         $0.bottom.equalTo(self.buttonContainerView.snp.bottom)
         $0.trailing.equalTo(self.buttonContainerView.snp.trailing)
-        $0.width.equalTo(154)
+        $0.width.equalTo((UIScreen.main.bounds.width-68)/2)
       }
     }
   }

diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeTI/ViewControllers/CAFETITest3ViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeTI/ViewControllers/CAFETITest3ViewController.swift
@@ -106,7 +106,8 @@ extension CAFETITest3ViewController {
         $0.top.equalTo(self.contentLabel.snp.bottom).offset(26)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -122,7 +123,8 @@ extension CAFETITest3ViewController {
         $0.top.equalTo(self.questiononeButton.snp.bottom).offset(10)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -138,7 +140,8 @@ extension CAFETITest3ViewController {
         $0.top.equalTo(self.questiontwoButton.snp.bottom).offset(10)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -154,7 +157,8 @@ extension CAFETITest3ViewController {
         $0.top.equalTo(self.questionthreeButton.snp.bottom).offset(10)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -170,7 +174,8 @@ extension CAFETITest3ViewController {
         $0.top.equalTo(self.questionfourthButton.snp.bottom).offset(10)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -186,9 +191,9 @@ extension CAFETITest3ViewController {
       $0.backgroundColor = .clear
       $0.snp.makeConstraints {
         $0.centerX.equalToSuperview()
-        $0.bottom.equalTo(self.view.safeAreaLayoutGuide.snp.bottom).offset(-34)
-        $0.width.equalTo(318)
-        $0.height.equalTo(49)
+        $0.bottom.equalTo(self.view.snp.bottom).offset(-34)
+        $0.width.equalTo(UIScreen.main.bounds.width-58)
+        $0.height.equalTo(49*UIScreen.main.bounds.width/375)
       }
     }
   }
@@ -199,12 +204,12 @@ extension CAFETITest3ViewController {
       $0.backgroundColor = .gray2
       $0.titleLabel?.font = UIFont.notoSansKRMediumFont(fontSize: 16)
       $0.addTarget(self, action: #selector(self.backButtonClicked), for: .touchUpInside)
-      $0.setRounded(radius: 24.5)
+      $0.setRounded(radius: 25)
       $0.snp.makeConstraints {
         $0.top.equalTo(self.buttonContainerView.snp.top)
         $0.bottom.equalTo(self.buttonContainerView.snp.bottom)
         $0.leading.equalTo(self.buttonContainerView.snp.leading)
-        $0.width.equalTo(154)
+        $0.width.equalTo((UIScreen.main.bounds.width-68)/2)
       }
     }
   }
@@ -215,12 +220,12 @@ extension CAFETITest3ViewController {
       $0.backgroundColor = .subcolorBlue2
       $0.titleLabel?.font = UIFont.notoSansKRMediumFont(fontSize: 16)
       $0.addTarget(self, action: #selector(self.nextButtonClicked), for: .touchUpInside)
-      $0.setRounded(radius: 24.5)
+      $0.setRounded(radius: 25)
       $0.snp.makeConstraints {
         $0.top.equalTo(self.buttonContainerView.snp.top)
         $0.bottom.equalTo(self.buttonContainerView.snp.bottom)
         $0.trailing.equalTo(self.buttonContainerView.snp.trailing)
-        $0.width.equalTo(154)
+        $0.width.equalTo((UIScreen.main.bounds.width-68)/2)
       }
     }
   }

diff --git a/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeTI/ViewControllers/CAFETITest4ViewController.swift b/CA-PIN_IOS/CA-PIN_IOS/Screens/CafeTI/ViewControllers/CAFETITest4ViewController.swift
@@ -109,7 +109,8 @@ extension CAFETITest4ViewController {
         $0.top.equalTo(self.contentLabel.snp.bottom).offset(56)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -125,7 +126,8 @@ extension CAFETITest4ViewController {
         $0.top.equalTo(self.questiononeButton.snp.bottom).offset(10)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -141,7 +143,8 @@ extension CAFETITest4ViewController {
         $0.top.equalTo(self.questiontwoButton.snp.bottom).offset(10)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -157,7 +160,8 @@ extension CAFETITest4ViewController {
         $0.top.equalTo(self.questionthreeButton.snp.bottom).offset(10)
         $0.centerX.equalToSuperview()
         $0.leading.equalTo(self.view.snp.leading).offset(20)
-        $0.height.equalTo(50)
+        $0.width.equalTo(UIScreen.main.bounds.width-40)
+        $0.height.equalTo(50*UIScreen.main.bounds.width/335)
       }
     }
   }
@@ -172,9 +176,9 @@ extension CAFETITest4ViewController {
       $0.backgroundColor = .clear
       $0.snp.makeConstraints {
         $0.centerX.equalToSuperview()
-        $0.bottom.equalTo(self.view.safeAreaLayoutGuide.snp.bottom).offset(-34)
-        $0.width.equalTo(318)
-        $0.height.equalTo(49)
+        $0.bottom.equalTo(self.view.snp.bottom).offset(-34)
+        $0.width.equalTo(UIScreen.main.bounds.width-58)
+        $0.height.equalTo(49*UIScreen.main.bounds.width/375)
       }
     }
   }
@@ -185,12 +189,12 @@ extension CAFETITest4ViewController {
       $0.backgroundColor = .gray2
       $0.titleLabel?.font = UIFont.notoSansKRMediumFont(fontSize: 16)
       $0.addTarget(self, action: #selector(self.backButtonClicked), for: .touchUpInside)
-      $0.setRounded(radius: 24.5)
+      $0.setRounded(radius: 25)
       $0.snp.makeConstraints {
         $0.top.equalTo(self.buttonContainerView.snp.top)
         $0.bottom.equalTo(self.buttonContainerView.snp.bottom)
         $0.leading.equalTo(self.buttonContainerView.snp.leading)
-        $0.width.equalTo(154)
+        $0.width.equalTo((UIScreen.main.bounds.width-68)/2)
       }
     }
   }
@@ -201,12 +205,12 @@ extension CAFETITest4ViewController {
       $0.backgroundColor = .subcolorBlue2
       $0.titleLabel?.font = UIFont.notoSansKRMediumFont(fontSize: 16)
       $0.addTarget(self, action: #selector(self.nextButtonClicked), for: .touchUpInside)
-      $0.setRounded(radius: 24.5)
+      $0.setRounded(radius: 25)
       $0.snp.makeConstraints {
         $0.top.equalTo(self.buttonContainerView.snp.top)
         $0.bottom.equalTo(self.buttonContainerView.snp.bottom)
         $0.trailing.equalTo(self.buttonContainerView.snp.trailing)
-        $0.width.equalTo(154)
+        $0.width.equalTo((UIScreen.main.bounds.width-68)/2)
       }
     }
   }