[feat] 카테고리 탭 완성

Team-2m4t · Feb 8, 2022 · b091662 · b091662
1 parent 622484d
commit b091662
Show file tree

Hide file tree

Showing 17 changed files with 932 additions and 185 deletions.
diff --git a/Hyangyu/Hyangyu.xcodeproj/project.pbxproj b/Hyangyu/Hyangyu.xcodeproj/project.pbxproj
diff --git a/Hyangyu/Hyangyu/Resources/Info.plist b/Hyangyu/Hyangyu/Resources/Info.plist
@@ -41,7 +41,6 @@
 					<key>UISceneDelegateClassName</key>
 					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
 					<key>UISceneStoryboardFile</key>
-					<string>DetailViewPage</string>
 					<string>Tabbar</string>
 				</dict>
 			</array>

diff --git a/Hyangyu/Hyangyu/Resources/Storyboards/CategoryDetailPage.storyboard b/Hyangyu/Hyangyu/Resources/Storyboards/CategoryDetailPage.storyboard
diff --git a/Hyangyu/Hyangyu/Resources/Storyboards/CategoryTab.storyboard b/Hyangyu/Hyangyu/Resources/Storyboards/CategoryTab.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="o89-QJ-Rrd">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="o89-QJ-Rrd">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -60,17 +60,23 @@
                                     </view>
                                 </subviews>
                                 <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="KPr-Ho-5cC" secondAttribute="trailing" id="4Lg-GC-zah"/>
                                     <constraint firstAttribute="bottom" secondItem="KPr-Ho-5cC" secondAttribute="bottom" id="8j1-zZ-GLR"/>
                                     <constraint firstAttribute="trailing" secondItem="KPr-Ho-5cC" secondAttribute="trailing" id="CAW-kF-cY7"/>
                                     <constraint firstAttribute="trailing" secondItem="gDp-3D-dVB" secondAttribute="trailing" id="CLq-Ao-Chj"/>
+                                    <constraint firstItem="KPr-Ho-5cC" firstAttribute="leading" secondItem="8vU-Il-5xt" secondAttribute="leading" id="JPK-IY-xz1"/>
                                     <constraint firstAttribute="trailing" secondItem="Gcr-VS-RqR" secondAttribute="trailing" id="MGY-27-aX6"/>
                                     <constraint firstItem="Gcr-VS-RqR" firstAttribute="top" secondItem="8vU-Il-5xt" secondAttribute="top" id="Mtm-h0-2qx"/>
+                                    <constraint firstItem="gDp-3D-dVB" firstAttribute="leading" secondItem="8vU-Il-5xt" secondAttribute="leading" id="Uh3-He-HYu"/>
+                                    <constraint firstAttribute="trailing" secondItem="gDp-3D-dVB" secondAttribute="trailing" id="aFW-GR-ZWe"/>
+                                    <constraint firstAttribute="trailing" secondItem="Gcr-VS-RqR" secondAttribute="trailing" id="ajM-hG-Iv8"/>
                                     <constraint firstItem="Gcr-VS-RqR" firstAttribute="leading" secondItem="8vU-Il-5xt" secondAttribute="leading" id="auO-lC-XiA"/>
                                     <constraint firstItem="gDp-3D-dVB" firstAttribute="leading" secondItem="8vU-Il-5xt" secondAttribute="leading" id="fbB-xg-cQu"/>
                                     <constraint firstItem="KPr-Ho-5cC" firstAttribute="leading" secondItem="8vU-Il-5xt" secondAttribute="leading" id="fph-xi-zOW"/>
                                     <constraint firstItem="gDp-3D-dVB" firstAttribute="top" secondItem="Gcr-VS-RqR" secondAttribute="bottom" constant="20" id="h6K-0J-dC7"/>
                                     <constraint firstItem="gDp-3D-dVB" firstAttribute="top" secondItem="Gcr-VS-RqR" secondAttribute="bottom" constant="20" id="mdu-my-4DH"/>
                                     <constraint firstItem="KPr-Ho-5cC" firstAttribute="top" secondItem="gDp-3D-dVB" secondAttribute="bottom" constant="20" id="pDV-iH-odD"/>
+                                    <constraint firstItem="Gcr-VS-RqR" firstAttribute="leading" secondItem="8vU-Il-5xt" secondAttribute="leading" id="qEk-Hd-nTv"/>
                                     <constraint firstItem="KPr-Ho-5cC" firstAttribute="top" secondItem="gDp-3D-dVB" secondAttribute="bottom" constant="20" id="yEN-zu-bPO"/>
                                 </constraints>
                             </stackView>

