[BUG] TeamDooRiBon#141 - 메인, 그룹 뷰 UI 일부 수정

- 추후 2차 수정
hyejinL · Jul 16, 2021 · 5e691e6 · 5e691e6
1 parent 32f0b78
commit 5e691e6
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 98 deletions.
diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/Cell/MemberStart.xib b/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/Cell/MemberStart.xib
@@ -24,7 +24,7 @@
                     <rect key="frame" x="0.0" y="0.0" width="339" height="226"/>
                     <color key="backgroundColor" name="white8"/>
                 </view>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="imgTestStart" translatesAutoresizingMaskIntoConstraints="NO" id="hb3-Cc-jT3">
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="imgTestStart" translatesAutoresizingMaskIntoConstraints="NO" id="hb3-Cc-jT3">
                     <rect key="frame" x="0.0" y="0.0" width="339" height="226"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -66,12 +66,12 @@
             <constraints>
                 <constraint firstItem="Jib-ZP-3Nc" firstAttribute="bottom" secondItem="G3g-ZW-vwb" secondAttribute="bottom" id="0Fq-ZU-JyJ"/>
                 <constraint firstItem="G3g-ZW-vwb" firstAttribute="trailing" secondItem="70X-cf-Wgw" secondAttribute="trailing" constant="74" id="BpF-uQ-ENm"/>
-                <constraint firstItem="hb3-Cc-jT3" firstAttribute="leading" secondItem="G3g-ZW-vwb" secondAttribute="leading" id="CJ2-fR-Fiq"/>
+                <constraint firstItem="hb3-Cc-jT3" firstAttribute="leading" secondItem="QWe-l4-Ecl" secondAttribute="leading" id="CJ2-fR-Fiq"/>
                 <constraint firstItem="Jib-ZP-3Nc" firstAttribute="top" secondItem="QWe-l4-Ecl" secondAttribute="top" id="Fez-5G-Smf"/>
-                <constraint firstItem="G3g-ZW-vwb" firstAttribute="trailing" secondItem="hb3-Cc-jT3" secondAttribute="trailing" id="GtA-VF-zoH"/>
+                <constraint firstAttribute="trailing" secondItem="hb3-Cc-jT3" secondAttribute="trailing" id="GtA-VF-zoH"/>
                 <constraint firstItem="Kuv-wA-d94" firstAttribute="leading" secondItem="G3g-ZW-vwb" secondAttribute="leading" constant="42" id="J4O-cv-07x"/>
                 <constraint firstItem="G3g-ZW-vwb" firstAttribute="trailing" secondItem="Kuv-wA-d94" secondAttribute="trailing" constant="42" id="O3b-zA-pdg"/>
-                <constraint firstItem="G3g-ZW-vwb" firstAttribute="bottom" secondItem="hb3-Cc-jT3" secondAttribute="bottom" id="QUs-7e-e7n"/>
+                <constraint firstAttribute="bottom" secondItem="hb3-Cc-jT3" secondAttribute="bottom" id="QUs-7e-e7n"/>
                 <constraint firstItem="hb3-Cc-jT3" firstAttribute="top" secondItem="QWe-l4-Ecl" secondAttribute="top" id="X06-gl-PvI"/>
                 <constraint firstItem="Jib-ZP-3Nc" firstAttribute="leading" secondItem="G3g-ZW-vwb" secondAttribute="leading" id="bbs-zd-GjV"/>
                 <constraint firstItem="Jib-ZP-3Nc" firstAttribute="trailing" secondItem="G3g-ZW-vwb" secondAttribute="trailing" id="eff-oo-SXW"/>

diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurStoryboard.storyboard b/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurStoryboard.storyboard
@@ -26,7 +26,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="465"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" alwaysBounceVertical="YES" bouncesZoom="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" contentViewInsetsToSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pYF-Jo-LZa">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" alwaysBounceVertical="YES" bouncesZoom="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" contentViewInsetsToSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pYF-Jo-LZa">
                                 <rect key="frame" x="18" y="0.0" width="378" height="465"/>
                                 <color key="backgroundColor" name="white8"/>
                                 <prototypes>
@@ -224,8 +224,8 @@
                         <viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
                         <color key="backgroundColor" name="white8"/>
                         <constraints>
-                            <constraint firstItem="pYF-Jo-LZa" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" constant="18" id="1Bi-We-cuF"/>
-                            <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="pYF-Jo-LZa" secondAttribute="trailing" constant="18" id="4Zj-dC-Yik"/>
+                            <constraint firstItem="pYF-Jo-LZa" firstAttribute="leading" secondItem="5EZ-qb-Rvc" secondAttribute="leading" constant="18" id="1Bi-We-cuF"/>
+                            <constraint firstAttribute="trailing" secondItem="pYF-Jo-LZa" secondAttribute="trailing" constant="18" id="4Zj-dC-Yik"/>
                             <constraint firstItem="pYF-Jo-LZa" firstAttribute="top" secondItem="5EZ-qb-Rvc" secondAttribute="top" id="Ihj-as-vlw"/>
                             <constraint firstAttribute="bottom" secondItem="pYF-Jo-LZa" secondAttribute="bottom" id="zpw-38-UqJ"/>
                         </constraints>

diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurViewController.swift b/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurViewController.swift
@@ -41,7 +41,7 @@ class MemberOurViewController: UIViewController, PageComponentProtocol {
         memberOurTableView.register(NibConstants.MemberStartViewNib, forCellReuseIdentifier: "MemberStartView")
         memberOurTableView.register(NibConstants.MemberStartNib, forCellReuseIdentifier: "MemberStartTableViewCell")
         memberOurTableView.register(NibConstants.MemberCodeCopyNib, forCellReuseIdentifier: "MemberCodeCopyTableViewCell")
-        memberOurTableView.backgroundColor = .clear
+//        memberOurTableView.backgroundColor = .clear
     }
 
     private func getStyleData() {

diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/MemberViewController.swift b/DooRiBon/DooRiBon/Sources/Base/Member/MemberViewController.swift
@@ -130,57 +130,3 @@ extension MemberViewController {
         ToastView.show("참여코드 복사 완료! 원하는 곳에 붙여넣기 하세요.")
     }
 }
-
-class PagerTabSampleComponent1ViewController: UIViewController, PageComponentProtocol {
-    var pageTitle: String {
-        "component1"
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        view.backgroundColor = .purple
-    }
-}
-
-class PagerTabSampleComponent2ViewController: UITableViewController, PageComponentProtocol {
-    var pageTitle: String {
-        "component2"
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        view.backgroundColor = .systemIndigo
-    }
-
-    override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        100
-    }
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        30
-    }
-
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = UITableViewCell()
-        let label = UILabel()
-        cell.addSubview(label)
-        label.snp.makeConstraints {
-            $0.center.equalToSuperview()
-        }
-        label.text = "IndexPath : \(indexPath)"
-        cell.backgroundColor = .systemTeal
-        return cell
-    }
-}
-
-class PagerTabSampleComponent3ViewController: UIViewController, PageComponentProtocol {
-    var pageTitle: String {
-        "component3"
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        view.backgroundColor = .magenta
-    }
-}
-
diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/TakeLook/TakeLookStoryboard.storyboard b/DooRiBon/DooRiBon/Sources/Base/Member/TakeLook/TakeLookStoryboard.storyboard
@@ -111,7 +111,7 @@
                                                     <rect key="frame" x="313" y="16" width="43" height="17"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3명" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ArU-bu-Cfh">
-                                                            <rect key="frame" x="12.5" y="0.0" width="18.5" height="17"/>
+                                                            <rect key="frame" x="13" y="0.0" width="17.5" height="17"/>
                                                             <fontDescription key="fontDescription" name="SpoqaHanSansNeo-Regular" family="Spoqa Han Sans Neo" pointSize="12"/>
                                                             <color key="textColor" name="white9"/>
                                                             <nil key="highlightedColor"/>

diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/TakeLook/TakeLookViewController.swift b/DooRiBon/DooRiBon/Sources/Base/Member/TakeLook/TakeLookViewController.swift
@@ -26,7 +26,6 @@ class TakeLookViewController: UIViewController, PageComponentProtocol, HeaderVie
     private var countList: [TakeLookData] = [] {
         didSet {
             styleQuestionTableView.reloadData()
-
         }
     }
 
@@ -61,7 +60,6 @@ class TakeLookViewController: UIViewController, PageComponentProtocol, HeaderVie
             case .success(let countData):
                 if let data = countData as? [TakeLookData] {
                     self.countList = data
-                    print(self.countList, 213313)
                 }
             case .requestErr(let message):
                 print("requestERR", message)
@@ -196,8 +194,6 @@ extension TakeLookViewController: UITableViewDataSource
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         guard let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "QuestionCell") as? QuestionCell else { return UITableViewHeaderFooterView() }
 
-        headerView.backgroundColor = .white
-
         headerView.sectionIndex = section   // 섹션의 인덱스 값을 담아두기
         headerView.numberLabel.text = numberList[section]
         headerView.questionTitleLabel.text = questionList[section]
@@ -207,8 +203,6 @@ extension TakeLookViewController: UITableViewDataSource
 
         return headerView
     }
-
-
 }
 extension TakeLookViewController {
     private func setupFirstData() {

diff --git a/DooRiBon/DooRiBon/Sources/Base/Service/TripInformService.swift b/DooRiBon/DooRiBon/Sources/Base/Service/TripInformService.swift
@@ -27,9 +27,6 @@ struct TripInformService
                                      encoding: JSONEncoding.default,
                                      headers: header)
         dataRequest.responseData { dataResponse in
-
-            dump(dataResponse)
-
             switch dataResponse.result {
             case .success:
                 guard let statusCode = dataResponse.response?.statusCode else {return}

diff --git a/DooRiBon/DooRiBon/Sources/Common/TripTop/TripTopView.swift b/DooRiBon/DooRiBon/Sources/Common/TripTop/TripTopView.swift
@@ -58,6 +58,6 @@ class TripTopView: UIView {
         periodLabel.text = "\(start) - \(end)"
         tripTitleLabel.text = tripData.travelName
         destinationLabel.text = tripData.destination
-        memberDescriptionLabel.text = tripData.members[0]
+        memberDescriptionLabel.text = "\(tripData.members[0])님과 함께"
     }
 }