#86 Feat: 테이스팅 노트 메인 화면 UI 구성

Drink-Easy · Oct 30, 2024 · 369c393 · 369c393
1 parent 203cfb2
commit 369c393
Show file tree

Hide file tree

Showing 16 changed files with 290 additions and 313 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
diff --git a/.github/ISSUE_TEMPLATE/pr-템플릿.md b/.github/ISSUE_TEMPLATE/pr-템플릿.md
diff --git a/.gitignore b/.gitignore
diff --git a/Drink-EG/Drink-EG.xcodeproj/project.pbxproj b/Drink-EG/Drink-EG.xcodeproj/project.pbxproj
@@ -169,6 +169,8 @@
 		5E66EABD2CA7F98C00FAD76F /* WineImageStackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E66EABC2CA7F98C00FAD76F /* WineImageStackView.swift */; };
 		5E66EAC12CA8212300FAD76F /* MyTastingNote.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E66EAC02CA8212300FAD76F /* MyTastingNote.swift */; };
 		5E66EAC32CA82B8D00FAD76F /* WineImageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E66EAC22CA82B8D00FAD76F /* WineImageCell.swift */; };
+		5EA2D46D2CD1DEA900CEC439 /* WineInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EA2D46C2CD1DEA900CEC439 /* WineInfoView.swift */; };
+		5EA2D4712CD1E3E500CEC439 /* RatingWineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EA2D4702CD1E3E500CEC439 /* RatingWineViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -339,6 +341,8 @@
 		5E66EABC2CA7F98C00FAD76F /* WineImageStackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WineImageStackView.swift; sourceTree = "<group>"; };
 		5E66EAC02CA8212300FAD76F /* MyTastingNote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyTastingNote.swift; sourceTree = "<group>"; };
 		5E66EAC22CA82B8D00FAD76F /* WineImageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WineImageCell.swift; sourceTree = "<group>"; };
+		5EA2D46C2CD1DEA900CEC439 /* WineInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WineInfoView.swift; sourceTree = "<group>"; };
+		5EA2D4702CD1E3E500CEC439 /* RatingWineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RatingWineViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -599,6 +603,7 @@
 				5E22194D2C69D5E7005849FB /* ChooseTasteViewController.swift */,
 				5E22196D2C6B2EA0005849FB /* RatingViewController.swift */,
 				5E2219722C6B661A005849FB /* CheckNoteViewController.swift */,
+				5EA2D4702CD1E3E500CEC439 /* RatingWineViewController.swift */,
 			);
 			path = TastingNote;
 			sourceTree = "<group>";
@@ -724,6 +729,7 @@
 				5E66EABC2CA7F98C00FAD76F /* WineImageStackView.swift */,
 				5E66EAC02CA8212300FAD76F /* MyTastingNote.swift */,
 				5E66EAC22CA82B8D00FAD76F /* WineImageCell.swift */,
+				5EA2D46C2CD1DEA900CEC439 /* WineInfoView.swift */,
 			);
 			path = TastingNote;
 			sourceTree = "<group>";
@@ -1002,6 +1008,7 @@
 				16B97D162C4C0F6400D8B453 /* SavingVideoViewController.swift in Sources */,
 				165400F82C69EFBD008A9DBF /* WineNewsResponse.swift in Sources */,
 				1FC522292CA933FC00EC0635 /* MenuCollectionViewCell.swift in Sources */,
+				5EA2D46D2CD1DEA900CEC439 /* WineInfoView.swift in Sources */,
 				165400E92C69DDCB008A9DBF /* WineClassAPI.swift in Sources */,
 				1F598EEA2C5227C5000CE79F /* AdImageCollectionViewCell.swift in Sources */,
 				1F205A412C6B540600E80659 /* TasteTestSecondCollectionViewCell.swift in Sources */,
@@ -1060,6 +1067,7 @@
 				5E2219412C69D5D0005849FB /* CustomTableViewCell.swift in Sources */,
 				16C19AD82C73AE5E00E93FD0 /* WineClassCell.swift in Sources */,
 				1F598F012C581573000CE79F /* LoginViewController.swift in Sources */,