diff --git a/Hyangyu/Hyangyu/Resources/Storyboards/HomeTab.storyboard b/Hyangyu/Hyangyu/Resources/Storyboards/HomeTab.storyboard
diff --git a/Hyangyu/Hyangyu/Resources/Storyboards/MyPageTab.storyboard b/Hyangyu/Hyangyu/Resources/Storyboards/MyPageTab.storyboard
diff --git a/Hyangyu/Hyangyu/Resources/Storyboards/SearchTab.storyboard b/Hyangyu/Hyangyu/Resources/Storyboards/SearchTab.storyboard
diff --git a/...ces/ViewControllers/ReviewDataModel.swift → ...angyu/Sources/AppModels/ReviewModel.swift b/...ces/ViewControllers/ReviewDataModel.swift → ...angyu/Sources/AppModels/ReviewModel.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-struct ReviewDataModel
+struct ReviewModel
 {
     var nickName : String
     var createTime : String

diff --git a/Hyangyu/Hyangyu/Sources/Cells/CategoryCollectionViewCell.xib b/Hyangyu/Hyangyu/Sources/Cells/CategoryCollectionViewCell.xib
@@ -17,23 +17,8 @@
                 <rect key="frame" x="0.0" y="0.0" width="304" height="184"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2xe-kS-Cvd">
-                        <rect key="frame" x="10" y="136" width="295" height="22"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="295" id="Svl-Pa-XbM"/>
-                        </constraints>
-                        <attributedString key="attributedText">
-                            <fragment content="Label">
-                                <attributes>
-                                    <color key="NSColor" systemColor="labelColor"/>
-                                    <font key="NSFont" size="18" name="AppleSDGothicNeo-Bold"/>
-                                </attributes>
-                            </fragment>
-                        </attributedString>
-                        <nil key="highlightedColor"/>
-                    </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="75w-vL-8ck">
-                        <rect key="frame" x="10" y="160" width="150" height="21"/>
+                        <rect key="frame" x="15" y="160" width="150" height="21"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="150" id="PvV-9X-xwP"/>
                         </constraints>
@@ -48,7 +33,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ezy-GQ-6Q3">
-                        <rect key="frame" x="170" y="160" width="130" height="21"/>
+                        <rect key="frame" x="175" y="160" width="130" height="21"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="130" id="8ov-cH-bzy"/>
                         </constraints>
@@ -68,6 +53,21 @@
                             <constraint firstAttribute="height" constant="128" id="ysH-zh-PAi"/>
                         </constraints>
                     </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2xe-kS-Cvd">
+                        <rect key="frame" x="15" y="136" width="280" height="22"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="280" id="Svl-Pa-XbM"/>
+                        </constraints>
+                        <attributedString key="attributedText">
+                            <fragment content="Label">
+                                <attributes>
+                                    <color key="NSColor" systemColor="labelColor"/>
+                                    <font key="NSFont" size="18" name="AppleSDGothicNeo-Bold"/>
+                                </attributes>
+                            </fragment>
+                        </attributedString>
+                        <nil key="highlightedColor"/>
+                    </label>
                 </subviews>
             </view>
             <viewLayoutGuide key="safeArea" id="ZTg-uK-7eu"/>
@@ -76,9 +76,9 @@
                 <constraint firstItem="75w-vL-8ck" firstAttribute="top" secondItem="2xe-kS-Cvd" secondAttribute="bottom" constant="2" id="Itd-iR-F5H"/>
                 <constraint firstItem="ezy-GQ-6Q3" firstAttribute="leading" secondItem="75w-vL-8ck" secondAttribute="trailing" constant="10" id="MIq-Ic-EFs"/>
                 <constraint firstItem="dkQ-g8-Qe5" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="Nnj-gB-OiP"/>
+                <constraint firstItem="2xe-kS-Cvd" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="15" id="Pem-ti-ytk"/>
                 <constraint firstItem="dkQ-g8-Qe5" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="Qit-4d-sbc"/>
-                <constraint firstItem="2xe-kS-Cvd" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="10" id="ack-sn-zhF"/>
-                <constraint firstItem="75w-vL-8ck" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="10" id="h1y-IH-Mpe"/>
+                <constraint firstItem="75w-vL-8ck" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="15" id="b9X-bZ-ld0"/>
                 <constraint firstItem="2xe-kS-Cvd" firstAttribute="top" secondItem="dkQ-g8-Qe5" secondAttribute="bottom" constant="8" id="phj-RA-XeM"/>
                 <constraint firstItem="ezy-GQ-6Q3" firstAttribute="centerY" secondItem="75w-vL-8ck" secondAttribute="centerY" id="rwC-G2-Q5w"/>
             </constraints>