+				5EA2D4712CD1E3E500CEC439 /* RatingWineViewController.swift in Sources */,
 				5E2219422C69D5D0005849FB /* CustomCommentsCollectionViewCell.swift in Sources */,
 				5E42B0182C74A39300DAB751 /* MovingTextField.swift in Sources */,
 				16B97D122C4C0F2400D8B453 /* WineClassMainViewController.swift in Sources */,

diff --git a/...proj/project.xcworkspace/xcuserdata/soohyunlee.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/soohyunlee.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...Drink-EG.xcodeproj/xcuserdata/soohyunlee.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...Drink-EG.xcodeproj/xcuserdata/soohyunlee.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "05769338-9D08-41A6-A4CB-9A43854A1454"
+   type = "1"
+   version = "2.0">
+</Bucket>
diff --git a/...G/Drink-EG.xcodeproj/xcuserdata/soohyunlee.xcuserdatad/xcschemes/xcschememanagement.plist b/...G/Drink-EG.xcodeproj/xcuserdata/soohyunlee.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>Drink-EG.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+		<key>ReactiveSwift (Playground) 1.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+		<key>ReactiveSwift (Playground) 2.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
+		<key>ReactiveSwift (Playground).xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+		<key>ReactiveSwift-UIExamples (Playground) 1.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>5</integer>
+		</dict>
+		<key>ReactiveSwift-UIExamples (Playground) 2.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>6</integer>
+		</dict>
+		<key>ReactiveSwift-UIExamples (Playground).xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>4</integer>
+		</dict>
+		<key>Rx (Playground) 1.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>8</integer>
+		</dict>
+		<key>Rx (Playground) 2.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>9</integer>
+		</dict>
+		<key>Rx (Playground).xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>7</integer>
+		</dict>
+		<key>SnapKitPlayground (Playground) 1.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>11</integer>
+		</dict>
+		<key>SnapKitPlayground (Playground) 2.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>12</integer>
+		</dict>
+		<key>SnapKitPlayground (Playground).xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>10</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/Drink-EG/Drink-EG/Resources/SceneDelegate.swift b/Drink-EG/Drink-EG/Resources/SceneDelegate.swift
@@ -20,7 +20,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         // 화면을 구성하는 UIWindow 인스턴스 생성
         let window = UIWindow(windowScene: windowScene)
         // 실제 첫 화면이 되는 MainViewController 인스턴스 생성
-        let vc = LoginViewController()
+        let vc = RatingWineViewController()
         // NavigationController을 사용할 경우, MainViewController를 rootViewController로 갖는 NavigationController을 생성해야한다.
         let navigationController = UINavigationController(rootViewController: vc)
         navigationController.isNavigationBarHidden = true

diff --git a/Drink-EG/Drink-EG/Sources/Cells/TastingNote/MyTastingNote.swift b/Drink-EG/Drink-EG/Sources/Cells/TastingNote/MyTastingNote.swift
@@ -86,8 +86,10 @@ class MyTastingNote: UIView, UICollectionViewDataSource, UICollectionViewDelegat
 
     // UICollectionViewDelegateFlowLayout 메서드
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
-        let width = (collectionView.bounds.width - 32) / 3 // 3열 구성
-        return CGSize(width: width, height: width * 1.5) // 셀 높이 비율 설정
+        // let width = (collectionView.bounds.width - 32) / 3 // 3열 구성
+        let width = 107
+        // return CGSize(width: width, height: width * 1.5) // 셀 높이 비율 설정
+        return CGSize(width: width, height: width)
     }
 
     required init? (coder: NSCoder) {

diff --git a/Drink-EG/Drink-EG/Sources/Cells/TastingNote/WineImageCell.swift b/Drink-EG/Drink-EG/Sources/Cells/TastingNote/WineImageCell.swift
@@ -23,6 +23,7 @@ class WineImageCell: UICollectionViewCell {
         l.font = UIFont(name: "Pretendard-Medium", size: 12)
         l.textColor = .black
         l.textAlignment = .center
+        l.text = "루이즈 로드레"
         return l
     }()
 
@@ -46,8 +47,8 @@ class WineImageCell: UICollectionViewCell {
 
         label.snp.makeConstraints { make in
             make.top.equalTo(imageView.snp.bottom).offset(8)
-            make.leading.trailing.equalToSuperview()
-            make.bottom.equalToSuperview()
+            make.centerX.equalTo(imageView.snp.centerX)
+            // make.bottom.equalToSuperview()
         }
     }